X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Funres%2Fsrc_MD%2FMakefile_MPICH_ifort;h=509b0cb508d63f28e44e08728aa2a823c4ad358b;hb=26591bffd0d706caeed1e3b49f76215dc2411363;hp=8a07ff9929939af10afa23c073e461a9ae97194c;hpb=640bb912c3b2b3ca0742fa4d15735e0eea2e7744;p=unres.git

diff --git a/source/unres/src_MD/Makefile_MPICH_ifort b/source/unres/src_MD/Makefile_MPICH_ifort
index 8a07ff9..509b0cb 100644
--- a/source/unres/src_MD/Makefile_MPICH_ifort
+++ b/source/unres/src_MD/Makefile_MPICH_ifort
@@ -1,5 +1,6 @@
 ###################################################################
-INSTALL_DIR = /users/software/mpich-1.2.7p1_intel-10.1_em64_ssh
+#INSTALL_DIR = /users/software/mpich-1.2.7p1_intel-10.1_em64_ssh
+INSTALL_DIR = /users/software/mpich2-1.4.1p1_intel
 
 
 FC= ifort
@@ -8,13 +9,14 @@ OPT =  -O3 -ip
 
 FFLAGS = -c ${OPT} -I$(INSTALL_DIR)/include 
 FFLAGS1 = -c  -g -CA -CB -I$(INSTALL_DIR)/include 
-FFLAGS2 = -c  -g -O0 -I$(INSTALL_DIR)/include  
+FFLAGS2 = -c  -O3  -I$(INSTALL_DIR)/include  
 FFLAGSE = -c  -O3 -ipo  -opt_report -I$(INSTALL_DIR)/include
 #FFLAGS = ${FFLAGS1}
 #FFLAGSE = ${FFLAGS1}
 
-
-LIBS = -L$(INSTALL_DIR)/lib -lmpich xdrf/libxdrf.a
+# -lmpl necessary in mpich
+LIBS = -L$(INSTALL_DIR)/lib -lmpich xdrf/libxdrf.a -lmpl 
+#LIBS = -L$(INSTALL_DIR)/lib -lmpich xdrf/libxdrf.a -CB
 
 ARCH = LINUX
 PP = /lib/cpp -P
@@ -42,13 +44,13 @@ object = unres.o arcos.o cartprint.o chainbuild.o convert.o initialize_p.o \
         intcartderiv.o lagrangian_lesyng.o\
 	stochfric.o kinetic_lesyng.o MD_A-MTS.o moments.o int_to_cart.o \
         surfatom.o sort.o muca_md.o MREMD.o rattle.o gauss.o energy_split-sep.o \
-        q_measure.o gnmr1.o test.o dfa.o ssMD.o
+        q_measure.o gnmr1.o test.o ssMD.o
 
 no_option:
 
 GAB: CPPFLAGS = -DPROCOR -DLINUX -DPGI -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
 	-DSPLITELE -DLANG0 -DCRYST_BOND -DCRYST_THETA -DCRYST_SC
-GAB: BIN = ../../../bin/unres/MD/unres_ifort_MPICH_GAB.exe
+GAB: BIN = ../../../bin/unres/MD/unres_ifort_MPICH2_GAB.exe
 GAB: ${object} xdrf/libxdrf.a
 	cc -o compinfo compinfo.c
 	./compinfo | true
@@ -57,7 +59,7 @@ GAB: ${object} xdrf/libxdrf.a
 
 4P: CPPFLAGS = -DLINUX -DPGI -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
 	-DSPLITELE -DLANG0 -DCRYST_BOND -DCRYST_THETA -DCRYST_SC
-4P: BIN = ../../../bin/unres/MD/unres_ifort_MPICH_4P.exe
+4P: BIN = ../../../bin/unres/MD/unres_ifort_MPICH2_4P.exe
 4P: ${object} xdrf/libxdrf.a
 	cc -o compinfo compinfo.c
 	./compinfo | true
@@ -66,13 +68,43 @@ GAB: ${object} xdrf/libxdrf.a
 
 E0LL2Y: CPPFLAGS = -DPROCOR -DLINUX -DPGI -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
 	-DSPLITELE -DLANG0
-E0LL2Y: BIN = ../../../bin/unres/MD/unres_ifort_MPICH_E0LL2Y.exe
+#E0LL2Y: BIN = ../../../bin/unres/MD/unres_ifort_MPICH2_E0LL2Y.exe
+E0LL2Y: BIN = ../../../bin/unres/MD/unres_ifort_MPICH_E0LL2Y-202.exe
 E0LL2Y: ${object} xdrf/libxdrf.a
 	cc -o compinfo compinfo.c
 	./compinfo | true
 	${FC} ${FFLAGS} cinfo.f
 	${FC} ${OPT} ${object} cinfo.o ${LIBS}  -o ${BIN}
 
+GAB-DFA: CPPFLAGS = -DPROCOR -DLINUX -DPGI -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
+	-DSPLITELE -DLANG0 -DCRYST_BOND -DCRYST_THETA -DCRYST_SC -DDFA
+GAB-DFA: BIN = ../../../bin/unres/MD/unres_ifort_MPICH2_GAB-DFA.exe
+GAB-DFA: ${object} dfa.o xdrf/libxdrf.a
+	cc -o compinfo compinfo.c
+	./compinfo | true
+	${FC} ${FFLAGS} cinfo.f
+	${FC} ${OPT} ${object} dfa.o cinfo.o ${LIBS}  -o ${BIN}
+
+4P-DFA: CPPFLAGS = -DLINUX -DPGI -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
+	-DSPLITELE -DLANG0 -DCRYST_BOND -DCRYST_THETA -DCRYST_SC -DDFA
+4P-DFA: BIN = ../../../bin/unres/MD/unres_ifort_MPICH2_4P-DFA.exe
+4P-DFA: ${object} dfa.o xdrf/libxdrf.a
+	cc -o compinfo compinfo.c
+	./compinfo | true
+	${FC} ${FFLAGS} cinfo.f
+	${FC} ${OPT} ${object} dfa.o cinfo.o ${LIBS}  -o ${BIN}
+
+E0LL2Y-DFA: CPPFLAGS = -DPROCOR -DLINUX -DPGI -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
+	-DSPLITELE -DLANG0 -DDFA
+#E0LL2Y-DFA: BIN = ../../../bin/unres/MD/unres_ifort_MPICH2_E0LL2Y.exe
+E0LL2Y-DFA: BIN = ../../../bin/unres/MD/unres_ifort_MPICH_E0LL2Y-DFA.exe
+E0LL2Y-DFA: ${object} dfa.o xdrf/libxdrf.a
+	cc -o compinfo compinfo.c
+	./compinfo | true
+	${FC} ${FFLAGS} cinfo.f
+	${FC} ${OPT} ${object} dfa.o cinfo.o ${LIBS}  -o ${BIN}
+
+
 xdrf/libxdrf.a:
 	cd xdrf && make
 
@@ -102,7 +134,7 @@ readpdb.o : readpdb.F
 	${FC} ${FFLAGS2} ${CPPFLAGS} readpdb.F
 
 sumsld.o : sumsld.f
-	${FC} ${FFLAGS2} ${CPPFLAGS} sumsld.f
+	${FC} ${FFLAGS2} ${CPPFLAGS} -vec-report2   sumsld.f
         
 cored.o : cored.f
 	${FC} ${FFLAGS2} ${CPPFLAGS} cored.f