From 724ade3867b268585fe9ec245560f0d6b4b68947 Mon Sep 17 00:00:00 2001
From: L Laniewski-Wollk <uqllanie@uq.edu.au>
Date: Wed, 22 May 2024 14:24:14 +1000
Subject: [PATCH] Correcting the use of MPI_COMM_WORLD

---
 src/Handlers/GenericOptimizer.cpp | 2 +-
 src/Handlers/OptimalControl.cpp   | 4 ++--
 src/Handlers/acAndersen.cpp       | 2 +-
 src/Handlers/cbPID.cpp            | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Handlers/GenericOptimizer.cpp b/src/Handlers/GenericOptimizer.cpp
index ad78d632a..ccb97ac49 100644
--- a/src/Handlers/GenericOptimizer.cpp
+++ b/src/Handlers/GenericOptimizer.cpp
@@ -6,7 +6,7 @@ int GenericOptimizer::Init () {
 		int ret;
 		DEBUG_M;
 		ret = OptimizerInit();
-		MPI_Bcast( &ret, 1, MPI_INT, 0, MPI_COMM_WORLD );
+		MPI_Bcast( &ret, 1, MPI_INT, 0, solver->mpi_comm );
 		if (ret) {
 			ERROR("Failed to initialize Optimizer");
 			return -1;
diff --git a/src/Handlers/OptimalControl.cpp b/src/Handlers/OptimalControl.cpp
index 957db625e..997ba8507 100644
--- a/src/Handlers/OptimalControl.cpp
+++ b/src/Handlers/OptimalControl.cpp
@@ -86,7 +86,7 @@ int OptimalControl::Parameters (int type, double * tab) {
 			return 0;
 		case PAR_SET:
 			output("Setting the params in the zone\n");
-			MPI_Bcast(tab, Pars, MPI_DOUBLE, 0, MPI_COMM_WORLD);
+			MPI_Bcast(tab, Pars, MPI_DOUBLE, 0, solver->mpi_comm);
 			if (f != NULL) {
 				fprintf(f,"SET");
 				for (int i=0;i<Pars;i++) fprintf(f,",%lg",(double) tab[i]);
@@ -97,7 +97,7 @@ int OptimalControl::Parameters (int type, double * tab) {
 		case PAR_GRAD:
 			output("Getting gradient of a param in zone\n");
 			solver->lattice->zSet.get_grad(par_index, zone_number, tmptab);
-			MPI_Reduce(tmptab, tab, Pars, MPI_DOUBLE, MPI_SUM, 0, MPI_COMM_WORLD);
+			MPI_Reduce(tmptab, tab, Pars, MPI_DOUBLE, MPI_SUM, 0, solver->mpi_comm);
 			if (f != NULL) {
 				fprintf(f,"GRAD");
 				for (int i=0;i<Pars;i++) fprintf(f,",%lg",(double) tab[i]);
diff --git a/src/Handlers/acAndersen.cpp b/src/Handlers/acAndersen.cpp
index 33279db49..510f3a11e 100644
--- a/src/Handlers/acAndersen.cpp
+++ b/src/Handlers/acAndersen.cpp
@@ -18,7 +18,7 @@ double acAndersen::skal(real_t * a, real_t * b) {
         for (size_t k=0; k<n; k++) sum += a[k]*b[k];
         // TODO: MPI scatter gather
         double gsum=0;
-        MPI_Allreduce ( &sum, &gsum, 1, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD );
+        MPI_Allreduce ( &sum, &gsum, 1, MPI_DOUBLE, MPI_SUM, solver->mpi_comm );
         return gsum;
 }
 
diff --git a/src/Handlers/cbPID.cpp b/src/Handlers/cbPID.cpp
index 8f24d8858..72b578bf7 100644
--- a/src/Handlers/cbPID.cpp
+++ b/src/Handlers/cbPID.cpp
@@ -110,7 +110,7 @@ int cbPID::DoIt () {
 			old_err = err;
 			
 		}
-                MPI_Bcast(&control, 1, MPI_DOUBLE, 0, MPI_COMM_WORLD);
+                MPI_Bcast(&control, 1, MPI_DOUBLE, 0, solver->mpi_comm);
                 double nval;
 /*                if (zone_number < 0) {
                 	sval = solver->lattice->zSet.get(setting, 0, (size_t) 0);