diff --git a/Makefile b/Makefile index 295fd20..96d98ca 100644 --- a/Makefile +++ b/Makefile @@ -81,6 +81,17 @@ $(OBJ_DIR)/%.o: %.$(SRC_EXT) $(LIB_DIR)/lib$(VERSION).a : $(OBJECTS) ar -cr $(LIB_DIR)/lib$(VERSION).a $(OBJECTS) + +########################################### +# Parallel version + +.PHONE: parallel +parallel : $(EXECUTABLES_PAR) + +$(EXECUTABLES_PAR): $(BIN_DIR)/%: $(SRC_DIR)/EXECS/%.$(SRC_EXT) $(LIB_DIR)/lib$(VERSION).a + $(COMPILE_MPI) $< -o $@ -l$(VERSION) + + ########################################### # Cleanup @@ -89,6 +100,7 @@ clean : /bin/rm -f $(OBJECTS) /bin/rm -f $(LIB_DIR)/lib$(VERSION).a /bin/rm -f $(EXECUTABLES) + /bin/rm -f $(EXECUTABLES_PAR) ########################################### diff --git a/src/EXECS/Heis_DSF_par.cc b/deprec/src/EXECS/Heis_DSF_par.cc similarity index 100% rename from src/EXECS/Heis_DSF_par.cc rename to deprec/src/EXECS/Heis_DSF_par.cc diff --git a/src/EXECS/LiebLin_DSF_MosesState_par.cc b/deprec/src/EXECS/LiebLin_DSF_MosesState_par.cc similarity index 100% rename from src/EXECS/LiebLin_DSF_MosesState_par.cc rename to deprec/src/EXECS/LiebLin_DSF_MosesState_par.cc diff --git a/src/EXECS/LiebLin_DSF_over_Ensemble_par.cc b/deprec/src/EXECS/LiebLin_DSF_over_Ensemble_par.cc similarity index 100% rename from src/EXECS/LiebLin_DSF_over_Ensemble_par.cc rename to deprec/src/EXECS/LiebLin_DSF_over_Ensemble_par.cc diff --git a/src/EXECS/LiebLin_DSF_par.cc b/deprec/src/EXECS/LiebLin_DSF_par.cc similarity index 99% rename from src/EXECS/LiebLin_DSF_par.cc rename to deprec/src/EXECS/LiebLin_DSF_par.cc index 5dfb7f3..02c0580 100644 --- a/src/EXECS/LiebLin_DSF_par.cc +++ b/deprec/src/EXECS/LiebLin_DSF_par.cc @@ -15,6 +15,7 @@ Purpose: Parallel version of ABACUS using MPICH. #include "ABACUS.h" #include "mpi.h" +using namespace std; using namespace ABACUS; int main(int argc, char *argv[]) diff --git a/src/EXECS/Heis_DSF_par_Prepare.cc b/src/EXECS/Heis_DSF_par_Prepare.cc index 4db8a23..af74a35 100644 --- a/src/EXECS/Heis_DSF_par_Prepare.cc +++ b/src/EXECS/Heis_DSF_par_Prepare.cc @@ -15,6 +15,7 @@ Purpose: Parallel version of ABACUS using MPICH. #include "ABACUS.h" //#include "mpi.h" // not needed for Prepare +using namespace std; using namespace ABACUS; int main(int argc, char *argv[]) diff --git a/src/EXECS/Heis_DSF_par_Run.cc b/src/EXECS/Heis_DSF_par_Run.cc index bd4fbf4..c5f7715 100644 --- a/src/EXECS/Heis_DSF_par_Run.cc +++ b/src/EXECS/Heis_DSF_par_Run.cc @@ -15,6 +15,7 @@ Purpose: Parallel version of ABACUS using MPICH. #include "ABACUS.h" #include "mpi.h" +using namespace std; using namespace ABACUS; int main(int argc, char *argv[]) diff --git a/src/EXECS/Heis_DSF_par_Wrapup.cc b/src/EXECS/Heis_DSF_par_Wrapup.cc index ac80ae5..5ff0f59 100644 --- a/src/EXECS/Heis_DSF_par_Wrapup.cc +++ b/src/EXECS/Heis_DSF_par_Wrapup.cc @@ -14,6 +14,7 @@ Purpose: Parallel version of ABACUS using MPICH. #include "ABACUS.h" +using namespace std; using namespace ABACUS; int main(int argc, char *argv[]) diff --git a/src/EXECS/LiebLin_DSF_GeneralState_par_Prepare.cc b/src/EXECS/LiebLin_DSF_GeneralState_par_Prepare.cc index 3a474e1..c1eb190 100644 --- a/src/EXECS/LiebLin_DSF_GeneralState_par_Prepare.cc +++ b/src/EXECS/LiebLin_DSF_GeneralState_par_Prepare.cc @@ -15,6 +15,7 @@ Purpose: Parallel version of ABACUS using MPICH. #include "ABACUS.h" //#include "mpi.h" // not needed for Prepare +using namespace std; using namespace ABACUS; int main(int argc, char *argv[]) diff --git a/src/EXECS/LiebLin_DSF_GeneralState_par_Run.cc b/src/EXECS/LiebLin_DSF_GeneralState_par_Run.cc index d1d5d28..2133914 100644 --- a/src/EXECS/LiebLin_DSF_GeneralState_par_Run.cc +++ b/src/EXECS/LiebLin_DSF_GeneralState_par_Run.cc @@ -15,6 +15,7 @@ Purpose: Parallel version of ABACUS using MPICH. #include "ABACUS.h" #include "mpi.h" +using namespace std; using namespace ABACUS; int main(int argc, char *argv[]) diff --git a/src/EXECS/LiebLin_DSF_GeneralState_par_Wrapup.cc b/src/EXECS/LiebLin_DSF_GeneralState_par_Wrapup.cc index 0b1113b..1454606 100644 --- a/src/EXECS/LiebLin_DSF_GeneralState_par_Wrapup.cc +++ b/src/EXECS/LiebLin_DSF_GeneralState_par_Wrapup.cc @@ -15,6 +15,7 @@ Purpose: Parallel version of ABACUS using MPICH. #include "ABACUS.h" //#include "mpi.h" // not needed for Prepare +using namespace std; using namespace ABACUS; int main(int argc, char *argv[]) diff --git a/src/EXECS/LiebLin_DSF_MosesState_par_Prepare.cc b/src/EXECS/LiebLin_DSF_MosesState_par_Prepare.cc index 1c360a2..1a3e526 100644 --- a/src/EXECS/LiebLin_DSF_MosesState_par_Prepare.cc +++ b/src/EXECS/LiebLin_DSF_MosesState_par_Prepare.cc @@ -15,6 +15,7 @@ Purpose: Parallel version of ABACUS using MPICH. #include "ABACUS.h" //#include "mpi.h" // not needed for Prepare +using namespace std; using namespace ABACUS; int main(int argc, char *argv[]) diff --git a/src/EXECS/LiebLin_DSF_MosesState_par_Run.cc b/src/EXECS/LiebLin_DSF_MosesState_par_Run.cc index 67060d8..dfae31f 100644 --- a/src/EXECS/LiebLin_DSF_MosesState_par_Run.cc +++ b/src/EXECS/LiebLin_DSF_MosesState_par_Run.cc @@ -15,6 +15,7 @@ Purpose: Parallel version of ABACUS using MPICH. #include "ABACUS.h" #include "mpi.h" +using namespace std; using namespace ABACUS; int main(int argc, char *argv[]) diff --git a/src/EXECS/LiebLin_DSF_MosesState_par_Wrapup.cc b/src/EXECS/LiebLin_DSF_MosesState_par_Wrapup.cc index b7bff50..d38e48f 100644 --- a/src/EXECS/LiebLin_DSF_MosesState_par_Wrapup.cc +++ b/src/EXECS/LiebLin_DSF_MosesState_par_Wrapup.cc @@ -15,6 +15,7 @@ Purpose: Parallel version of ABACUS using MPICH. #include "ABACUS.h" //#include "mpi.h" // not needed for Prepare +using namespace std; using namespace ABACUS; int main(int argc, char *argv[]) diff --git a/src/EXECS/LiebLin_DSF_par_Prepare.cc b/src/EXECS/LiebLin_DSF_par_Prepare.cc index 15795d6..42abca6 100644 --- a/src/EXECS/LiebLin_DSF_par_Prepare.cc +++ b/src/EXECS/LiebLin_DSF_par_Prepare.cc @@ -15,6 +15,7 @@ Purpose: Parallel version of ABACUS using MPICH. #include "ABACUS.h" //#include "mpi.h" // not needed for Prepare +using namespace std; using namespace ABACUS; int main(int argc, char *argv[]) diff --git a/src/EXECS/LiebLin_DSF_par_Run.cc b/src/EXECS/LiebLin_DSF_par_Run.cc index 4994d08..0f05d84 100644 --- a/src/EXECS/LiebLin_DSF_par_Run.cc +++ b/src/EXECS/LiebLin_DSF_par_Run.cc @@ -15,6 +15,7 @@ Purpose: Parallel version of ABACUS using MPICH. #include "ABACUS.h" #include "mpi.h" +using namespace std; using namespace ABACUS; int main(int argc, char *argv[]) diff --git a/src/EXECS/LiebLin_DSF_par_Wrapup.cc b/src/EXECS/LiebLin_DSF_par_Wrapup.cc index e3c2106..804f5c6 100644 --- a/src/EXECS/LiebLin_DSF_par_Wrapup.cc +++ b/src/EXECS/LiebLin_DSF_par_Wrapup.cc @@ -15,6 +15,7 @@ Purpose: Parallel version of ABACUS using MPICH. #include "ABACUS.h" //#include "mpi.h" // not needed for Prepare or Wrapup +using namespace std; using namespace ABACUS; int main(int argc, char *argv[])