Fixed Makefiles in clust/src_MD-M

diff --git a/bin/cluster/unres_clustMD-mult_ifort_MPICH_E0LL2Y.exe b/bin/cluster/unres_clustMD-mult_ifort_MPICH_E0LL2Y.exe
index 89685df..4c0ef66 100755 (executable)
Binary files a/bin/cluster/unres_clustMD-mult_ifort_MPICH_E0LL2Y.exe and b/bin/cluster/unres_clustMD-mult_ifort_MPICH_E0LL2Y.exe differ

diff --git a/source/cluster/wham/src-M/Makefile-MPICH-gfortran b/source/cluster/wham/src-M/Makefile-MPICH-gfortran
index a2fd689..962fce0 100644 (file)
--- a/source/cluster/wham/src-M/Makefile-MPICH-gfortran
+++ b/source/cluster/wham/src-M/Makefile-MPICH-gfortran
@@ -32,7 +32,7 @@ no_option:
 
 GAB: CPPFLAGS = -DPROCOR -DLINUX -DPGI -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
        -DCLUST -DSPLITELE -DLANG0 -DCRYST_BOND -DCRYST_THETA -DCRYST_SC
 
 GAB: CPPFLAGS = -DPROCOR -DLINUX -DPGI -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
        -DCLUST -DSPLITELE -DLANG0 -DCRYST_BOND -DCRYST_THETA -DCRYST_SC

-GAB: BIN = ../../../../bin/cluster/unres_clustMD-mult_ifort_MPICH_GAB.exe
+GAB: BIN = ../../../../bin/cluster/unres_clustMD-mult_gfort_MPICH_GAB.exe

 GAB: ${object} xdrf/libxdrf.a
        cc -o compinfo compinfo.c
        ./compinfo | true
 GAB: ${object} xdrf/libxdrf.a
        cc -o compinfo compinfo.c
        ./compinfo | true

@@ -41,7 +41,7 @@ GAB: ${object} xdrf/libxdrf.a
 
 4P: CPPFLAGS = -DLINUX -DPGI -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
        -DCLUST -DSPLITELE -DLANG0 -DCRYST_BOND -DCRYST_THETA -DCRYST_SC
 
 4P: CPPFLAGS = -DLINUX -DPGI -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
        -DCLUST -DSPLITELE -DLANG0 -DCRYST_BOND -DCRYST_THETA -DCRYST_SC

-4P: BIN = ../../../../bin/cluster/unres_clustMD-mult_ifort_MPICH_4P.exe
+4P: BIN = ../../../../bin/cluster/unres_clustMD-mult_gfort_MPICH_4P.exe

 4P: ${object} xdrf/libxdrf.a
        cc -o compinfo compinfo.c
        ./compinfo | true
 4P: ${object} xdrf/libxdrf.a
        cc -o compinfo compinfo.c
        ./compinfo | true

@@ -50,7 +50,7 @@ GAB: ${object} xdrf/libxdrf.a
 
 E0LL2Y: CPPFLAGS = -DLINUX -DPGI -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
        -DCLUST -DSPLITELE -DLANG0 
 
 E0LL2Y: CPPFLAGS = -DLINUX -DPGI -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
        -DCLUST -DSPLITELE -DLANG0 

-E0LL2Y: BIN = ../../../../bin/cluster/unres_clustMD-mult_ifort_MPICH_E0LL2Y.exe
+E0LL2Y: BIN = ../../../../bin/cluster/unres_clustMD-mult_gfort_MPICH_E0LL2Y.exe

 E0LL2Y: ${object} xdrf/libxdrf.a
        cc -o compinfo compinfo.c
        ./compinfo | true
 E0LL2Y: ${object} xdrf/libxdrf.a
        cc -o compinfo compinfo.c
        ./compinfo | true

