--- trunk/OOPSE/libmdtools/Makefile	2003/06/19 22:02:44	559
+++ trunk/OOPSE/libmdtools/Makefile	2003/07/25 20:00:17	653
@@ -22,36 +22,40 @@ FFLAGS=$(FFLAGS_C) $(DECLARES)
 
 CFLAGS=$(CFLAGS_C) $(INCLUDES) $(DECLARES) $(MPI_INCLUDES)
 CXXFLAGS=$(CXXFLAGS_C) $(INCLUDES) $(DECLARES)
-FFLAGS=$(FFLAGS_C) $(DECLARES)
+FFLAGS=$(FFLAGS_C) 
 DEPFLAGS=$(CFLAGS_C) -I. -I../libBASS -I$(SPRNG_INC) $(MPI_INCLUDES)
 
 MPI_CFLAGS=$(CFLAGS) $(MPI_INCLUDES) $(MPI_DECLARES)
 MPI_CXXFLAGS=$(CXXFLAGS) $(MPI_INCLUDES) $(MPI_DECLARES)
 MPI_FFLAGS=$(FFLAGS) $(MPI_INCLUDES) $(MPI_DECLARES)
 
+SRC_DIR := $(PWD)
+
 # Then do the compile rules:
 
 obj/%.o: %.F90
-	cd obj; $(FC) $(FFLAGS) -c  ../$<
+	cd obj; $(FC) $(FFLAGS) -c  $(SRC_DIR)/$<
 
 MPIobj/%.o: %.F90
-	cd MPIobj; $(FC) $(MPI_FFLAGS) -c ../$<
+	cd MPIobj; $(FC) $(MPI_FFLAGS) -c $(SRC_DIR)/$<
 
 obj/%.o: %.cpp
-	cd obj; $(CXX) $(CXXFLAGS) -c ../$<
+	cd obj; $(CXX) $(CXXFLAGS) -c $(SRC_DIR)/$<
 
 MPIobj/%.o: %.cpp
-	cd MPIobj; $(CXX) $(MPI_CXXFLAGS) -c ../$<
+	cd MPIobj; $(CXX) $(MPI_CXXFLAGS) -c $(SRC_DIR)/$<
 
 obj/%.o: %.c
-	cd obj; $(CC) $(CFLAGS) -c ../$<
+	cd obj; $(CC) $(CFLAGS) -c $(SRC_DIR)/$<
 
 MPIobj/%.o: %.c
-	cd MPIobj; $(CC) $(MPI_CFLAGS) -c ../$<
+	cd MPIobj; $(CC) $(MPI_CFLAGS) -c $(SRC_DIR)/$<
 
 # Then list what we have to compile
 
-C_FILES = $(DIR)/mpiForceField.c
+C_FILES = \
+	$(DIR)/mpiForceField.c \
+	$(DIR)/fInfo.c
 
 CXX_FILES = \
 	$(DIR)/Atom.cpp \
@@ -62,9 +66,9 @@ CXX_FILES = \
 	$(DIR)/DirectionalAtom.cpp \
 	$(DIR)/DumpWriter.cpp \
 	$(DIR)/Exclude.cpp \
-	$(DIR)/ExtendedSystem.cpp \
 	$(DIR)/InitializeFromFile.cpp \
 	$(DIR)/LJFF.cpp \
+	$(DIR)/EAM_FF.cpp \
 	$(DIR)/SimInfo.cpp \
 	$(DIR)/SimSetup.cpp \
 	$(DIR)/StatWriter.cpp \
@@ -78,16 +82,17 @@ CXX_FILES = \
 	$(DIR)/fortranWrappers.cpp \
 	$(DIR)/ForceFields.cpp \
 	$(DIR)/mpiSimulation.cpp \
-	$(DIR)/Molecule.cpp
+	$(DIR)/Molecule.cpp 
 
 
 F90_FILES= \
 	$(DIR)/Linux_ifc_machdep.F90 \
+	$(DIR)/status_module.F90 \
 	$(DIR)/atype_module.F90 \
-	$(DIR)/f_verlet_constrained.F90 \
 	$(DIR)/calc_dipole_dipole.F90 \
 	$(DIR)/calc_reaction_field.F90 \
 	$(DIR)/calc_LJ_FF.F90 \
+	$(DIR)/calc_eam.F90 \
 	$(DIR)/calc_sticky_pair.F90 \
 	$(DIR)/do_Forces.F90 \
 	$(DIR)/vector_class.F90 \
@@ -96,7 +101,8 @@ F90_FILES= \
 	$(DIR)/neighborLists.F90 \
 	$(DIR)/calc_gb.F90 \
 	$(DIR)/force_globals.F90 \
-	$(DIR)/mpiSimulation_module.F90
+	$(DIR)/mpiSimulation_module.F90 \
+	$(DIR)/notifyCutoffs.F90
 
 DIR:=.
 C_SRCS   :=     $(C_FILES)
@@ -155,8 +161,8 @@ Make.dep : $(SRCS)
 	echo "# DO NOT DELETE THIS LINE - used by make depend" > Make.dep
 	$(CC) $(DEPFLAGS) -MM $(C_SRCS) $(CXX_SRCS) \
 		| sed 's/\.o:/\$$(O)\ :/g' > Make.temp
