From: Cezary Czaplewski <czarek@chem.univ.gda.pl>
Date: Thu, 18 Dec 2014 09:03:24 +0000 (+0100)
Subject: Merge branch 'prerelease-3.2.1' into czarek
X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?p=unres.git;a=commitdiff_plain;h=94c9f54ff76d22351c0cd2f1b01e809515163940

Merge branch 'prerelease-3.2.1' into czarek

Conflicts:
	bin/unres/MD/unres_gfortran_single_GAB.exe
	bin/unres/MD/unres_ifort_MPICH_GAB.exe
	source/unres/src_MD/cinfo.f
---

94c9f54ff76d22351c0cd2f1b01e809515163940
diff --cc bin/unres/MD/unres_ifort_MPICH_GAB.exe
index ba04a94,2f98745..0000000
deleted file mode 100755,100755
Binary files differ
diff --cc source/unres/src_MD/cinfo.f
index 2ac4166,b35a910..0000000
deleted file mode 100644,100644
--- a/source/unres/src_MD/cinfo.f
+++ /dev/null
@@@ -1,44 -1,34 +1,0 @@@
--C DO NOT EDIT THIS FILE - IT HAS BEEN GENERATED BY COMPINFO.C
- <<<<<<< HEAD
- C 3 2 105
-       subroutine cinfo
-       include 'COMMON.IOUNITS'
-       write(iout,*)'++++ Compile info ++++'
-       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: 3.2.0-72-generic '
-       write(iout,*)'OS version:',
-      & ' #107-Ubuntu SMP Thu Nov 6 14:24:01 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_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
 -C 3 2 128
 -      subroutine cinfo
 -      include 'COMMON.IOUNITS'
 -      write(iout,*)'++++ Compile info ++++'
 -      write(iout,*)'Version 3.2 build 128'
 -      write(iout,*)'compiled Wed Dec 10 13:14:48 2014'
 -      write(iout,*)'compiled by adam@mmka'
 -      write(iout,*)'OS name:    Linux '
 -      write(iout,*)'OS release: 3.2.0-72-generic '
 -      write(iout,*)'OS version:',
 -     & ' #107-Ubuntu SMP Thu Nov 6 14:24:01 UTC 2014 '
 -      write(iout,*)'flags:'
 -      write(iout,*)'FC= gfortran'
 -      write(iout,*)'FFLAGS = -c ${OPT} -I.'
 -      write(iout,*)'FFLAGS1 = -c ${OPT1} -I.'
 -      write(iout,*)'CC = cc'
 -      write(iout,*)'CFLAGS = -DLINUX -DPGI -c'
 -      write(iout,*)'OPT =  -O -fbounds-check -g'
 -      write(iout,*)'OPT1 = -g '
 -      write(iout,*)'LIBS = -Lxdrf -lxdrf'
 -      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 -DAMD64 -DUNRE...'
 -      write(iout,*)'GAB: BIN = ../../../bin/unres/MD/unres_gfortran...'
 -      write(iout,*)'4P: CPPFLAGS = -DLINUX -DAMD64 -DUNRES -DISNAN \\'
 -      write(iout,*)'	-DSPLITELE -DLANG0 -DCRYST_BOND -DCRYST_THETA ...'
 -      write(iout,*)'4P: BIN = ../../../bin/unres/MD/unres_gfortran_...'
 -      write(iout,*)'E0LL2Y: CPPFLAGS = -DPROCOR -DLINUX -DAMD64 -DU...'
 -      write(iout,*)'E0LL2Y: BIN = ../../../bin/unres/MD/unres_gfort...'
 -      write(iout,*)'++++ End of compile info ++++'
 -      return
 -      end