Fixed main module of WHAM

[unres.git] / source / wham / src / Makefile_MPICH_ifort

diff --git a/source/wham/src/Makefile_MPICH_ifort b/source/wham/src/Makefile_MPICH_ifort
index 7ef235d..711b6c7 100644 (file)
--- a/source/wham/src/Makefile_MPICH_ifort
+++ b/source/wham/src/Makefile_MPICH_ifort
@@ -46,6 +46,7 @@ objects = \
        store_parm.o \
        timing.o \
        wham_calc1.o \
+       dfa.o \
        ssMD.o
 
 objects_compar = \
@@ -55,11 +56,6 @@ 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
 
-all: no_option
-       @echo "Specify force field: GAB, 4P or E0LL2Y"
-
-no_option:
-
 GAB: CPPFLAGS = -DMPI -DLINUX -DUNRES -DSPLITELE -DPROCOR -DPGI -DISNAN -DAMD64 \
        -DCRYST_BOND -DCRYST_THETA -DCRYST_SC -DWHAM
 GAB: ${objects} ${objects_compar} xdrf/libxdrf.a
@@ -67,16 +63,7 @@ GAB: ${objects} ${objects_compar} xdrf/libxdrf.a
        ./compinfo
        ${FC} -c ${FFLAGS} cinfo.f
        $(FC) ${OPT} ${objects} ${objects_compar} cinfo.o \
-       ${LIBS} -static-intel -o ${BIN}/wham_ifort_MPICH_GAB.exe
-
-4P: CPPFLAGS = -DMPI -DLINUX -DUNRES -DSPLITELE -DPGI -DISNAN -DAMD64 \
-       -DCRYST_BOND -DCRYST_THETA -DCRYST_SC -DWHAM
-4P: ${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_4P.exe
+       ${LIBS} -static-intel -o ${BIN}/wham_ifort_MPICH-restr-DFA_GAB.exe
 
 E0LL2Y: CPPFLAGS = -DMPI -DLINUX -DUNRES -DSPLITELE -DPROCOR -DPGI -DISNAN -DAMD64 -DWHAM
 E0LL2Y: ${objects} ${objects_compar} xdrf/libxdrf.a
@@ -84,7 +71,7 @@ E0LL2Y: ${objects} ${objects_compar} xdrf/libxdrf.a
        ./compinfo
        ${FC} -c ${FFLAGS} cinfo.f
        $(FC) ${OPT} ${objects} ${objects_compar} cinfo.o \
-       ${LIBS} -static-intel -o ${BIN}/wham_ifort_MPICH_E0LL2Y.exe
+       ${LIBS} -static-intel -o ${BIN}/wham_ifort_MPICH-restr-DFA_E0LL2Y-test.exe
 
 xdrf/libxdrf.a:
        cd xdrf && make