Browse Source

Repair all MPI-driven parallel executables

master
J.-S. Caux 2 years ago
parent
commit
287107f7e1

+ 12
- 0
Makefile View File

@@ -81,6 +81,17 @@ $(OBJ_DIR)/%.o: %.$(SRC_EXT)
81 81
 $(LIB_DIR)/lib$(VERSION).a : $(OBJECTS)
82 82
 	ar -cr $(LIB_DIR)/lib$(VERSION).a $(OBJECTS)
83 83
 
84
+
85
+###########################################
86
+# Parallel version
87
+
88
+.PHONE: parallel
89
+parallel : $(EXECUTABLES_PAR)
90
+
91
+$(EXECUTABLES_PAR): $(BIN_DIR)/%: $(SRC_DIR)/EXECS/%.$(SRC_EXT) $(LIB_DIR)/lib$(VERSION).a
92
+	$(COMPILE_MPI) $< -o $@ -l$(VERSION)
93
+
94
+
84 95
 ###########################################
85 96
 # Cleanup
86 97
 
@@ -89,6 +100,7 @@ clean :
89 100
 	/bin/rm -f $(OBJECTS)
90 101
 	/bin/rm -f $(LIB_DIR)/lib$(VERSION).a
91 102
 	/bin/rm -f $(EXECUTABLES)
103
+	/bin/rm -f $(EXECUTABLES_PAR)
92 104
 
93 105
 
94 106
 ###########################################

src/EXECS/Heis_DSF_par.cc → deprec/src/EXECS/Heis_DSF_par.cc View File


src/EXECS/LiebLin_DSF_MosesState_par.cc → deprec/src/EXECS/LiebLin_DSF_MosesState_par.cc View File


src/EXECS/LiebLin_DSF_over_Ensemble_par.cc → deprec/src/EXECS/LiebLin_DSF_over_Ensemble_par.cc View File


src/EXECS/LiebLin_DSF_par.cc → deprec/src/EXECS/LiebLin_DSF_par.cc View File

@@ -15,6 +15,7 @@ Purpose:  Parallel version of ABACUS using MPICH.
15 15
 #include "ABACUS.h"
16 16
 #include "mpi.h"
17 17
 
18
+using namespace std;
18 19
 using namespace ABACUS;
19 20
 
20 21
 int main(int argc, char *argv[])

+ 1
- 0
src/EXECS/Heis_DSF_par_Prepare.cc View File

@@ -15,6 +15,7 @@ Purpose:  Parallel version of ABACUS using MPICH.
15 15
 #include "ABACUS.h"
16 16
 //#include "mpi.h" // not needed for Prepare
17 17
 
18
+using namespace std;
18 19
 using namespace ABACUS;
19 20
 
20 21
 int main(int argc, char *argv[])

+ 1
- 0
src/EXECS/Heis_DSF_par_Run.cc View File

@@ -15,6 +15,7 @@ Purpose:  Parallel version of ABACUS using MPICH.
15 15
 #include "ABACUS.h"
16 16
 #include "mpi.h"
17 17
 
18
+using namespace std;
18 19
 using namespace ABACUS;
19 20
 
20 21
 int main(int argc, char *argv[])

+ 1
- 0
src/EXECS/Heis_DSF_par_Wrapup.cc View File

@@ -14,6 +14,7 @@ Purpose:  Parallel version of ABACUS using MPICH.
14 14
 
15 15
 #include "ABACUS.h"
16 16
 
17
+using namespace std;
17 18
 using namespace ABACUS;
18 19
 
19 20
 int main(int argc, char *argv[])

+ 1
- 0
src/EXECS/LiebLin_DSF_GeneralState_par_Prepare.cc View File

@@ -15,6 +15,7 @@ Purpose:  Parallel version of ABACUS using MPICH.
15 15
 #include "ABACUS.h"
16 16
 //#include "mpi.h" // not needed for Prepare
17 17
 
18
+using namespace std;
18 19
 using namespace ABACUS;
19 20
 
20 21
 int main(int argc, char *argv[])

+ 1
- 0
src/EXECS/LiebLin_DSF_GeneralState_par_Run.cc View File

@@ -15,6 +15,7 @@ Purpose:  Parallel version of ABACUS using MPICH.
15 15
 #include "ABACUS.h"
16 16
 #include "mpi.h"
17 17
 
18
+using namespace std;
18 19
 using namespace ABACUS;
19 20
 
20 21
 int main(int argc, char *argv[])

+ 1
- 0
src/EXECS/LiebLin_DSF_GeneralState_par_Wrapup.cc View File

@@ -15,6 +15,7 @@ Purpose:  Parallel version of ABACUS using MPICH.
15 15
 #include "ABACUS.h"
16 16
 //#include "mpi.h" // not needed for Prepare
17 17
 
18
+using namespace std;
18 19
 using namespace ABACUS;
19 20
 
20 21
 int main(int argc, char *argv[])

+ 1
- 0
src/EXECS/LiebLin_DSF_MosesState_par_Prepare.cc View File

@@ -15,6 +15,7 @@ Purpose:  Parallel version of ABACUS using MPICH.
15 15
 #include "ABACUS.h"
16 16
 //#include "mpi.h" // not needed for Prepare
17 17
 
18
+using namespace std;
18 19
 using namespace ABACUS;
19 20
 
20 21
 int main(int argc, char *argv[])

+ 1
- 0
src/EXECS/LiebLin_DSF_MosesState_par_Run.cc View File

@@ -15,6 +15,7 @@ Purpose:  Parallel version of ABACUS using MPICH.
15 15
 #include "ABACUS.h"
16 16
 #include "mpi.h"
17 17
 
18
+using namespace std;
18 19
 using namespace ABACUS;
19 20
 
20 21
 int main(int argc, char *argv[])

+ 1
- 0
src/EXECS/LiebLin_DSF_MosesState_par_Wrapup.cc View File

@@ -15,6 +15,7 @@ Purpose:  Parallel version of ABACUS using MPICH.
15 15
 #include "ABACUS.h"
16 16
 //#include "mpi.h" // not needed for Prepare
17 17
 
18
+using namespace std;
18 19
 using namespace ABACUS;
19 20
 
20 21
 int main(int argc, char *argv[])

+ 1
- 0
src/EXECS/LiebLin_DSF_par_Prepare.cc View File

@@ -15,6 +15,7 @@ Purpose:  Parallel version of ABACUS using MPICH.
15 15
 #include "ABACUS.h"
16 16
 //#include "mpi.h" // not needed for Prepare
17 17
 
18
+using namespace std;
18 19
 using namespace ABACUS;
19 20
 
20 21
 int main(int argc, char *argv[])

+ 1
- 0
src/EXECS/LiebLin_DSF_par_Run.cc View File

@@ -15,6 +15,7 @@ Purpose:  Parallel version of ABACUS using MPICH.
15 15
 #include "ABACUS.h"
16 16
 #include "mpi.h"
17 17
 
18
+using namespace std;
18 19
 using namespace ABACUS;
19 20
 
20 21
 int main(int argc, char *argv[])

+ 1
- 0
src/EXECS/LiebLin_DSF_par_Wrapup.cc View File

@@ -15,6 +15,7 @@ Purpose:  Parallel version of ABACUS using MPICH.
15 15
 #include "ABACUS.h"
16 16
 //#include "mpi.h" // not needed for Prepare or Wrapup
17 17
 
18
+using namespace std;
18 19
 using namespace ABACUS;
19 20
 
20 21
 int main(int argc, char *argv[])

Loading…
Cancel
Save