X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;ds=sidebyside;f=source%2Funres%2Fsrc_MD%2Fcinfo.f;h=be854acbf65b06571df4156362f190a62cc87ba7;hb=bf8b3ab324569ca7ae7bb9045ad9358f6826a150;hp=2168fb7adb24b1314b4ffdfd3fcd60d84485876d;hpb=a1b7a213eef48965c9aa349a761ebeca646a0b7e;p=unres.git

diff --git a/source/unres/src_MD/cinfo.f b/source/unres/src_MD/cinfo.f
index 2168fb7..be854ac 100644
--- a/source/unres/src_MD/cinfo.f
+++ b/source/unres/src_MD/cinfo.f
@@ -1,40 +1,30 @@
 C DO NOT EDIT THIS FILE - IT HAS BEEN GENERATED BY COMPINFO.C
-<<<<<<< HEAD
-C 3 1 9
+C 3 2 122
       subroutine cinfo
       include 'COMMON.IOUNITS'
       write(iout,*)'++++ Compile info ++++'
-      write(iout,*)'Version 3.1 build 9'
-      write(iout,*)'compiled Mon Sep 24 13:56:56 2012'
-=======
-C 3 1 41
-      subroutine cinfo
-      include 'COMMON.IOUNITS'
-      write(iout,*)'++++ Compile info ++++'
-      write(iout,*)'Version 3.1 build 41'
-      write(iout,*)'compiled Fri Feb 15 01:43:03 2013'
->>>>>>> b09212e... adding ename to statout with PRINT_COMPON
-      write(iout,*)'compiled by czarek@piasek3'
+      write(iout,*)'Version 3.2 build 122'
+      write(iout,*)'compiled Wed Oct 30 21:34:17 2013'
+      write(iout,*)'compiled by czarek@cuda1'
       write(iout,*)'OS name:    Linux '
-      write(iout,*)'OS release: 2.6.32-42-generic '
+      write(iout,*)'OS release: 3.2.0-32-generic '
       write(iout,*)'OS version:',
-     & ' #96-Ubuntu SMP Wed Aug 15 19:37:37 UTC 2012 '
+     & ' #51-Ubuntu SMP Wed Sep 26 21:33:09 UTC 2012 '
       write(iout,*)'flags:'
-      write(iout,*)'INSTALL_DIR = /users/software/mpich-1.2.7p1_int...'
-      write(iout,*)'FC= ifort'
-      write(iout,*)'OPT =  -g -ip -w -CB '
-      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 -g -O0 -I$(INSTALL_DIR)/include  '
-      write(iout,*)'FFLAGSE = -c -w -O3 -ipo -ipo_obj  -opt_report ...'
-      write(iout,*)'LIBS = -L$(INSTALL_DIR)/lib -lmpich xdrf/libxdr...'
+      write(iout,*)'FC= mpif90'
+      write(iout,*)'OPT =  -fast'
+      write(iout,*)'FFLAGS = -c ${OPT} '
+      write(iout,*)'FFLAGS1 = -c  -g '
+      write(iout,*)'FFLAGS2 = -c  -g -O0 '
+      write(iout,*)'FFLAGSE = -c  -fast -Minline=name:scalar2,scala...'
+      write(iout,*)'LIBS = xdrf/libxdrf.a'
       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,*)'GAB: BIN = ../../../bin/unres/MD/unres_pgf90_mp...'
       write(iout,*)'E0LL2Y: CPPFLAGS = -DPROCOR -DLINUX -DPGI -DUNR...'
-      write(iout,*)'E0LL2Y: BIN = ../../../bin/unres/MD/unres_ifort...'
+      write(iout,*)'E0LL2Y: BIN = ../../../bin/unres/MD/unres_pgf90...'
       write(iout,*)'++++ End of compile info ++++'
       return
       end