X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Funres%2FMakefile;h=f024682ef96609a49ab648b66461916018c55ba5;hb=08b96e38d3e1534b82b14c0a8c7948e490c6cebb;hp=42a1c56ae183166280265477de9170ab19c39584;hpb=4baa9e481f53d4c89b076f3aece756fc47282649;p=unres4.git

diff --git a/source/unres/Makefile b/source/unres/Makefile
index 42a1c56..f024682 100644
--- a/source/unres/Makefile
+++ b/source/unres/Makefile
@@ -5,7 +5,7 @@ INSTALL_DIR = /users/software/mpich2-1.4.1p1_intel
 
 FC= ${INSTALL_DIR}/bin/mpif90
 
-OPT =  -O3 -ip #-CA -CB
+OPT =  -O3 -ip 
 
 #FFLAGS = -fpp -c ${OPT}  -I$(INSTALL_DIR)/include
 #-mcmodel large -check arg_temp_created -heap-arrays  -recursive
@@ -38,17 +38,13 @@ all: no_option
 .f90.o:
 	${FC} ${FFLAGS} ${CPPFLAGS} $*.f90
 
-DATA_FILE= ./data
-
-data = names.o io_units.o calc_data.o compare_data.o control_data.o \
+objects = xdrf/*.o names.o io_units.o calc_data.o compare_data.o control_data.o \
 	CSA_data.o energy_data.o geometry_data.o map_data.o \
-	MCM_data.o MD_data.o minim_data.o MPI_data.o REMD_data.o comm_local.o 
-
-objects = xdrf/*.o \
+	MCM_data.o MD_data.o minim_data.o MPI_data.o REMD_data.o comm_local.o \
 	prng_32.o math.o random.o geometry.o md_calc.o io_base.o energy.o check_bond.o muca_md.o\
-	control.o io_config.o MPI.o minim.o fdisy.o fdiag.o machpd.o \
+	control.o io_config.o MPI.o minim.o \
 	regularize.o compare.o map.o REMD.o MCM_MD.o io.o \
-	MD.o MREMD.o CSA.o unres.o quindibisectok.o quindet2ok.o
+	MD.o MREMD.o CSA.o unres.o
 
 
 #${EXE_FILE}: ${objects}
@@ -62,106 +58,95 @@ NOMPI: CPPFLAGS = -DPROCOR -DLINUX -DPGI -DAMD64 -DUNRES -DISNAN \
 #NOMPI: EXE_FILE = ../../bin/unres_MD-M_NO_MPI_F90_EL.exe
 NOMPI: EXE_FILE = ../../bin/unres_NO_MPI_F90_EL.exe
 
-NOMPI: ${data} ${objects}
+NOMPI: ${objects}
 	cc -o compinfo compinfo.c
 	./compinfo | true
 	${FC} ${FFLAGS} cinfo.f90
-	${FC} ${data} ${objects} cinfo.o -o ${EXE_FILE}
+	${FC} ${objects} cinfo.o -o ${EXE_FILE}
 
 # ${FC} ${objects} -Xlinker -M -o ${EXE_FILE}
 GAB: CPPFLAGS = -DPROCOR -DLINUX -DPGI -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
         -DSPLITELE -DLANG0 -DCRYST_BOND -DCRYST_THETA -DCRYST_SC
 #GAB: EXE_FILE = ../../bin/unres_MD-M_GAB_F90_EL_opt3.exe
 GAB: EXE_FILE = ../../bin/unres_GAB_F90_EL.exe
-GAB: ${data} ${objects}
+GAB: ${objects}
 	cc -o compinfo compinfo.c
 	./compinfo | true
 	${FC} ${FFLAGS} cinfo.f90
-	${FC} ${OPT} ${data} ${objects} cinfo.o -o ${EXE_FILE}
+	${FC} ${OPT} ${objects} cinfo.o -o ${EXE_FILE}
 
 4P: CPPFLAGS = -DLINUX -DPGI -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
         -DSPLITELE -DLANG0 -DCRYST_BOND -DCRYST_THETA -DCRYST_SC
 #4P: EXE_FILE = ../../bin/unres_MD-M_4P_F90_EL_opt3.exe
 4P: EXE_FILE = ../../bin/unres_4P_F90_EL.exe
-4P: ${data}${objects}
+4P: ${objects}
 	cc -o compinfo compinfo.c
 	./compinfo | true
 	${FC} ${FFLAGS} cinfo.f90
-	${FC} ${OPT} ${data} ${objects} cinfo.o -o ${EXE_FILE}
+	${FC} ${OPT} ${objects} cinfo.o -o ${EXE_FILE}
 
 E0LL2Y: CPPFLAGS = -DPROCOR -DLINUX -DPGI -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
-        -DSPLITELE -DLANG0 
-#-DFIVEDIAG
+        -DSPLITELE -DLANG0
+#E0LL2Y: EXE_FILE = ../../bin/unres_MD-M_E0LL2Y_F90_EL_opt3.exe
 E0LL2Y: EXE_FILE = ../../bin/unres_E0LL2Y_F90_EL.exe
-#E0LL2Y: EXE_FILE = ../../bin/unres_E0LL2Y_5DiaF90_EL.exe
-E0LL2Y: ${data} ${objects}
+E0LL2Y: ${objects}
 	cc -o compinfo compinfo.c
 	./compinfo | true
 	${FC} ${FFLAGS} cinfo.f90
-	${FC} ${OPT} ${data} ${objects} cinfo.o -o ${EXE_FILE}
-
-NEWGRAD: CPPFLAGS = -DPROCOR -DLINUX -DPGI -DAMD64 -DUNRES -DISNAN -DMP -DMPI \
-        -DSPLITELE -DLANG0 -DCARGRAD -DFIVEDIAG
-NEWGRAD: EXE_FILE = ../../bin/unres_E0LL2Y_F90_EL-NEWG.exe
-NEWGRAD: ${data} ${objects}
-	cc -o compinfo compinfo.c
-	./compinfo | true
-	${FC} ${FFLAGS} cinfo.f90
-	${FC} ${OPT} ${data} ${objects} cinfo.o -o ${EXE_FILE}
+	${FC} ${OPT} ${objects} cinfo.o -o ${EXE_FILE}
 
 
 xdrf/*.o:
 	cd xdrf && make
 
 clean:
-	rm -f *.o && rm -f *.mod && rm -f compinfo && cd xdrf && make clean
-#	rm -f *.o && rm -f *.mod && rm ${EXE_FILE} && rm -f compinfo && cd xdrf && make clean
+	rm -f *.o && rm -f *.mod && rm ${EXE_FILE} && rm -f compinfo && cd xdrf && make clean
 
 
-names.o: ${DATA_FILE}/names.f90
-	${FC} ${FFLAGS} ${CPPFLAGS} ${DATA_FILE}/names.f90
+names.o: names.f90
+	${FC} ${FFLAGS} ${CPPFLAGS} names.f90
 
-io_units.o: ${DATA_FILE}/io_units.f90
-	${FC} ${FFLAGS} ${CPPFLAGS} ${DATA_FILE}/io_units.f90
+io_units.o: io_units.f90
+	${FC} ${FFLAGS} ${CPPFLAGS} io_units.f90
 
-calc_data.o: ${DATA_FILE}/calc_data.f90
-	${FC} ${FFLAGS} ${CPPFLAGS} ${DATA_FILE}/calc_data.f90
+calc_data.o: calc_data.f90
+	${FC} ${FFLAGS} ${CPPFLAGS} calc_data.f90
 
-compare_data.o: ${DATA_FILE}/compare_data.f90
-	${FC} ${FFLAGS} ${CPPFLAGS} ${DATA_FILE}/compare_data.f90
+compare_data.o: compare_data.f90
+	${FC} ${FFLAGS} ${CPPFLAGS} compare_data.f90
 
-control_data.o: ${DATA_FILE}/control_data.f90
-	${FC} ${FFLAGS} ${CPPFLAGS} ${DATA_FILE}/control_data.f90
+control_data.o: control_data.f90
+	${FC} ${FFLAGS} ${CPPFLAGS} control_data.f90
 
-CSA_data.o: ${DATA_FILE}/CSA_data.f90
-	${FC} ${FFLAGS} ${CPPFLAGS} ${DATA_FILE}/CSA_data.f90
+CSA_data.o: CSA_data.f90
+	${FC} ${FFLAGS} ${CPPFLAGS} CSA_data.f90
 
-energy_data.o: ${DATA_FILE}/energy_data.f90
-	${FC} ${FFLAGS} ${CPPFLAGS} ${DATA_FILE}/energy_data.f90
+energy_data.o: energy_data.f90
+	${FC} ${FFLAGS} ${CPPFLAGS} energy_data.f90
 
-geometry_data.o: ${DATA_FILE}/geometry_data.f90
-	${FC} ${FFLAGS} ${CPPFLAGS} ${DATA_FILE}/geometry_data.f90
+geometry_data.o: geometry_data.f90
+	${FC} ${FFLAGS} ${CPPFLAGS} geometry_data.f90
 
-map_data.o: ${DATA_FILE}/map_data.f90
-	${FC} ${FFLAGS} ${CPPFLAGS} ${DATA_FILE}/map_data.f90
+map_data.o: map_data.f90
+	${FC} ${FFLAGS} ${CPPFLAGS} map_data.f90
 
-MCM_data.o: ${DATA_FILE}/MCM_data.f90
-	${FC} ${FFLAGS} ${CPPFLAGS} ${DATA_FILE}/MCM_data.f90
+MCM_data.o: MCM_data.f90
+	${FC} ${FFLAGS} ${CPPFLAGS} MCM_data.f90
 
-MD_data.o: ${DATA_FILE}/MD_data.f90
-	${FC} ${FFLAGS} ${CPPFLAGS} ${DATA_FILE}/MD_data.f90
+MD_data.o: MD_data.f90
+	${FC} ${FFLAGS} ${CPPFLAGS} MD_data.f90
 
-minim_data.o: ${DATA_FILE}/minim_data.f90
-	${FC} ${FFLAGSm} ${CPPFLAGS} ${DATA_FILE}/minim_data.f90
+minim_data.o: minim_data.f90
+	${FC} ${FFLAGSm} ${CPPFLAGS} minim_data.f90
 
-MPI_data.o: ${DATA_FILE}/MPI_data.f90
-	${FC} ${FFLAGS} ${CPPFLAGS} ${DATA_FILE}/MPI_data.f90
+MPI_data.o: MPI_data.f90
+	${FC} ${FFLAGS} ${CPPFLAGS} MPI_data.f90
 
-REMD_data.o: ${DATA_FILE}/REMD_data.f90
-	${FC} ${FFLAGS} ${CPPFLAGS} ${DATA_FILE}/REMD_data.f90
+REMD_data.o: REMD_data.f90
+	${FC} ${FFLAGS} ${CPPFLAGS} REMD_data.f90
 
-comm_local.o: ${DATA_FILE}/comm_local.f90
-	${FC} ${FFLAGS} ${CPPFLAGS} ${DATA_FILE}/comm_local.f90
+comm_local.o: comm_local.f90
+	${FC} ${FFLAGS} ${CPPFLAGS} comm_local.f90
 
 prng_32.o: prng_32.f90
 	${FC} ${FFLAGS} ${CPPFLAGS} prng_32.f90
@@ -187,8 +172,8 @@ energy.o: energy.f90
 check_bond.o: check_bond.f90
 	${FC} ${FFLAGS} ${CPPFLAGS} check_bond.f90
 
-control.o: control.F90
-	${FC} ${FFLAGS} ${CPPFLAGS} control.F90
+control.o: control.f90
+	${FC} ${FFLAGS} ${CPPFLAGS} control.f90
 
 io_config.o: io_config.f90
 	${FC} ${FFLAGS2} ${CPPFLAGS} io_config.f90
@@ -202,8 +187,8 @@ minim.o: minim.f90
 regularize.o: regularize.f90
 	${FC} ${FFLAGS} ${CPPFLAGS} regularize.f90
 
-compare.o: compare.F90
-	${FC} ${FFLAGS} ${CPPFLAGS} compare.F90
+compare.o: compare.f90
+	${FC} ${FFLAGS} ${CPPFLAGS} compare.f90
 
 map.o: map.f90
 	${FC} ${FFLAGS} ${CPPFLAGS} map.f90
@@ -231,18 +216,3 @@ CSA.o: CSA.f90
 
 unres.o: unres.f90
 	${FC} ${FFLAGS} ${CPPFLAGS} unres.f90
-
-quindibisectok.o: quindibisectok.F90
-	${FC} ${FFLAGS} ${CPPFLAGS} quindibisectok.F90
-
-quindet2ok.o: quindet2ok.F90
-	${FC} ${FFLAGS} ${CPPFLAGS} quindet2ok.F90
-
-
-
-
-
-
-
-
-