Commit working progress

CABLE-LSM · Oct 25, 2024 · 2ae0bda · 2ae0bda
1 parent d8940ce
commit 2ae0bda
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/offline/cable_mpicommon.F90 b/src/offline/cable_mpicommon.F90
@@ -27,6 +27,10 @@ MODULE cable_mpicommon
 
   PUBLIC
 
+  ! MPI commicator and rank. These get initialised in cable_driver_init_mod.
+  ! TODO(Sean): there is likely a better place 
+  INTEGER :: comm, rank
+
   ! base number of input fields: must correspond to CALLS to 
   ! MPI_address (field ) in *_mpimaster/ *_mpiworker
   INTEGER, PARAMETER :: nparam = 330

diff --git a/src/offline/cable_mpidrv.F90 b/src/offline/cable_mpidrv.F90
@@ -23,15 +23,15 @@ PROGRAM mpi_driver
   USE cable_driver_init_mod
 
   USE cable_mpicommon
-  USE cable_mpimaster
+  USE cable_mpimaster, ONLY : comm, rank
   USE cable_mpiworker
 
   IMPLICIT NONE
 
-  INTEGER :: comm, rank, ierr
+  INTEGER :: ierr
   REAL    :: etime ! Declare the type of etime()
 
-  CALL cable_driver_init(comm, rank)
+  CALL cable_driver_init()
 
   IF (rank == 0) THEN
      CALL mpidrv_master (comm)