Skip to content

#369: Allow coarse-grid fields with ndata levels: vn3.1 read coarse 2d #369

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

Merged
Matthew Hambley (MatthewHambley) merged 17 commits into from
Jun 23, 2026
Merged

#369: Allow coarse-grid fields with ndata levels: vn3.1 read coarse 2d #369

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
fe891db
Use the default 3-D coarse mesh definition when reading a 2-D (x ndat…
mcdalvi May 1, 2026
bbd9507
temporarily hardwire nalyers = 1 for TWOD fields
mcdalvi May 8, 2026
ad79c79
Correct the assignment to pointer
mcdalvi May 11, 2026
78ef7e9
Sign CLA
mcdalvi May 12, 2026
5e86739
merge with origin/main at b1bf318
mcdalvi May 13, 2026
c6ea0ec
Fix trailing space
mcdalvi May 13, 2026
33a1a45
Modfy fix after review, *local_mesh* should have required properties …
mcdalvi May 21, 2026
bb530cc
Use proper type for declaration
mcdalvi May 28, 2026
af071df
Remove unused variables
mcdalvi May 28, 2026
363dfde
Remove unused variables
mcdalvi May 28, 2026
b556f0f
Remove comment no longer relevant
mcdalvi Jun 4, 2026
589faff
Remove trailing space
mcdalvi Jun 4, 2026
74a4742
Merge main into branch
mcdalvi Jun 17, 2026
50292c3
Pass modeldb to *before_close* routine to allow access to configurati…
mcdalvi Jun 17, 2026
6d69624
Pass in only configuration and clock information as required, rather …
mcdalvi Jun 18, 2026
37201fb
Fix typo
mcdalvi Jun 18, 2026
88eabd3
Merge in main for testing with upgraded apps branch
mcdalvi Jun 19, 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
1 change: 1 addition & 0 deletions CONTRIBUTORS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,4 @@
| timgraham-Met | Tim Graham | Met Office | 2026-05-20 |
| tinyendian | Wolfgang Hayek | Earth Sciences New Zealand | 2026-05-04 |
| Adrian-Lock | Adrian Lock | Met Office | 2026-05-21 |
| mcdalvi | Mohit Dalvi | Met Office | 2026-06-17 |
7 changes: 5 additions & 2 deletions components/driver/source/driver_io_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,13 @@ end subroutine filelist_populator

abstract interface
!> @brief Callback interface for bespoke IO configuration
!> @param[in] config configuration to be passed in at call site
!> @param[in] clock Clock to be passed in at call site
subroutine io_configuration_callback(clock)
subroutine io_configuration_callback(config,clock)
use config_mod, only: config_type
use clock_mod, only : clock_type
implicit none
type(config_type), intent(in) :: config
class(clock_type), intent(in) :: clock
end subroutine io_configuration_callback
end interface
Expand Down Expand Up @@ -115,7 +118,7 @@ subroutine init_io( context_name, &
call modeldb%io_contexts%get_io_context(context_name, context)
call context%set_current()
if (present(before_close)) then
call before_close(modeldb%clock)
call before_close(modeldb%config, modeldb%clock)
end if

call context%close_context_definition()
Expand Down
17 changes: 12 additions & 5 deletions components/lfric-xios/source/lfric_xios_read_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ module lfric_xios_read_mod
use lfric_xios_utils_mod, only: prime_io_mesh_is
use lfric_xios_format_mod, only: inverse_format_field

use local_mesh_mod, only: local_mesh_type
use mesh_mod, only: mesh_type
use log_mod, only: log_event, &
log_scratch_space, &
Expand Down Expand Up @@ -290,10 +291,15 @@ subroutine read_field_time_var(xios_field_name, field_proxy, time_indices, time_
real(r_def), allocatable :: time_slice(:)
real(r_def), allocatable :: field_data(:)

type(mesh_type), pointer :: mesh => null()
type(mesh_type), pointer :: mesh
type(local_mesh_type), pointer :: local_mesh
character(str_def) :: local_mesh_name

nullify(mesh,local_mesh)

! Call error if field not on prime mesh
mesh => field_proxy%vspace%get_mesh()
local_mesh => mesh%get_local_mesh()
local_mesh_name = local_mesh%get_mesh_name()

fs_id = field_proxy%vspace%which()
if ( fs_id /= W3 .and. fs_id /= WTheta .and. fs_id /= W2H ) then
Expand Down Expand Up @@ -329,13 +335,13 @@ subroutine read_field_time_var(xios_field_name, field_proxy, time_indices, time_
end if
else
if ( fs_id == W3 ) then
call xios_get_domain_attr( trim(adjustl(mesh%get_mesh_name()))//"_face", ni=domain_size )
call xios_get_domain_attr( trim(adjustl(local_mesh_name))//"_face", ni=domain_size )
call xios_get_axis_attr( 'vert_axis_half_levels', n_glo=vert_axis_size )
else if ( fs_id == WTheta ) then
call xios_get_domain_attr( trim(adjustl(mesh%get_mesh_name()))//"_face", ni=domain_size )
call xios_get_domain_attr( trim(adjustl(local_mesh_name))//"_face", ni=domain_size )
call xios_get_axis_attr( 'vert_axis_full_levels', n_glo=vert_axis_size )
else if ( fs_id == W2H ) then
call xios_get_domain_attr( trim(adjustl(mesh%get_mesh_name()))//"_edge", ni=domain_size )
call xios_get_domain_attr( trim(adjustl(local_mesh_name))//"_edge", ni=domain_size )
call xios_get_axis_attr( 'vert_axis_half_levels', n_glo=vert_axis_size )
else
call log_event( 'Time varying fields only readable for W3, WTheta or W2H function spaces', &
Expand Down Expand Up @@ -368,6 +374,7 @@ subroutine read_field_time_var(xios_field_name, field_proxy, time_indices, time_

! Incoming data is shaped with multi-data axis first, then time axis, so set
! up an array for each multi-data level
! Note that this places a restriction on the format on some ancil files
do i = 0, ndata - 1

!Get first ndata slice - note the conversion from double precision to r_def
Expand Down