diff --git a/source/cluster/wham/src-M/Makefile-MPICH-ifort b/source/cluster/wham/src-M/Makefile-MPICH-ifort
index dc58838..1c9a07a 100644 (file)
--- a/source/cluster/wham/src-M/Makefile-MPICH-ifort
+++ b/source/cluster/wham/src-M/Makefile-MPICH-ifort
@@ -30,29 +30,29 @@ no_option:
 GAB: CPPFLAGS = -DPROCOR -DLINUX -DPGI -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
        -DCLUST -DSPLITELE -DLANG0 -DCRYST_BOND -DCRYST_THETA -DCRYST_SC
 GAB: BIN = ../../../../bin/cluster/unres_clustMD-mult_ifort_MPICH_GAB.exe
 GAB: CPPFLAGS = -DPROCOR -DLINUX -DPGI -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
        -DCLUST -DSPLITELE -DLANG0 -DCRYST_BOND -DCRYST_THETA -DCRYST_SC
 GAB: BIN = ../../../../bin/cluster/unres_clustMD-mult_ifort_MPICH_GAB.exe

-GAB: ${object} xdrf/libxdrf.a
+GAB: ${objects} xdrf/libxdrf.a

        cc -o compinfo compinfo.c
        ./compinfo | true
        ${FC} ${FFLAGS} cinfo.f
        cc -o compinfo compinfo.c
        ./compinfo | true
        ${FC} ${FFLAGS} cinfo.f

-       $(FC) ${OPT} ${object} ${LIBS} -o ${BIN}
+       $(FC) ${OPT} ${objects} ${LIBS} -o ${BIN}

 
 4P: CPPFLAGS = -DLINUX -DPGI -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
        -DCLUST -DSPLITELE -DLANG0 -DCRYST_BOND -DCRYST_THETA -DCRYST_SC
 4P: BIN = ../../../../bin/cluster/unres_clustMD-mult_ifort_MPICH_4P.exe
 
 4P: CPPFLAGS = -DLINUX -DPGI -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
        -DCLUST -DSPLITELE -DLANG0 -DCRYST_BOND -DCRYST_THETA -DCRYST_SC
 4P: BIN = ../../../../bin/cluster/unres_clustMD-mult_ifort_MPICH_4P.exe

-4P: ${object} xdrf/libxdrf.a
+4P: ${objects} xdrf/libxdrf.a

        cc -o compinfo compinfo.c
        ./compinfo | true
        ${FC} ${FFLAGS} cinfo.f
        cc -o compinfo compinfo.c
        ./compinfo | true
        ${FC} ${FFLAGS} cinfo.f

-       $(FC) ${OPT} ${object} ${LIBS} -o ${BIN}
+       $(FC) ${OPT} ${objects} ${LIBS} -o ${BIN}

 
 E0LL2Y: CPPFLAGS = -DLINUX -DPGI -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
        -DCLUST -DSPLITELE -DLANG0 
 E0LL2Y: BIN = ../../../../bin/cluster/unres_clustMD-mult_ifort_MPICH_E0LL2Y.exe
 
 E0LL2Y: CPPFLAGS = -DLINUX -DPGI -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
        -DCLUST -DSPLITELE -DLANG0 
 E0LL2Y: BIN = ../../../../bin/cluster/unres_clustMD-mult_ifort_MPICH_E0LL2Y.exe

-E0LL2Y: ${object} xdrf/libxdrf.a
+E0LL2Y: ${objects} xdrf/libxdrf.a

        cc -o compinfo compinfo.c
        ./compinfo | true
        ${FC} ${FFLAGS} cinfo.f
        cc -o compinfo compinfo.c
        ./compinfo | true
        ${FC} ${FFLAGS} cinfo.f

-       $(FC) ${OPT} ${object} ${LIBS} -o ${BIN}
+       $(FC) ${OPT} ${objects} ${LIBS} -o ${BIN}

 
 xdrf/libxdrf.a:
        cd xdrf && make
 
 xdrf/libxdrf.a:
        cd xdrf && make

diff --git a/source/cluster/wham/src-M/xdrf/libxdrf.a b/source/cluster/wham/src-M/xdrf/libxdrf.a
index 38114bc..9ba25fe 100644 (file)
Binary files a/source/cluster/wham/src-M/xdrf/libxdrf.a and b/source/cluster/wham/src-M/xdrf/libxdrf.a differ