Communicate csoil and cplant from worker to master

This is required so we have the correct values for `csoil` and `cplant` in the
restart file as reflected in the worker processes.

Author: SeanBryan51

src/offline/cable_mpicommon.F90

@@ -103,7 +103,7 @@ MODULE cable_mpicommon
   ! MPI: number of fields included in restart_t type for data
   ! that is returned only for creating a restart file at the end of the run
   ! MPI: gol124: canopy%rwater removed when Bernard ported to CABLE_r491
-  INTEGER, PARAMETER :: nrestart = 15
+  INTEGER, PARAMETER :: nrestart = 17
   INTEGER, PARAMETER :: nsumcasaflux = 62
   INTEGER, PARAMETER :: nsumcasapool = 40
   INTEGER, PARAMETER :: nclimate = 30

src/offline/cable_mpimaster.F90

@@ -599,7 +599,7 @@ SUBROUTINE mpidrv_master (comm, trunk_sumbal, dels, koffset, kend, PLUME, CRU)
           ! MPI: create type to send restart data back to the master
           ! only if restart file is to be created
           IF(output%restart) THEN
-            CALL master_restart_types (comm, canopy, air)
+            CALL master_restart_types (comm, canopy, air, bgc)
           END IF
 
           !  CALL zero_sum_casa(sum_casapool, sum_casaflux)
@@ -7171,7 +7171,7 @@ END SUBROUTINE master_climate_types
   !CLNEND SUBROUTINE master_casa_restart_types
 
   ! MPI: creates datatype handles to receive restart data from workers
-  SUBROUTINE master_restart_types (comm, canopy, air)
+  SUBROUTINE master_restart_types (comm, canopy, air, bgc)
 
     USE mpi
 
@@ -7185,6 +7185,7 @@ SUBROUTINE master_restart_types (comm, canopy, air)
 
     TYPE(canopy_type), INTENT(IN) :: canopy
     TYPE (air_type),INTENT(IN)        :: air
+    TYPE (bgc_pool_type), INTENT(IN) :: bgc
     !  TYPE (casa_pool),           INTENT(INOUT) :: casapool
     !  TYPE (casa_flux),           INTENT(INOUT) :: casaflux
     !  TYPE (casa_met),            INTENT(INOUT) :: casamet
@@ -7246,6 +7247,18 @@ SUBROUTINE master_restart_types (comm, canopy, air)
             &                             types(bidx), ierr)
        blocks(bidx) = 1
 
+       bidx = bidx + 1
+       CALL MPI_Get_address (bgc%cplant(off,1), displs(bidx), ierr)
+       CALL MPI_Type_create_hvector (ncp, r1len, r1stride, MPI_BYTE, &
+            &                             types(bidx), ierr)
+       blocks(bidx) = 1
+
+       bidx = bidx + 1
+       CALL MPI_Get_address (bgc%csoil(off,1), displs(bidx), ierr)
+       CALL MPI_Type_create_hvector (ncs, r1len, r1stride, MPI_BYTE, &
+            &                             types(bidx), ierr)
+       blocks(bidx) = 1
+
        last2d = bidx
 
        ! ------------- 1D vectors -------------

src/offline/cable_mpiworker.F90

@@ -365,7 +365,7 @@ SUBROUTINE mpidrv_worker (comm)
           ! only if restart file is to be created
           IF(output%restart) THEN
 
-            CALL worker_restart_type (comm, canopy, air)
+            CALL worker_restart_type (comm, canopy, air, bgc)
 
           END IF
 
@@ -6354,7 +6354,7 @@ END SUBROUTINE worker_climate_types
   ! MPI: creates restart_t type to send to the master the fields
   ! that are only required for the restart file but not included in the
   ! results sent at the end of each time step
-  SUBROUTINE worker_restart_type (comm, canopy, air)
+  SUBROUTINE worker_restart_type (comm, canopy, air, bgc)
 
     USE mpi
 
@@ -6366,6 +6366,7 @@ SUBROUTINE worker_restart_type (comm, canopy, air)
 
     TYPE(canopy_type), INTENT(IN) :: canopy
     TYPE (air_type),INTENT(IN)     :: air
+    TYPE (bgc_pool_type), INTENT(IN) :: bgc
 
     ! MPI: temp arrays for marshalling all types into a struct
     INTEGER, ALLOCATABLE, DIMENSION(:) :: blocks
@@ -6408,6 +6409,14 @@ SUBROUTINE worker_restart_type (comm, canopy, air)
     ! MPI: gol124: changed to r1 when Bernard ported to CABLE_r491
     blocks(bidx) = r1len * ms
 
+    bidx = bidx + 1
+    CALL MPI_Get_address (bgc%cplant(off,1), displs(bidx), ierr)
+    blocks(bidx) = r1len * ncp
+
+    bidx = bidx + 1
+    CALL MPI_Get_address (bgc%csoil(off,1), displs(bidx), ierr)
+    blocks(bidx) = r1len * ncs
+
     bidx = bidx + 1
     CALL MPI_Get_address (canopy%cduv(off), displs(bidx), ierr)
     blocks(bidx) = r1len