+<<<<<<< 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
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
$(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