X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Funres%2Fsrc_MD%2Fcinfo.f;h=be05bcdacfaaabb883930b14a8c456c7437381b4;hb=79854d858b2df03320c654ee73f0ee891efca800;hp=b54ec8c2fc84d19762a19b5e2659ded59373078b;hpb=52187c9365594597457799445140ea830f1141a3;p=unres.git

diff --git a/source/unres/src_MD/cinfo.f b/source/unres/src_MD/cinfo.f
index b54ec8c..be05bcd 100644
--- a/source/unres/src_MD/cinfo.f
+++ b/source/unres/src_MD/cinfo.f
@@ -1,47 +1,29 @@
 C DO NOT EDIT THIS FILE - IT HAS BEEN GENERATED BY COMPINFO.C
-<<<<<<< HEAD
-C 2 5 66
+C 3 2 110
       subroutine cinfo
       include 'COMMON.IOUNITS'
       write(iout,*)'++++ Compile info ++++'
-      write(iout,*)'Version 2.5 build 66'
-      write(iout,*)'compiled Thu Jun 14 06:40:11 2012'
-      write(iout,*)'compiled by adam@matrix.chem.cornell.edu'
-=======
-C 2 5 295
-      subroutine cinfo
-      include 'COMMON.IOUNITS'
-      write(iout,*)'++++ Compile info ++++'
-      write(iout,*)'Version 2.5 build 295'
-      write(iout,*)'compiled Mon Jun 18 05:08:20 2012'
-      write(iout,*)'compiled by aks255@matrix.chem.cornell.edu'
->>>>>>> aebadf9023e437f497f92dfcf2303c16f60917c1
+      write(iout,*)'Version 3.2 build 110'
+      write(iout,*)'compiled Tue Apr 30 09:32:51 2013'
+      write(iout,*)'compiled by czarek@piasek3'
       write(iout,*)'OS name:    Linux '
-      write(iout,*)'OS release: 2.6.34.9-69.fc13.x86_64 '
+      write(iout,*)'OS release: 2.6.32-45-generic '
       write(iout,*)'OS version:',
-     & ' #1 SMP Tue May 3 09:23:03 UTC 2011 '
+     & ' #104-Ubuntu SMP Tue Feb 19 21:20:09 UTC 2013 '
       write(iout,*)'flags:'
-<<<<<<< HEAD
-      write(iout,*)'FC = ifort'
-      write(iout,*)'FFLAGS = -c ${OPT} -I$(INSTALL_DIR)/include'
-=======
       write(iout,*)'INSTALL_DIR = /users/software/mpich-1.2.7p1_int...'
       write(iout,*)'FC= ifort'
-      write(iout,*)'OPT =  -g -ip -w -CB '
+      write(iout,*)'OPT =  -O3 -ip '
       write(iout,*)'FFLAGS = -c ${OPT} -I$(INSTALL_DIR)/include '
->>>>>>> aebadf9023e437f497f92dfcf2303c16f60917c1
-      write(iout,*)'FFLAGS1 = -c -w -g -d2 -CA -CB -I$(INSTALL_DIR)...'
-      write(iout,*)'FFLAGS2 = -c -w -g -O0 -I$(INSTALL_DIR)/include'
-      write(iout,*)'FFLAGSE = -c -w -O3 -ipo -ipo_obj  -opt_report ...'
-      write(iout,*)'CC = cc'
-      write(iout,*)'CFLAGS = -DLINUX -DPGI -c'
-      write(iout,*)'OPT =  -O3 -ip -w'
-      write(iout,*)'LIBS = -Lxdrf -lxdrf'
+      write(iout,*)'FFLAGS1 = -c  -g -CA -CB -I$(INSTALL_DIR)/inclu...'
+      write(iout,*)'FFLAGS2 = -c  -g -O0 -I$(INSTALL_DIR)/include  '
+      write(iout,*)'FFLAGSE = -c  -O3 -ipo  -opt_report -I$(INSTALL...'
+      write(iout,*)'LIBS = -L$(INSTALL_DIR)/lib -lmpich xdrf/libxdr...'
       write(iout,*)'ARCH = LINUX'
       write(iout,*)'PP = /lib/cpp -P'
       write(iout,*)'object = unres.o arcos.o cartprint.o chainbuild...'
       write(iout,*)'GAB: CPPFLAGS = -DPROCOR -DLINUX -DPGI -DUNRES ...'
-      write(iout,*)'GAB: BIN = ../../../bin/unres/MD/unres_ifort_si...'
+      write(iout,*)'GAB: BIN = ../../../bin/unres/MD/unres_ifort_MP...'
       write(iout,*)'E0LL2Y: CPPFLAGS = -DPROCOR -DLINUX -DPGI -DUNR...'
       write(iout,*)'E0LL2Y: BIN = ../../../bin/unres/MD/unres_ifort...'
       write(iout,*)'++++ End of compile info ++++'