Merge branch 'prerelease-3.2.1' of mmka.chem.univ.gda.pl:unres into prerelease-3.2.1

[unres.git] / source / unres / src_MD-M / cinfo.f

diff --git a/source/unres/src_MD-M/cinfo.f b/source/unres/src_MD-M/cinfo.f
index 237f29d..708ae58 100644 (file)
--- a/source/unres/src_MD-M/cinfo.f
+++ b/source/unres/src_MD-M/cinfo.f
@@ -1,4 +1,36 @@
 C DO NOT EDIT THIS FILE - IT HAS BEEN GENERATED BY COMPINFO.C
+<<<<<<< HEAD
+C 0 40360 35
+      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,*)'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,*)'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,*)'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'
@@ -28,6 +60,7 @@ C 2 3 3460
       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