Communicate CASA output variables from worker to master

Some CASA variables required in the output file are not being
communicated back to the master process from the workers. This change
communicates the required variables from worker to master and is
required to restore bitwise reproducibility in the CASA netcdf output
file between serial and MPI runs.

Author: SeanBryan51

src/offline/cable_mpicommon.F90

@@ -99,7 +99,7 @@ MODULE cable_mpicommon
   ! MPI: number of final casa result matrices and vectors to receive
   ! by the master for casa_poolout and casa_fluxout
   INTEGER, PARAMETER :: ncasa_mat = 37    ! add three more wood product variables
-  INTEGER, PARAMETER :: ncasa_vec = 58   ! vh changed on 5-feb-2016 for adding sapwood area and frac_sapwood
+  INTEGER, PARAMETER :: ncasa_vec = 66
   ! 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

src/offline/cable_mpimaster.F90

@@ -6656,6 +6656,38 @@ SUBROUTINE master_casa_types (comm, casapool, casaflux, &
        CALL MPI_Get_address (casaflux%Cplant_turnover_resource_limitation(off), displs(bidx), ierr)
        blocks(bidx) = r2len
 
+       bidx = bidx + 1
+       CALL MPI_Get_address (casaflux%Pupland(off), displs(bidx), ierr)
+       blocks(bidx) = r2len
+
+       bidx = bidx + 1
+       CALL MPI_Get_address (casaflux%Plittermin(off), displs(bidx), ierr)
+       blocks(bidx) = r2len
+
+       bidx = bidx + 1
+       CALL MPI_Get_address (casaflux%Psmin(off), displs(bidx), ierr)
+       blocks(bidx) = r2len
+
+       bidx = bidx + 1
+       CALL MPI_Get_address (casaflux%Psimm(off), displs(bidx), ierr)
+       blocks(bidx) = r2len
+
+       bidx = bidx + 1
+       CALL MPI_Get_address (casaflux%kplab(off), displs(bidx), ierr)
+       blocks(bidx) = r2len
+
+       bidx = bidx + 1
+       CALL MPI_Get_address (casaflux%kpsorb(off), displs(bidx), ierr)
+       blocks(bidx) = r2len
+
+       bidx = bidx + 1
+       CALL MPI_Get_address (casaflux%kpocc(off), displs(bidx), ierr)
+       blocks(bidx) = r2len
+
+       bidx = bidx + 1
+       CALL MPI_Get_address (casaflux%FluxCtoco2(off), displs(bidx), ierr)
+       blocks(bidx) = r2len
+
        types(last2d+1:bidx) = MPI_BYTE
 
        ! MPI: sanity check

src/offline/cable_mpiworker.F90

@@ -6055,6 +6055,38 @@ SUBROUTINE worker_casa_type (comm, casapool,casaflux, &
     CALL MPI_Get_address (casaflux%Cplant_turnover_resource_limitation(off), displs(bidx), ierr)
     blocks(bidx) = r2len
 
+    bidx = bidx + 1
+    CALL MPI_Get_address (casaflux%Pupland(off), displs(bidx), ierr)
+    blocks(bidx) = r2len
+
+    bidx = bidx + 1
+    CALL MPI_Get_address (casaflux%Plittermin(off), displs(bidx), ierr)
+    blocks(bidx) = r2len
+
+    bidx = bidx + 1
+    CALL MPI_Get_address (casaflux%Psmin(off), displs(bidx), ierr)
+    blocks(bidx) = r2len
+
+    bidx = bidx + 1
+    CALL MPI_Get_address (casaflux%Psimm(off), displs(bidx), ierr)
+    blocks(bidx) = r2len
+
+    bidx = bidx + 1
+    CALL MPI_Get_address (casaflux%kplab(off), displs(bidx), ierr)
+    blocks(bidx) = r2len
+
+    bidx = bidx + 1
+    CALL MPI_Get_address (casaflux%kpsorb(off), displs(bidx), ierr)
+    blocks(bidx) = r2len
+
+    bidx = bidx + 1
+    CALL MPI_Get_address (casaflux%kpocc(off), displs(bidx), ierr)
+    blocks(bidx) = r2len
+
+    bidx = bidx + 1
+    CALL MPI_Get_address (casaflux%FluxCtoco2(off), displs(bidx), ierr)
+    blocks(bidx) = r2len
+
     ! MPI: sanity check
     IF (bidx /= ntyp) THEN
        WRITE (*,*) 'worker: invalid number of casa fields, fix it!'