X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Funres%2Fsrc_MD-M%2Fcinfo.f;h=708ae580b9c930ad76f11ad21ceb1fbb634e5853;hb=71ab8ad9b5eacd0bbf5c069f91191d293f43f4de;hp=8679a2c17bfb43c11791cdb4e40c30ef786060c7;hpb=b62c40f2579be77cdde76421ddfe0f216f42944f;p=unres.git

diff --git a/source/unres/src_MD-M/cinfo.f b/source/unres/src_MD-M/cinfo.f
index 8679a2c..708ae58 100644
--- a/source/unres/src_MD-M/cinfo.f
+++ b/source/unres/src_MD-M/cinfo.f
@@ -1,4 +1,5 @@
 C DO NOT EDIT THIS FILE - IT HAS BEEN GENERATED BY COMPINFO.C
+<<<<<<< HEAD
 C 0 40360 35
       subroutine cinfo
       include 'COMMON.IOUNITS'
@@ -29,6 +30,37 @@ C 0 40360 35
       write(iout,*)'4P: BIN = ../../../bin/unres/MD/unres-mult-syme...'
       write(iout,*)'E0LL2Y: CPPFLAGS = -DPROCOR -DLINUX -DG77 -DAMD...'
       write(iout,*)'E0LL2Y: BIN = ../../../bin/unres/MD/unres-mult-...'
+=======
+C 2 3 3460
+      subroutine cinfo
+      include 'COMMON.IOUNITS'
+      write(iout,*)'++++ Compile info ++++'
+      write(iout,*)'Version 2.3 build 3460'
+      write(iout,*)'compiled Mon Oct 29 07:58:47 2012'
+      write(iout,*)'compiled by aks255@matrix.chem.cornell.edu'
+      write(iout,*)'OS name:    Linux '
+      write(iout,*)'OS release: 2.6.34.9-69.fc13.x86_64 '
+      write(iout,*)'OS version:',
+     & ' #1 SMP Tue May 3 09:23:03 UTC 2011 '
+      write(iout,*)'flags:'
+      write(iout,*)'CPPFLAGS = -DLINUX -DUNRES -DMP -DMPI \\'
+      write(iout,*)'           -DPGI -DSPLITELE -DISNAN -DAMD64 \\'
+      write(iout,*)'           -DPROCOR -DLANG0 \\'
+      write(iout,*)'	-DCRYST_BOND -DCRYST_THETA -DCRYST_SC -DSCCORP...'
+      write(iout,*)'INSTALL_DIR = /users/software/mpich-1.2.7p1_int...'
+      write(iout,*)'FC= ifort'
+      write(iout,*)'OPT =  -O3 -ip -w'
+      write(iout,*)'CFLAGS = -DSGI -c'
+      write(iout,*)'FFLAGS = -c ${OPT} -I$(INSTALL_DIR)/include'
+      write(iout,*)'FFLAGS1 = -c -w -g -d2 -CA -CB -I$(INSTALL_DIR)...'
+      write(iout,*)'FFLAGS2 = -c -w -O0 -I$(INSTALL_DIR)/include'
+      write(iout,*)'FFLAGSE = -c -w -O3 -ipo -ipo_obj  -opt_report ...'
+      write(iout,*)'BIN = ../../../bin/unres/MD-M/unres_Tc_procor_o...'
+      write(iout,*)'LIBS = -L$(INSTALL_DIR)/lib -lmpich ../../lib/x...'
+      write(iout,*)'ARCH = LINUX'
+      write(iout,*)'PP = /lib/cpp -P'
+      write(iout,*)'object = unres.o arcos.o cartprint.o chainbuild...'
+>>>>>>> 641d04ddae7b3a57c3c949f3f980374896c94b58
       write(iout,*)'++++ End of compile info ++++'
       return
       end