| 46 |
|
# MPICH include path |
| 47 |
|
MPI_INC=@MPI_INC@ |
| 48 |
|
|
| 49 |
+ |
# MODDIRFLAG |
| 50 |
+ |
MODDIRFLAG=@MODDIRFLAG@ |
| 51 |
+ |
|
| 52 |
|
# MPI F90 Module path |
| 53 |
|
MPI_F90_MODS=@MPI_F90_MODS@ |
| 54 |
|
|
| 98 |
|
# C++ flags |
| 99 |
|
CXXFLAGS_C=@CXXFLAGS@ |
| 100 |
|
|
| 101 |
+ |
# C++ template flags |
| 102 |
+ |
OOPSE_TEMPLATE_FLAGS=@OOPSE_TEMPLATE_FLAGS@ |
| 103 |
+ |
|
| 104 |
+ |
# C++ namespace flags |
| 105 |
+ |
EXTRA_CC_FLAG=@EXTRA_CC_FLAG@ |
| 106 |
+ |
|
| 107 |
|
# Preprocessor flag for fortran |
| 108 |
|
PREPFLAG=@PREPFLAG@ |
| 109 |
|
|
| 127 |
|
# include paths starting with "." are all relative to the SUBDIRS!!! |
| 128 |
|
|
| 129 |
|
INCLUDES= -I.. -I../../libBASS $(SPRNG_INC) |
| 130 |
< |
MPI_INCLUDES= -I$(MPI_INC) $(MPI_F90_MODS) |
| 130 |
> |
MPI_INCLUDES= -I$(MPI_INC) $(MODDIRFLAG)$(MPI_F90_MODS) |
| 131 |
> |
F90_INCLUDES= -I/usr/local/include |
| 132 |
|
|
| 133 |
|
CFLAGS=$(CFLAGS_C) $(INCLUDES) $(DECLARE) $(MPI_INCLUDES) $(FUNCWRAP) |
| 134 |
< |
CXXFLAGS=$(CXXFLAGS_C) $(INCLUDES) $(DECLARE) $(FUNCWRAP) |
| 134 |
> |
CXXFLAGS=$(CXXFLAGS_C) $(OOPSE_TEMPLATE_FLAGS) $(EXTRA_CC_FLAG) $(INCLUDES) $(DECLARE) $(FUNCWRAP) |
| 135 |
|
FFLAGS=$(PREPFLAG) $(FFLAGS_C) |
| 136 |
< |
F90FLAGS=$(PREPFLAG) $(F90FLAGS_C) |
| 136 |
> |
F90FLAGS=$(PREPFLAG) $(F90FLAGS_C) $(F90_INCLUDES) |
| 137 |
|
DEPFLAGS=$(CFLAGS_C) -I. -I../libBASS $(SPRNG_INC) $(MPI_INCLUDES) |
| 138 |
|
|
| 139 |
|
MPI_CFLAGS=$(CFLAGS) $(MPI_INCLUDES) $(MPI_DECLARE) |
| 140 |
|
MPI_CXXFLAGS=$(CXXFLAGS) $(MPI_INCLUDES) $(MPI_DECLARE) |
| 141 |
|
MPI_F90FLAGS=$(F90FLAGS) $(PREPDEFFLAG)$(MPI_DECLARE) $(MPI_INCLUDES) |
| 142 |
|
|
| 143 |
< |
SRC_DIR := $(PWD) |
| 143 |
> |
SRC_DIR := .. |
| 144 |
|
|
| 145 |
|
# Then do the compile rules: |
| 146 |
|
|
| 176 |
|
$(DIR)/BondExtensions.cpp \ |
| 177 |
|
$(DIR)/DirectionalAtom.cpp \ |
| 178 |
|
$(DIR)/DumpWriter.cpp \ |
| 179 |
+ |
$(DIR)/DumpReader.cpp \ |
| 180 |
|
$(DIR)/Exclude.cpp \ |
| 181 |
|
$(DIR)/InitializeFromFile.cpp \ |
| 182 |
|
$(DIR)/LJFF.cpp \ |
| 197 |
|
$(DIR)/Molecule.cpp \ |
| 198 |
|
$(DIR)/NPTf.cpp \ |
| 199 |
|
$(DIR)/NPTi.cpp \ |
| 200 |
< |
$(DIR)/NPTxym.cpp \ |
| 190 |
< |
$(DIR)/NPTzm.cpp \ |
| 200 |
> |
$(DIR)/NPTxyz.cpp \ |
| 201 |
|
$(DIR)/NVT.cpp \ |
| 202 |
|
$(DIR)/SimState.cpp \ |
| 203 |
|
$(DIR)/ZConstraint.cpp \ |
| 221 |
|
$(DIR)/calc_gb.F90 \ |
| 222 |
|
$(DIR)/force_globals.F90 \ |
| 223 |
|
$(DIR)/mpiSimulation_module.F90 \ |
| 224 |
< |
$(DIR)/notifyCutoffs.F90 |
| 224 |
> |
$(DIR)/notifyCutoffs.F90 \ |
| 225 |
> |
$(DIR)/oopseMPI_module.F90 |
| 226 |
|
|
| 227 |
|
DIR:=. |
| 228 |
|
C_SRCS := $(C_FILES) |
| 406 |
|
|
| 407 |
|
MPIobj/status_module$(O): ./status_module.F90 |
| 408 |
|
|
| 409 |
< |
MPIobj/mpiSimulation_module$(O): ./mpiSimulation_module.F90 |
| 409 |
> |
MPIobj/oopseMPI_module$(O): ./oopseMPI_module.F90 |
| 410 |
> |
|
| 411 |
> |
MPIobj/mpiSimulation_module$(O): ./mpiSimulation_module.F90 \ |
| 412 |
> |
MPIobj/oopseMPI_module$(O) |
| 413 |
|
|
| 414 |
|
MPIobj/force_globals$(O): ./force_globals.F90 \ |
| 415 |
|
MPIobj/mpiSimulation_module$(O) \ |
