Parallel I/O output module enhancements

CMakeLists.txt

@@ -286,10 +286,14 @@ else()
         src/offline/cable_mpi.F90
         src/offline/cable_namelist_input.F90
         src/offline/cable_output.F90
+        src/offline/cable_output_prototype_v2.F90
+        src/offline/cable_output_definitions.F90
         src/offline/cable_parameters.F90
         src/offline/cable_pft_params.F90
         src/offline/cable_plume_mip.F90
         src/offline/cable_read.F90
+        src/offline/cable_restart.F90
+        src/offline/cable_restart_write.F90
         src/offline/cable_site.F90
         src/offline/cable_serial.F90
         src/offline/cable_soil_params.F90
@@ -299,9 +303,13 @@ else()
         src/offline/cbl_model_driver_offline.F90
         src/offline/landuse_inout.F90
         src/offline/spincasacnp.F90
+        src/util/aggregator.F90
+        src/util/aggregator_types.F90
         src/util/cable_climate_type_mod.F90
         src/util/masks_cbl.F90
         src/util/cable_array_utils.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/offline/cable_abort.F90

@@ -21,7 +21,6 @@
 MODULE cable_abort_module
 
   USE iso_fortran_env, ONLY: error_unit
-  USE cable_IO_vars_module, ONLY: check, logn
   USE cable_mpi_mod, ONLY: mpi_grp_t
 
   IMPLICIT NONE
@@ -106,72 +105,4 @@ SUBROUTINE nc_abort(ok, message)
 
   END SUBROUTINE nc_abort
 
-  !==============================================================================
-  !
-  ! Name: range_abort
-  !
-  ! Purpose: Prints an error message and localisation information then stops the
-  !          code
-  !
-  ! CALLed from: write_output_variable_r1
-  !              write_output_variable_r2
-  !
-  ! MODULEs used: cable_def_types_mod
-  !               cable_IO_vars_module
-  !
-  !==============================================================================
-
-  SUBROUTINE range_abort(vname, ktau, met, value, var_range, i, xx, yy)
-
-    USE cable_def_types_mod, ONLY: met_type
-    USE cable_IO_vars_module, ONLY: latitude, longitude, &
-                                    landpt, lat_all, lon_all
-
-    ! Input arguments
-    CHARACTER(LEN=*), INTENT(IN) :: vname
-
-    INTEGER, INTENT(IN) :: &
-      ktau, & ! time step
-      i       ! tile number along mp
-
-    REAL, INTENT(IN) :: &
-      xx, & ! coordinates of erroneous grid square
-      yy    ! coordinates of erroneous grid square
-
-    TYPE(met_type), INTENT(IN) :: met  ! met data
-
-    REAL(4), INTENT(IN) :: value ! value deemed to be out of range
-
-    REAL, INTENT(IN) :: var_range(2) ! appropriate var range
-
-    INTEGER :: iunit
-
-    IF (check%exit) THEN
-      iunit = 6
-    ELSE
-      iunit = logn ! warning
-    END IF
-
-    WRITE (iunit, *) "in SUBR range_abort: Out of range"
-    WRITE (iunit, *) "for var ", vname ! error from subroutine
-
-    ! patch(i)%latitude, patch(i)%longitude
-    WRITE (iunit, *) 'Site lat, lon:', xx, yy
-    WRITE (iunit, *) 'Output timestep', ktau, &
-      ', or ', met%hod(i), ' hod, ', &
-      INT(met%doy(i)), 'doy, ', &
-      INT(met%year(i))
-
-    WRITE (iunit, *) 'Specified acceptable range (cable_checks.f90):', &
-      var_range(1), 'to', var_range(2)
-
-    WRITE (iunit, *) 'Value:', value
-
-    IF (check%exit) THEN
-      STOP
-    END IF
-
-  END SUBROUTINE range_abort
-
-  !==============================================================================
 END MODULE cable_abort_module

src/offline/cable_checks.F90

@@ -30,8 +30,9 @@ MODULE cable_checks_module
   ! particular sections of the code - largely for diagnostics/fault finding.
   ! rh_sh - converts relative to sensible humidity if met file units require it
   !
-  USE cable_IO_vars_module, ONLY: patch
-  USE cable_abort_module, ONLY: range_abort
+  USE iso_fortran_env, ONLY: error_unit
+  USE cable_IO_vars_module, ONLY: patch, check, logn
+  USE cable_abort_module, ONLY: cable_abort
   USE cable_def_types_mod
   USE cable_common_module, ONLY: cable_user
 
@@ -212,6 +213,52 @@ MODULE cable_checks_module
 
 CONTAINS
 
+  SUBROUTINE range_abort(vname, ktau, met, value, var_range, i, xx, yy)
+    !! Prints an error message and localisation information then stops the code
+
+    CHARACTER(LEN=*), INTENT(IN) :: vname
+
+    INTEGER, INTENT(IN) :: &
+      ktau, & ! time step
+      i       ! tile number along mp
+
+    REAL, INTENT(IN) :: &
+      xx, & ! coordinates of erroneous grid square
+      yy    ! coordinates of erroneous grid square
+
+    TYPE(met_type), INTENT(IN) :: met  ! met data
+
+    REAL(4), INTENT(IN) :: value ! value deemed to be out of range
+
+    REAL, INTENT(IN) :: var_range(2) ! appropriate var range
+
+    INTEGER :: iunit
+
+    IF (check%exit) THEN
+      iunit = error_unit
+    ELSE
+      iunit = logn ! warning
+    END IF
+
+    WRITE (iunit, *) "in SUBR range_abort: Out of range"
+    WRITE (iunit, *) "for var ", vname ! error from subroutine
+
+    ! patch(i)%latitude, patch(i)%longitude
+    WRITE (iunit, *) 'Site lat, lon:', xx, yy
+    WRITE (iunit, *) 'Output timestep', ktau, &
+      ', or ', met%hod(i), ' hod, ', &
+      INT(met%doy(i)), 'doy, ', &
+      INT(met%year(i))
+
+    WRITE (iunit, *) 'Specified acceptable range (cable_checks.f90):', &
+      var_range(1), 'to', var_range(2)
+
+    WRITE (iunit, *) 'Value:', value
+
+    IF (check%exit) CALL cable_abort("Aborting...")
+
+  END SUBROUTINE range_abort
+
   SUBROUTINE check_range_d1(vname, parameter_r1, parameter_range, ktau, met)
 
     CHARACTER(LEN=*) :: vname

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
 
@@ -531,6 +532,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
 
@@ -1186,6 +1189,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, method="max"); CALL var%tscrn_max_daily%init()
+    var%tscrn_min_daily = new_aggregator(source_data=var%tscrn, method="min"); CALL var%tscrn_min_daily%init()
+
   END SUBROUTINE alloc_canopy_type
 
   ! ------------------------------------------------------------------------------
@@ -1811,6 +1817,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
 
   ! ------------------------------------------------------------------------------