Skip to content

Small fixes to better enable running with XIOS 3 #218

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
EdHone wants to merge 5 commits into
base: main
Choose a base branch
from
+18 −9
Open

Small fixes to better enable running with XIOS 3 #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
eb54ca3
Fix issues from XIOS integration
EdHone Jan 7, 2026
9da3999
Working tests
EdHone Jan 9, 2026
1522120
tweak api
EdHone Jan 14, 2026
2e5671f
Fix buffer factor in iodef.xml
EdHone Jan 14, 2026
f5a25da
Cover additional checkpointing read_access
EdHone Jan 20, 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
2 changes: 1 addition & 1 deletion components/lfric-xios/integration-test/iodef.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<variable_definition>
<variable_group id = "buffer">
<variable id = "optimal_buffer_size" type = "string" >performance</variable>
<variable id = "buffer_factor_size" type = "double" >1.0</variable>
<variable id = "buffer_size_factor" type = "double" >1.0</variable>
</variable_group>

<variable_group id = "parameters" >
Expand Down
7 changes: 5 additions & 2 deletions components/lfric-xios/source/lfric_xios_field_mod.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,12 @@ end function lfric_xios_field_constructor

!> Registers a representation of the model field with the associated XIOS field
!> group
subroutine register(self)
subroutine register(self, field_read_access)

implicit none

class(lfric_xios_field_type), intent(inout) :: self
logical, intent(in) :: field_read_access

type(xios_fieldgroup) :: fieldgroup_hdl
type(xios_domain) :: domain
Expand All @@ -135,7 +136,9 @@ subroutine register(self)
! Get field group handle and add field
call xios_get_handle(trim(adjustl(self%fieldgroup_id)), fieldgroup_hdl)
call xios_add_child(fieldgroup_hdl, self%handle, trim(self%xios_id))
call xios_set_attr(self%handle, name=trim(adjustl(self%model_field%get_name())))
call xios_set_attr( self%handle, &
name=trim(adjustl(self%model_field%get_name())), &
read_access=field_read_access )

! Set up dimensions of output field
vspace => self%model_field%get_function_space()
Expand Down
2 changes: 1 addition & 1 deletion components/lfric-xios/source/lfric_xios_file_mod.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ subroutine register_with_context(self)

! Iterate over field collection and register fields
do i = 1, size(self%fields)
call self%fields(i)%register()
call self%fields(i)%register(field_read_access=self%mode_is_read())
end do

! Set up time axis if needed
Expand Down
6 changes: 6 additions & 0 deletions components/lfric-xios/source/lfric_xios_metafile_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,12 @@ subroutine add_field(metafile, dict_field_id, mode, operation, id_as_name, legac
end if
end if
end if

! Enable read_access if field is being added for restarting
if (mode == RESTARTING) then
call xios_set_field_attr(field_id, read_access=.true.)
end if

end do
end subroutine add_field

Expand Down
2 changes: 1 addition & 1 deletion rose-stem/app/coupled/file/iodef.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<variable_definition>
<variable_group id = "buffer">
<variable id = "optimal_buffer_size" type = "string" >performance</variable>
<variable id = "buffer_factor_size" type = "double" >1.0</variable>
<variable id = "buffer_size_factor" type = "double" >1.0</variable>
</variable_group>

<variable_group id = "parameters" >
Expand Down
2 changes: 1 addition & 1 deletion rose-stem/app/io_demo/file/iodef.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<variable_definition>
<variable_group id = "buffer">
<variable id = "optimal_buffer_size" type = "string" >performance</variable>
<variable id = "buffer_factor_size" type = "double" >1.0</variable>
<variable id = "buffer_size_factor" type = "double" >1.0</variable>
</variable_group>

<variable_group id = "parameters" >
Expand Down
2 changes: 1 addition & 1 deletion rose-stem/app/lbc_demo/file/iodef.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<variable_definition>
<variable_group id = "buffer">
<variable id = "optimal_buffer_size" type = "string" >performance</variable>
<variable id = "buffer_factor_size" type = "double" >1.0</variable>
<variable id = "buffer_size_factor" type = "double" >1.0</variable>
</variable_group>

<variable_group id = "parameters" >
Expand Down
2 changes: 1 addition & 1 deletion rose-stem/app/simple_diffusion/file/iodef.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<variable_definition>
<variable_group id = "buffer">
<variable id = "optimal_buffer_size" type = "string" >performance</variable>
<variable id = "buffer_factor_size" type = "double" >1.0</variable>
<variable id = "buffer_size_factor" type = "double" >1.0</variable>
</variable_group>

<variable_group id = "parameters" >
Expand Down
2 changes: 1 addition & 1 deletion rose-stem/app/skeleton/file/iodef.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<variable_definition>
<variable_group id = "buffer">
<variable id = "optimal_buffer_size" type = "string" >performance</variable>
<variable id = "buffer_factor_size" type = "double" >1.0</variable>
<variable id = "buffer_size_factor" type = "double" >1.0</variable>
</variable_group>

<variable_group id = "parameters" >
Expand Down
Loading