Merge branch 'prerelease-3.2.1' into czarek

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

diff --git a/source/unres/src_MD/cinfo.f b/source/unres/src_MD/cinfo.f
index 0e2131d..2ac4166 100644 (file)
--- a/source/unres/src_MD/cinfo.f
+++ b/source/unres/src_MD/cinfo.f
@@ -1,4 +1,5 @@
 C DO NOT EDIT THIS FILE - IT HAS BEEN GENERATED BY COMPINFO.C
+<<<<<<< HEAD
 C 3 2 105
       subroutine cinfo
       include 'COMMON.IOUNITS'
@@ -6,26 +7,38 @@ C 3 2 105
       write(iout,*)'Version 3.2 build 105'
       write(iout,*)'compiled Tue Feb 19 05:33:00 2013'
       write(iout,*)'compiled by czarek@piasek3'
+=======
+C 3 2 116
+      subroutine cinfo
+      include 'COMMON.IOUNITS'
+      write(iout,*)'++++ Compile info ++++'
+      write(iout,*)'Version 3.2 build 116'
+      write(iout,*)'compiled Thu Nov 27 09:56:51 2014'
+      write(iout,*)'compiled by adam@mmka'
+>>>>>>> prerelease-3.2.1
       write(iout,*)'OS name:    Linux '
-      write(iout,*)'OS release: 2.6.32-42-generic '
+      write(iout,*)'OS release: 3.2.0-72-generic '
       write(iout,*)'OS version:',
-     & ' #96-Ubuntu SMP Wed Aug 15 19:37:37 UTC 2012 '
+     & ' #107-Ubuntu SMP Thu Nov 6 14:24:01 UTC 2014 '
       write(iout,*)'flags:'
-      write(iout,*)'INSTALL_DIR = /users/software/mpich-1.2.7p1_int...'
-      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,*)'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 -DPGI -DUNRES ...'
-      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,*)'GAB: CPPFLAGS = -DPROCOR -DLINUX -DG77 -DAMD64 ...'
+      write(iout,*)'GAB: BIN = ../../../bin/unres/MD/unres_gfort_MP...'
+      write(iout,*)'4P: CPPFLAGS = -DLINUX -DG77 -DAMD64 -DUNRES -D...'
+      write(iout,*)'4P: BIN = ../../../bin/unres/MD/unres_gfort_MPI...'
+      write(iout,*)'E0LL2Y: CPPFLAGS = -DPROCOR -DLINUX -DG77 -DAMD...'
+      write(iout,*)'E0LL2Y: BIN = ../../../bin/unres/MD/unres_gfort...'
       write(iout,*)'++++ End of compile info ++++'
       return
       end