Introduce diagnostic variables for CABLE outputs

Note that some biogeophysics diagnostic variables overlap with CASA-CNP
diagnostic variables, e.g. `canopy%fgpp` and `canopy%fnpp`. When
CASA-CNP is enabled, these diagnostic variables are re-calculated using
CASA-CNP variables before writing the diagnostic variables to the output
file. The overriding of diagnostic variables is done to match the
current behaviour of the output module - there may be scope to enable
both CASA and non-CASA variants of these diagnostics in the future.

Author: SeanBryan51

src/offline/cable_define_types.F90

@@ -261,6 +261,7 @@ MODULE cable_def_types_mod
           qssrf,   & ! sublimation
           snage,   & ! snow age
           snowd,   & ! snow depth (liquid water)
+          totsdepth, & ! total snow depth (m)
           smelt,   & ! snow melt
           ssdnn,   & ! average snow density
           tss,     & ! surface temperature (weighted soil, snow)
@@ -450,12 +451,18 @@ MODULE cable_def_types_mod
           frpw,    & ! plant respiration (woody component) (g C m-2 s-1)
           frpr,    & ! plant respiration (root component) (g C m-2 s-1)
           frs,     & ! soil respiration (g C m-2 s-1)
+          fra,     & ! autotrophic respiration (g C m-2 s-1)
           fnee,    & ! net carbon flux (g C m-2 s-1)
           frday,   & ! daytime leaf resp
           fnv,     & ! net rad. avail. to canopy (W/m2)
           fev,     & ! latent hf from canopy (W/m2)
           epot,    & ! total potential evaporation
+          et,      & ! total evapotranspiration (kg/m2/s)
+          eint,    & ! interception evaporation from wet canopy (kg/m2/s)
+          tveg,    & ! vegation transpiration (kg/m2/s)
+          esoil,   & ! soil evaporation (kg/m2/s)
           fnpp,    & ! npp flux
+          fgpp,    & ! gpp flux
           fevw_pot,& ! potential lat heat from canopy
           gswx_T,  & ! ! stom cond for water
           cdtq,    & ! drag coefficient for momentum
@@ -471,6 +478,7 @@ MODULE cable_def_types_mod
           ghflux,  & ! ground heat flux (W/m2) ???
           precis,  & ! throughfall to soil, after snow (mm)
           qscrn,   & ! specific humudity at screen height (g/g)
+          qmom,    & ! surface momentum flux
           rnet,    & ! net radiation absorbed by surface (W/m2)
           rniso,    & !isothermal net radiation absorbed by surface (W/m2)
           segg,    & ! latent heatfl from soil mm
@@ -550,6 +558,9 @@ MODULE cable_def_types_mod
           latitude,& ! latitude
           lwabv,   & ! long wave absorbed by vegetation
           qssabs,  & ! absorbed short-wave radiation for soil
+          swnet,   & ! net shortwave radiation absorbed by surface (W/m^2)
+          lwnet,   & ! net longwave radiation absorbed by surface (W/m^2)
+          rnet,    & ! net radiation absorbed by surface (W/m^2)
           transd,  & ! frac SW diffuse transmitted through canopy
           trad,    & !  radiative temperature (soil and veg)
           otrad      ! radiative temperature on previous timestep (ACCESS)
@@ -914,6 +925,7 @@ SUBROUTINE alloc_soil_snow_type(var, mp)
     ALLOCATE( var% smass(mp,msn) )
     ALLOCATE( var% snage(mp) )
     ALLOCATE( var% snowd(mp) )
+    ALLOCATE( var% totsdepth(mp) )
     ALLOCATE( var% smelt(mp) )
     ALLOCATE( var% ssdn(mp,msn) )
     ALLOCATE( var% ssdnn(mp) )
@@ -1119,6 +1131,7 @@ SUBROUTINE alloc_canopy_type(var, mp)
     ALLOCATE( var% frpw(mp) )
     ALLOCATE( var% frpr(mp) )
     ALLOCATE( var% frs(mp) )
+    ALLOCATE( var% fra(mp) )
     ALLOCATE( var% fnee(mp) )
     ALLOCATE( var% frday(mp) )
     ALLOCATE( var% fnv(mp) )
@@ -1132,6 +1145,7 @@ SUBROUTINE alloc_canopy_type(var, mp)
     ALLOCATE( var% ghflux(mp) )
     ALLOCATE( var% precis(mp) )
     ALLOCATE( var% qscrn(mp) )
+    ALLOCATE( var% qmom(mp) )
     ALLOCATE( var% rnet(mp) )
     ALLOCATE( var% rniso(mp) )
     ALLOCATE( var% segg(mp) )
@@ -1151,7 +1165,12 @@ SUBROUTINE alloc_canopy_type(var, mp)
     ALLOCATE( var% ga_cor(mp) )     !REV_CORR variable
     ALLOCATE ( var % evapfbl(mp,ms) )
     ALLOCATE( var% epot(mp) )