-	cat Make.temp | sed 's/^/obj\//' >> Make.dep
-	cat Make.temp | sed 's/^/MPIobj\//' >> Make.dep
+	cat Make.temp | sed 's/^[a-zA-Z0-9]/obj\/&/g' >> Make.dep
+	cat Make.temp | sed 's/^[a-zA-Z0-9]/MPIobj\/&/g' >> Make.dep
 #	../scripts/sfmakedepend -I $(MPI_F90_MODS) -d obj -f ./Make.ftemp -h *.F90
 #	../scripts/sfmakedepend -I $(MPI_F90_MODS) -d MPIobj -f ./Make.ftemp -h *.F90
 #	cat Make.ftemp | sed 's/\.o:/\$$(O)\ :/g' >> Make.dep
@@ -176,6 +182,8 @@ obj/force_globals$(O): ./force_globals.F90 \
 
 obj/vector_class$(O): ./vector_class.F90
 
+obj/status_module$(O): ./status_module.F90
+
 obj/force_globals$(O): ./force_globals.F90 \
 	obj/$(F_MACH_DEFS)
 
@@ -187,6 +195,14 @@ obj/calc_gb$(O): ./calc_gb.F90 \
 	obj/simulation_module$(O) \
 	obj/force_globals$(O)
 
+obj/calc_eam$(O): ./calc_eam.F90 \
+	obj/$(F_MACH_DEFS) \
+	obj/atype_module$(O) \
+	obj/simulation_module$(O) \
+	obj/vector_class$(O) \
+	obj/force_globals$(O) \
+	obj/status_module$(O)
+
 obj/calc_gb$(O): ./calc_gb.F90 \
 	obj/$(F_MACH_DEFS) \
 	obj/simulation_module$(O) \
@@ -234,22 +250,40 @@ obj/do_Forces$(O): ./do_Forces.F90 \
 	obj/calc_dipole_dipole$(O) \
 	obj/calc_reaction_field$(O) \
 	obj/calc_gb$(O) \
-	obj/force_globals$(O)
+	obj/force_globals$(O) \
+	obj/vector_class$(O)
 
+obj/notifyCutoffs$(O): ./notifyCutoffs.F90 \
+	obj/$(F_MACH_DEFS) \
+	obj/atype_module$(O) \
+	obj/calc_LJ_FF$(O) \
+	obj/calc_eam$(O) \
+	obj/calc_dipole_dipole$(O) \
+	obj/calc_reaction_field$(O) \
+	obj/do_Forces$(O) 
+
 obj/wrappers$(O): ./wrappers.F90 \
 	obj/$(F_MACH_DEFS) \
 	obj/atype_module$(O) \
 	obj/simulation_module$(O) \
 	obj/calc_sticky_pair$(O) \
 	obj/calc_gb$(O) \
-	obj/do_Forces$(O) 
+	obj/do_Forces$(O) \
+	obj/notifyCutoffs$(O) 
 
+
+
+
+
+
 #MPI dependencies:
 
 MPIobj/$(F_MACH_DEFS): ./Linux_ifc_machdep.F90
 
 MPIobj/vector_class$(O): ./vector_class.F90
 
+MPIobj/status_module$(O): ./status_module.F90
+
 MPIobj/mpiSimulation_module$(O): ./mpiSimulation_module.F90
 
 MPIobj/force_globals$(O): ./force_globals.F90 \
@@ -272,6 +306,16 @@ MPIobj/atype_module$(O): ./atype_module.F90 \
 	MPIobj/mpiSimulation_module$(O) \
 	MPIobj/force_globals$(O)
 
+MPIobj/calc_eam$(O): ./calc_eam.F90 \
+	MPIobj/$(F_MACH_DEFS) \
+	MPIobj/atype_module$(O) \
+	MPIobj/simulation_module$(O) \
+	MPIobj/mpiSimulation_module$(O) \
+	MPIobj/vector_class$(O) \
+	MPIobj/force_globals$(O) \
+	MPIobj/status_module$(O)
+
+
 MPIobj/atype_module$(O): ./atype_module.F90 \
 	MPIobj/$(F_MACH_DEFS) \
 	MPIobj/vector_class$(O)
@@ -322,8 +366,18 @@ MPIobj/do_Forces$(O): ./do_Forces.F90 \
 	MPIobj/calc_dipole_dipole$(O) \
 	MPIobj/calc_reaction_field$(O) \
 	MPIobj/calc_gb$(O) \
-	MPIobj/force_globals$(O)
+	MPIobj/force_globals$(O) \
+	MPIobj/vector_class$(O)
 
+MPIobj/notifyCutoffs$(O): ./notifyCutoffs.F90 \
+	MPIobj/$(F_MACH_DEFS) \
+	MPIobj/atype_module$(O) \
+	MPIobj/calc_LJ_FF$(O) \
+	MPIobj/calc_eam$(O) \
+	MPIobj/calc_dipole_dipole$(O) \
+	MPIobj/calc_reaction_field$(O) \
+	MPIobj/do_Forces$(O) 
+
 MPIobj/wrappers$(O): ./wrappers.F90 \
 	MPIobj/$(F_MACH_DEFS) \
 	MPIobj/mpiSimulation_module$(O) \
@@ -331,4 +385,5 @@ MPIobj/wrappers$(O): ./wrappers.F90 \
 	MPIobj/simulation_module$(O) \
 	MPIobj/calc_sticky_pair$(O) \
 	MPIobj/calc_gb$(O) \
-	MPIobj/do_Forces$(O) 
+	MPIobj/do_Forces$(O) \
+	MPIobj/notifyCutoffs$(O)