X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Fwham%2Fsrc-NEWSC%2FMakefile_MPICH_ifort;h=eddfa2b469e433743c4805b0372f9edb19fd6ced;hb=e74a1da46f47c86b0c46679481b757c425642977;hp=704d325b86599fae04e7e354322b20f938a1bff6;hpb=d0bc9ab44e8f75f5cb92a01cda9daba97791e379;p=unres.git

diff --git a/source/wham/src-NEWSC/Makefile_MPICH_ifort b/source/wham/src-NEWSC/Makefile_MPICH_ifort
index 704d325..eddfa2b 100644
--- a/source/wham/src-NEWSC/Makefile_MPICH_ifort
+++ b/source/wham/src-NEWSC/Makefile_MPICH_ifort
@@ -1,8 +1,16 @@
+<<<<<<< HEAD
 INSTALL_DIR = /users/software/mpich-1.2.7p1_intel-10.1_em64_ssh
 BIN = ../../../bin/wham
 FC= ifort
 OPT = -mcmodel=medium -O3 -ip -w
 #OPT = -mcmodel=medium -g -CB
+=======
+INSTALL_DIR = /users/local/mpi64/mpich-1.2.7p1
+BIN = /users/adam/bin
+FC= ifort
+OPT = -mcmodel=medium -O3 -ip -w
+#OPT = -mcmodel=medium -g -CA -CB
+>>>>>>> e183793... Added src_MD-M-newcorr (Adasko's source) and src-NEWSC of WHAM (with Momo's SCSC potentials)
 FFLAGS = ${OPT} -c -I. -I./include_unres -I$(INSTALL_DIR)/include
 LIBS = -L$(INSTALL_DIR)/lib -lmpich -lpmpich xdrf/libxdrf.a
 
@@ -54,6 +62,18 @@ objects_compar = \
         angnorm.o odlodc.o promienie.o qwolynes.o read_ref_str.o \
         rmscalc.o secondary.o proc_cont.o define_pairs.o mysort.o
 
+<<<<<<< HEAD
+=======
+GABs: CPPFLAGS = -DMPI -DLINUX -DUNRES -DSPLITELE -DPROCOR -DPGI -DISNAN -DAMD64 \
+	-DCRYST_BOND -DCRYST_THETA -DCRYST_SC -DSCALREP
+GABs: ${objects} ${objects_compar} xdrf/libxdrf.a
+	cc -o compinfo compinfo.c
+	./compinfo
+	${FC} -c ${FFLAGS} cinfo.f
+	$(FC) ${OPT} ${objects} ${objects_compar} cinfo.o \
+	${LIBS} -static-intel -o ${BIN}/wham_ifort_MPICH_MM-KN-DEBUG-scalrep.exe
+
+>>>>>>> e183793... Added src_MD-M-newcorr (Adasko's source) and src-NEWSC of WHAM (with Momo's SCSC potentials)
 GAB: CPPFLAGS = -DMPI -DLINUX -DUNRES -DSPLITELE -DPROCOR -DPGI -DISNAN -DAMD64 \
 	-DCRYST_BOND -DCRYST_THETA -DCRYST_SC
 GAB: ${objects} ${objects_compar} xdrf/libxdrf.a
@@ -63,13 +83,21 @@ GAB: ${objects} ${objects_compar} xdrf/libxdrf.a
 	$(FC) ${OPT} ${objects} ${objects_compar} cinfo.o \
 	${LIBS} -static-intel -o ${BIN}/wham_ifort_MPICH_MM-KN-DEBUG.exe
 
+<<<<<<< HEAD
 E0LL2Y: CPPFLAGS = -DMPI -DLINUX -DUNRES -DSPLITELE -DPROCOR -DPGI -DISNAN -DAMD64 
+=======
+E0LL2Y: CPPFLAGS = -DMPI -DLINUX -DUNRES -DSPLITELE -DPROCOR -DPGI -DISNAN -DAMD64
+>>>>>>> e183793... Added src_MD-M-newcorr (Adasko's source) and src-NEWSC of WHAM (with Momo's SCSC potentials)
 E0LL2Y: ${objects} ${objects_compar} xdrf/libxdrf.a
 	cc -o compinfo compinfo.c
 	./compinfo
 	${FC} -c ${FFLAGS} cinfo.f
 	$(FC) ${OPT} ${objects} ${objects_compar} cinfo.o \
+<<<<<<< HEAD
 	${LIBS} -static-intel -o ${BIN}/wham_ifort_MPICH_MM-PH-DEBUG.exe
+=======
+	${LIBS} -static-intel -o ${BIN}/wham_ifort_MPICH_MM-PH.exe
+>>>>>>> e183793... Added src_MD-M-newcorr (Adasko's source) and src-NEWSC of WHAM (with Momo's SCSC potentials)
 
 xdrf/libxdrf.a:
 	cd xdrf && make