+    ALLOCATE( var% et(mp) )
+    ALLOCATE( var% eint(mp) )
+    ALLOCATE( var% tveg(mp) )
+    ALLOCATE( var% esoil(mp) )
     ALLOCATE( var% fnpp(mp) )
+    ALLOCATE( var% fgpp(mp) )
     ALLOCATE( var% fevw_pot(mp) )
     ALLOCATE( var% gswx_T(mp) )
     ALLOCATE( var% cdtq(mp) )
@@ -1202,6 +1221,9 @@ SUBROUTINE alloc_radiation_type(var, mp)
     ALLOCATE( var% lwabv(mp) )
     ALLOCATE( var% qcan(mp,mf,nrb) )
     ALLOCATE( var% qssabs(mp) )
+    ALLOCATE( var% swnet(mp) )
+    ALLOCATE( var% lwnet(mp) )
+    ALLOCATE( var% rnet(mp) )
     ALLOCATE( var% rhocdf(mp,nrb) )
     ALLOCATE( var% rniso(mp,mf) )
     ALLOCATE( var% scalex(mp,mf) )
@@ -1562,6 +1584,7 @@ SUBROUTINE dealloc_soil_snow_type(var)
     DEALLOCATE( var% smass )
     DEALLOCATE( var% snage )
     DEALLOCATE( var% snowd )
+    DEALLOCATE( var% totsdepth )
     DEALLOCATE( var% smelt )
     DEALLOCATE( var% ssdn )
     DEALLOCATE( var% ssdnn )
@@ -1753,6 +1776,7 @@ SUBROUTINE dealloc_canopy_type(var)
     DEALLOCATE( var% frpw )
     DEALLOCATE( var% frpr )
     DEALLOCATE( var% frs )
+    DEALLOCATE( var% fra )
     DEALLOCATE( var% fnee )
     DEALLOCATE( var% frday )
     DEALLOCATE( var% fnv )
@@ -1766,6 +1790,7 @@ SUBROUTINE dealloc_canopy_type(var)
     DEALLOCATE( var% ghflux )
     DEALLOCATE( var% precis )
     DEALLOCATE( var% qscrn )
+    DEALLOCATE( var% qmom )
     DEALLOCATE( var% rnet )
     DEALLOCATE( var% rniso )
     DEALLOCATE( var% segg )
@@ -1785,7 +1810,12 @@ SUBROUTINE dealloc_canopy_type(var)
     DEALLOCATE( var% ga_cor )    !REV_CORR variable
     DEALLOCATE ( var % evapfbl )
     DEALLOCATE( var% epot )
+    DEALLOCATE( var% et )
+    DEALLOCATE( var% eint )
+    DEALLOCATE( var% tveg )
+    DEALLOCATE( var% esoil )
     DEALLOCATE( var% fnpp )
+    DEALLOCATE( var% fgpp )
     DEALLOCATE( var% fevw_pot )
     DEALLOCATE( var% gswx_T )
     DEALLOCATE( var% cdtq )
@@ -1826,6 +1856,9 @@ SUBROUTINE dealloc_radiation_type(var)
     DEALLOCATE( var% lwabv )
     DEALLOCATE( var% qcan )
     DEALLOCATE( var% qssabs )
+    DEALLOCATE( var% swnet )
+    DEALLOCATE( var% lwnet )
+    DEALLOCATE( var% rnet )
     DEALLOCATE( var% rhocdf )
     DEALLOCATE( var% rniso )
     DEALLOCATE( var% scalex )

src/offline/cable_mpicommon.F90

@@ -29,15 +29,15 @@ MODULE cable_mpicommon
 
   ! base number of input fields: must correspond to CALLS to 
   ! MPI_address (field ) in *_mpimaster/ *_mpiworker
-  INTEGER, PARAMETER :: nparam = 341
+  INTEGER, PARAMETER :: nparam = 352
 
   ! MPI: extra params sent only if nsoilparmnew is true
   INTEGER, PARAMETER :: nsoilnew = 1
 
   ! MPI: number of casa parameters sent to workers as
   ! start up parameters
   ! MPI: added casapool fields ratioNCsoilnew, ratioNCsoilmin and ratioNCsoilmax
-  INTEGER, PARAMETER :: ncasaparam = 213  ! YPW to account for 3 aditional woodproduct pools
+  INTEGER, PARAMETER :: ncasaparam = 219
   ! MPI: base number of casa_init parameters sent to the workers
   INTEGER, PARAMETER :: ncinit = 18
 
@@ -94,12 +94,12 @@ MODULE cable_mpicommon
   ! vh sli nvec + 6 162 -> 168
   ! INTEGER, PARAMETER :: nvec = 172! 168
   ! INH REV_CORR +3  (SSEB +2 will be needed)
-  INTEGER, PARAMETER :: nvec = 175
+  INTEGER, PARAMETER :: nvec = 187
 
   ! 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 = 66
+  INTEGER, PARAMETER :: ncasa_vec = 72
   ! 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