From 02dfe171443642a0354a2836ede7b896fe9961c8 Mon Sep 17 00:00:00 2001 From: Cezary Czaplewski Date: Wed, 7 Aug 2013 23:54:08 +0200 Subject: [PATCH] decrease of Max_Parm to 32 necessary for 4GB machine --- source/wham/src/DIMENSIONS.FREE | 2 +- source/wham/src/Makefile_MPICH_ifort | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/source/wham/src/DIMENSIONS.FREE b/source/wham/src/DIMENSIONS.FREE index a2eb4e5..9d03cee5 100644 --- a/source/wham/src/DIMENSIONS.FREE +++ b/source/wham/src/DIMENSIONS.FREE @@ -2,7 +2,7 @@ integer MaxQ,MaxQ1 integer MaxR,MaxT_h integer MaxSlice - parameter (Max_Parm=128) + parameter (Max_Parm=32) parameter (MaxQ=4,MaxQ1=MaxQ+2) parameter(MaxR=1,MaxT_h=32) parameter(MaxSlice=40) diff --git a/source/wham/src/Makefile_MPICH_ifort b/source/wham/src/Makefile_MPICH_ifort index 1d4a159..9be99a7 100644 --- a/source/wham/src/Makefile_MPICH_ifort +++ b/source/wham/src/Makefile_MPICH_ifort @@ -1,7 +1,7 @@ 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 -O3 -ip -w #OPT = -mcmodel=medium -g -CB FFLAGS = ${OPT} -c -I. -I./include_unres -I$(INSTALL_DIR)/include LIBS = -L$(INSTALL_DIR)/lib -lmpich -lpmpich xdrf/libxdrf.a @@ -45,7 +45,8 @@ objects = \ slices.o \ store_parm.o \ timing.o \ - wham_calc1.o + wham_calc1.o \ + ssMD.o objects_compar = \ readrtns_compar.o \ @@ -55,7 +56,7 @@ objects_compar = \ rmscalc.o secondary.o proc_cont.o define_pairs.o mysort.o GAB: CPPFLAGS = -DMPI -DLINUX -DUNRES -DSPLITELE -DPROCOR -DPGI -DISNAN -DAMD64 \ - -DCRYST_BOND -DCRYST_THETA -DCRYST_SC + -DCRYST_BOND -DCRYST_THETA -DCRYST_SC -DWHAM GAB: ${objects} ${objects_compar} xdrf/libxdrf.a cc -o compinfo compinfo.c ./compinfo @@ -63,7 +64,7 @@ GAB: ${objects} ${objects_compar} xdrf/libxdrf.a $(FC) ${OPT} ${objects} ${objects_compar} cinfo.o \ ${LIBS} -static-intel -o ${BIN}/wham_ifort_MPICH_GAB-DEBUG.exe -E0LL2Y: CPPFLAGS = -DMPI -DLINUX -DUNRES -DSPLITELE -DPROCOR -DPGI -DISNAN -DAMD64 +E0LL2Y: CPPFLAGS = -DMPI -DLINUX -DUNRES -DSPLITELE -DPROCOR -DPGI -DISNAN -DAMD64 -DWHAM E0LL2Y: ${objects} ${objects_compar} xdrf/libxdrf.a cc -o compinfo compinfo.c ./compinfo -- 1.7.9.5