Merge branch 'devel' into feature-ga

[unres.git] / source / unres / src_CSA / Makefile_4P

diff --git a/source/unres/src_CSA/Makefile_4P b/source/unres/src_CSA/Makefile_4P
index ea68023..915eec2 100644 (file)
--- a/source/unres/src_CSA/Makefile_4P
+++ b/source/unres/src_CSA/Makefile_4P
@@ -1,7 +1,6 @@
 CPPFLAGS = -DPROCOR -DLINUX -DPGI -DISNAN -DMP -DMPI -DUNRES \
-           -DSPLITELE -DAMD64 -DLANG0 \
+           -DSPLITELE -DAMD64 -DLANG0 -DPROCOR \
            -DCRYST_BOND -DCRYST_THETA -DCRYST_SC 
-#-DCRYST_TOR
 # -DPROCOR
 #           -DTSCSC
 #-DTIMING \
@@ -10,8 +9,7 @@ CPPFLAGS = -DPROCOR -DLINUX -DPGI -DISNAN -DMP -DMPI -DUNRES \
 #-DPARVEC 
 #-DPARINT -DPARINTDER  
 
-INSTALL_DIR = /usr/local/mpich-1.2.7p1-intel
-#INSTALL_DIR =/users/software/mpich-1.2.7p1_intel-10.1_em64_ssh/
+INSTALL_DIR = /users/software/mpich-1.2.7p1_intel-10.1_em64_ssh
 
 FC= ifort 
 
@@ -24,7 +22,7 @@ FFLAGS3 = -c -w -O3 -mp
 FFLAGSE = -c -w -O3 -ipo -ipo_obj  -opt_report -I$(INSTALL_DIR)/include
 
 
-BIN = ../bin/unres_Tc_procor_050711_dfa_csa_4P_800.exe
+BIN = ../../../bin/unres/CSA/unres_csa_ifort_mpich-1.2.7p1.exe
 LIBS =  -lpthread -L$(INSTALL_DIR)/lib -lmpich
 
 ARCH = LINUX
@@ -50,7 +48,7 @@ object = unres_csa.o arcos.o cartprint.o chainbuild.o initialize_p.o \
         together.o csa.o minim_jlee.o shift.o diff12.o bank.o newconf.o ran.o \
         indexx.o prng_32.o contact.o gen_rand_conf.o \
         sc_move.o test.o local_move.o rmsd.o fitsq.o elecont.o djacob.o \
-        distfit.o banach.o
+        distfit.o banach.o TMscore_subroutine.o minim_mult.o
 
 unres: ${object} 
 #      cc -o compinfo compinfo.c