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

diff --git a/source/unres/src_MD-M/cinfo.f b/source/unres/src_MD-M/cinfo.f
index 708ae58..b3595dd 100644
--- a/source/unres/src_MD-M/cinfo.f
+++ b/source/unres/src_MD-M/cinfo.f
@@ -1,66 +1,33 @@
 C DO NOT EDIT THIS FILE - IT HAS BEEN GENERATED BY COMPINFO.C
-<<<<<<< HEAD
-C 0 40360 35
+C 0 40376 2
       subroutine cinfo
       include 'COMMON.IOUNITS'
       write(iout,*)'++++ Compile info ++++'
-      write(iout,*)'Version 0.40360 build 35'
-      write(iout,*)'compiled Mon Jan  5 06:42:38 2015'
+      write(iout,*)'Version 0.40376 build 2'
+      write(iout,*)'compiled Sun May 10 03:42:01 2015'
       write(iout,*)'compiled by adam@piasek4'
       write(iout,*)'OS name:    Linux '
       write(iout,*)'OS release: 3.2.0-70-generic '
       write(iout,*)'OS version:',
      & ' #105-Ubuntu SMP Wed Sep 24 19:49:16 UTC 2014 '
       write(iout,*)'flags:'
-      write(iout,*)'INSTALL_DIR = /users/software/mpich2-1.0.7'
-      write(iout,*)'FC= gfortran'
-      write(iout,*)'OPT =  -O'
-      write(iout,*)'FFLAGS = -c ${OPT} -I$(INSTALL_DIR)/include'
-      write(iout,*)'FFLAGS1 = -c -I$(INSTALL_DIR)/include'
-      write(iout,*)'FFLAGS2 = -c -O0 -I$(INSTALL_DIR)/include'
-      write(iout,*)'FFLAGS3 = -c -O -I$(INSTALL_DIR)/include'
-      write(iout,*)'FFLAGSE = -c -O3 -I$(INSTALL_DIR)/include'
-      write(iout,*)'LIBS = -L$(INSTALL_DIR)/lib -lmpich -lpthread x...'
+      write(iout,*)'INSTALL_DIR = /users/software/mpich2-1.4.1p1_in...'
+      write(iout,*)'FC= ifort'
+      write(iout,*)'OPT =  -O3 -ip '
+      write(iout,*)'FFLAGS = -c ${OPT} -I$(INSTALL_DIR)/include '
+      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 -DG77 -DAMD64 ...'
-      write(iout,*)'GAB: BIN = ../../../bin/unres/MD/unres-D-symetr...'
-      write(iout,*)'4P: CPPFLAGS = -DLINUX -DG77 -DAMD64 -DUNRES -D...'
+      write(iout,*)'GAB: CPPFLAGS = -DPROCOR -DLINUX -DPGI -DAMD64 ...'
+      write(iout,*)'GAB: BIN = ../../../bin/unres/MD/unres-mult-sym...'
+      write(iout,*)'4P: CPPFLAGS = -DLINUX -DPGI -DAMD64 -DUNRES -D...'
       write(iout,*)'4P: BIN = ../../../bin/unres/MD/unres-mult-syme...'
-      write(iout,*)'E0LL2Y: CPPFLAGS = -DPROCOR -DLINUX -DG77 -DAMD...'
+      write(iout,*)'E0LL2Y: CPPFLAGS = -DPROCOR -DLINUX -DPGI -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