Skip to content

Add parallel I/O output system #713

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SeanBryan51 wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Add parallel I/O output system #713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
60e551b
src/offline/file.txt: Delete unused file
SeanBryan51 Mar 13, 2026
f5a67a7
Move energy balance reporting to drivers
SeanBryan51 Mar 13, 2026
e56e133
Move energy and mass balance checks to drivers
SeanBryan51 Mar 13, 2026
5fc9c60
src/util/cable_array_utils.F90: Add array_eq
SeanBryan51 Mar 16, 2026
a147968
Add aggregator implementation
SeanBryan51 Nov 6, 2025
9e9b71b
Add working aggregator variables to compute daily max and min screen …
SeanBryan51 Nov 24, 2025
d448f3b
Bump intel compiler version to 2021.6.0
SeanBryan51 Mar 12, 2026
df516f5
Add parallel I/O output module implementation
SeanBryan51 Mar 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,14 +283,15 @@ 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.F90
src/offline/cable_driver_common.F90
src/offline/cable_initialise.F90
src/offline/cable_input.F90
src/offline/cable_metutils.F90
src/offline/cable_mpi_stub_types.F90
src/offline/cable_mpi.F90
src/offline/cable_namelist_input.F90
src/offline/cable_output.F90
src/offline/cable_parameters.F90
src/offline/cable_pft_params.F90
src/offline/cable_plume_mip.F90
Expand All @@ -299,19 +300,28 @@ else()
src/offline/cable_serial.F90
src/offline/cable_soil_params.F90
src/offline/cable_weathergenerator.F90
src/offline/cable_write.F90
src/offline/casa_cable.F90
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_grid_reductions.F90
src/util/cable_timing.F90
src/util/netcdf/cable_netcdf_decomp_util.F90
src/util/netcdf/cable_netcdf.F90
src/util/netcdf/cable_netcdf_init.F90
src/util/netcdf/cable_netcdf_stub_types.F90
src/util/netcdf/nf90/cable_netcdf_nf90.F90
src/util/output/cable_output_decomp.F90
src/util/output/cable_output_define.F90
src/util/output/cable_output_impl.F90
src/util/output/cable_output_common.F90
src/util/output/cable_output_reduction_buffers.F90
src/util/output/cable_output_write.F90
src/util/output/cable_output.F90
)

target_link_libraries(cable_common PRIVATE PkgConfig::NETCDF)
Expand Down
2 changes: 1 addition & 1 deletion build.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ if hostname -f | grep gadi.nci.org.au > /dev/null; then
# 2024.0.0 or higher
module add intel-compiler-llvm/2024.0.2
else
module add intel-compiler/2019.5.281
module add intel-compiler/2021.6.0
fi
compiler_lib_install_dir=Intel
[[ -n ${mpi} ]] && module add intel-mpi/2019.5.281
Expand Down
29 changes: 0 additions & 29 deletions src/offline/cable_abort.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ MODULE cable_abort_module
! open_met_file
! get_met_data
! load_parameters
! open_output_file
! write_output
! read_gridinfo
! countpatch
! get_type_parameters
Expand All @@ -47,16 +45,6 @@ MODULE cable_abort_module
! readpar_rd
! readpar_r2
! readpar_r2d
! define_output_variable_r1
! define_output_variable_r2
! define_output_parameter_r1
! define_output_parameter_r2
! write_output_variable_r1
! write_output_variable_r2
! write_output_parameter_r1
! write_output_parameter_r1d
! write_output_parameter_r2
! write_output_parameter_r2d
!
!==============================================================================

Expand All @@ -83,26 +71,12 @@ END SUBROUTINE abort
! get_met_data
! close_met_file
! load_parameters
! open_output_file
! write_output
! close_output_file
! create_restart
! read_gridinfo
! readpar_i
! readpar_r
! readpar_rd
! readpar_r2
! readpar_r2d
! define_output_variable_r1
! define_output_variable_r2
! define_output_parameter_r1
! define_output_parameter_r2
! write_output_variable_r1
! write_output_variable_r2
! write_output_parameter_r1
! write_output_parameter_r1d
! write_output_parameter_r2
! write_output_parameter_r2d
!
! MODULEs used: netcdf
!
Expand Down Expand Up @@ -130,9 +104,6 @@ END SUBROUTINE nc_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
!
Expand Down
7 changes: 1 addition & 6 deletions src/offline/cable_checks.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ SUBROUTINE constant_check_range(soil, veg, ktau, met)
! Commented ones in cable_def_types need to be checked
! Commented ones here need to be range-specified
! In future, it's better to have a callback for a derived type having both ranges and values
! This also clashes with range checks in open_output_file
! This also clashes with range checks in the output module

TYPE(soil_parameter_type), INTENT(IN) :: soil
TYPE(veg_parameter_type), INTENT(IN) :: veg
Expand Down Expand Up @@ -467,9 +467,6 @@ END SUBROUTINE constant_check_range
! to scrutinise balance in particular sections of the code - largely
! for diagnostics/fault finding.
!
! CALLed from: write_output
!
!
!==============================================================================

SUBROUTINE mass_balance(dels,ktau, ssnow,soil,canopy,met, &
Expand Down Expand Up @@ -561,8 +558,6 @@ END SUBROUTINE mass_balance
! to scrutinise balance in particular sections of the code - largely
! for diagnostics/fault finding.
!
! CALLed from: write_output
!
! MODULEs used: cable_data (inherited)
!
!==============================================================================
Expand Down
11 changes: 10 additions & 1 deletion src/offline/cable_define_types.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -534,6 +535,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

Expand Down Expand Up @@ -1194,6 +1197,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

! ------------------------------------------------------------------------------
Expand Down Expand Up @@ -1825,6 +1831,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

! ------------------------------------------------------------------------------
Expand Down
Loading
Loading