Parallel I/O output module enhancements

CMakeLists.txt

@@ -268,7 +268,6 @@ else()
         src/util/cable_common.F90
         src/shared/casa_offline_inout.F90
         src/shared/casa_ncdf.F90
-        src/offline/cable_io_decomp.F90
         src/offline/cable_iovars.F90
         src/offline/cable_surface_types.F90
         src/offline/cable_define_types.F90
@@ -278,6 +277,8 @@ else()
         src/offline/cable_abort.F90
         src/offline/cable_checks.F90
         src/offline/cable_cru_TRENDY.F90
+        src/offline/cable_diagnostics_casa.F90
+        src/offline/cable_diagnostics_core.F90
         src/offline/cable_driver_common.F90
         src/offline/cable_initialise.F90
         src/offline/cable_input.F90
@@ -299,14 +300,24 @@ else()
         src/offline/cbl_model_driver_offline.F90
         src/offline/landuse_inout.F90
         src/offline/spincasacnp.F90
+        src/util/aggregator.F90
         src/util/cable_climate_type_mod.F90
         src/util/masks_cbl.F90
         src/util/cable_array_utils.F90
+        src/util/cable_enum.F90
+        src/util/cable_grid_reductions.F90
+        src/util/cable_timing_utils.F90
         src/util/netcdf/cable_netcdf_decomp_util.F90
         src/util/netcdf/cable_netcdf.F90
         src/util/netcdf/cable_netcdf_internal.F90
         src/util/netcdf/cable_netcdf_stub_types.F90
         src/util/netcdf/nf90/cable_netcdf_nf90.F90
+        src/util/io/output/cable_output_core.F90
+        src/util/io/output/cable_output_decomp.F90
+        src/util/io/output/cable_output_reduction_buffers.F90
+        src/util/io/output/cable_output_types.F90
+        src/util/io/output/cable_output_utils.F90
+        src/util/io/output/cable_output.F90
     )
 
     target_link_libraries(cable_common PRIVATE PkgConfig::NETCDF)

documentation/docs/user_guide/constants/physical_constants.md

@@ -20,4 +20,4 @@
 |  cswat                | 4.218E3     	   | \( J \cdot kg^{-1} \cdot K^{-1} \)		      	 |   Specific heat for water at \( 0^{\circ}C \)       |
 |  density_liq          | 1000.0      	   | \( kg \cdot m^{-3} \) 			      	 |   Density of liquid water                           |
 |  density_ice          | 921.0       	   | \( kg \cdot m^{-3} \) 			      	 |   Density of ice                                    |                
-        
+|  c_molar_mass         | 1.201E-5         | \( \micro g / mol \)                    |   Molar mass of carbon                              |

src/offline/cable_define_types.F90

@@ -24,7 +24,8 @@
 !#define UM_BUILD yes
 MODULE cable_def_types_mod
 
-USE cable_climate_type_mod, ONLY: climate_type
+  USE cable_climate_type_mod, ONLY: climate_type
+  USE aggregator_mod, ONLY: aggregator_real32_1d_t, new_aggregator
 
   ! Contains all variables which are not subroutine-internal
 
@@ -264,6 +265,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)
@@ -453,12 +455,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
@@ -474,6 +482,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
@@ -531,6 +540,8 @@ MODULE cable_def_types_mod
      ! vh_js ! !litter thermal conductivity (Wm-2K-1) and vapour diffusivity (m2s-1)
      REAL(r_2), DIMENSION(:), POINTER :: kthLitt, DvLitt
 
+     type(aggregator_real32_1d_t), allocatable :: tscrn_max_daily
+     type(aggregator_real32_1d_t), allocatable :: tscrn_min_daily
 
   END TYPE canopy_type
 
@@ -553,6 +564,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)
@@ -917,6 +931,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) )
@@ -1122,6 +1137,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) )
@@ -1135,6 +1151,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) )
@@ -1154,7 +1171,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) )
@@ -1186,6 +1208,9 @@ SUBROUTINE alloc_canopy_type(var, mp)
     ALLOCATE (var % kthLitt(mp))
     ALLOCATE (var % DvLitt(mp))
 
+    var%tscrn_max_daily = new_aggregator(source_data=var%tscrn); CALL var%tscrn_max_daily%init(method="max")
+    var%tscrn_min_daily = new_aggregator(source_data=var%tscrn); CALL var%tscrn_min_daily%init(method="min")
+
   END SUBROUTINE alloc_canopy_type
 
   ! ------------------------------------------------------------------------------
@@ -1205,6 +1230,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) )
@@ -1565,6 +1593,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 )
@@ -1756,6 +1785,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 )
@@ -1769,6 +1799,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 )
@@ -1788,7 +1819,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 )
@@ -1811,6 +1847,9 @@ SUBROUTINE dealloc_canopy_type(var)
     DEALLOCATE (var % kthLitt)
     DEALLOCATE (var % DvLitt)
 
+    DEALLOCATE(var%tscrn_max_daily)
+    DEALLOCATE(var%tscrn_min_daily)
+
   END SUBROUTINE dealloc_canopy_type
 
   ! ------------------------------------------------------------------------------
@@ -1829,6 +1868,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 )