Small fixes to better enable running with XIOS 3 (#218)

Co-authored-by: Lottie Turner <[email protected]>

Author: EdHone

components/lfric-xios/integration-test/iodef.xml

@@ -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" >

components/lfric-xios/source/lfric_xios_field_mod.f90

@@ -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
@@ -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()

components/lfric-xios/source/lfric_xios_file_mod.f90

@@ -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

components/lfric-xios/source/lfric_xios_metafile_mod.F90

@@ -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
 

rose-stem/app/coupled/file/iodef.xml

@@ -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" >

rose-stem/app/io_demo/file/iodef.xml

@@ -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" >

rose-stem/app/lbc_demo/file/iodef.xml

@@ -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" >

rose-stem/app/simple_diffusion/file/iodef.xml

@@ -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" >

rose-stem/app/skeleton/file/iodef.xml

@@ -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" >