Fix parallel implementation of temporal reading (#414)

Author: EdHone

components/lfric-xios/source/lfric_xios_temporal_mod.x90

@@ -286,12 +286,12 @@ contains
                             trim(file_id)//init_suffix )
 
       call xios_set_attr( initial_read_file, name=trim(adjustl(file_path)), &
-                                              output_freq=timestep_duration, &
-                                              mode="read",                   &
-                                              type="one_file",               &
-                                              record_offset=record_offset,  &
-                                              time_counter_name="time",      &
-                                              enabled=.true. )
+                                             output_freq=timestep_duration, &
+                                             mode="read",                   &
+                                             type="one_file",               &
+                                             record_offset=record_offset,   &
+                                             time_counter_name="time",      &
+                                             enabled=.true. )
 
       ! Move on record offset for next read
       record_offset = record_offset + 1

components/lfric-xios/source/lfric_xios_utils_mod.f90

@@ -172,6 +172,9 @@ function read_time_data(file_path) result(time_data)
     type(lfric_ncdf_dims_type)  :: time_dim
     type(lfric_ncdf_field_type) :: time_var
 
+    call log_event( "Reading time data from file ["//trim(file_path)//"]", &
+                    LOG_LEVEL_TRACE )
+
     if (global_mpi%get_comm_rank() == 0) then
       file_ncdf = lfric_ncdf_file_type( trim(file_path)//".nc", &
                                         open_mode=FILE_OP_OPEN, &
@@ -194,7 +197,6 @@ function read_time_data(file_path) result(time_data)
       time_dim = lfric_ncdf_dims_type(trim(dim_id), file_ncdf)
       n_t = time_dim%get_size()
       allocate( input_data( n_t ) )
-      allocate( time_data( n_t ) )
 
       ! Read the time data from the ancil file
       time_var = lfric_ncdf_field_type(trim(var_id), file_ncdf)
@@ -228,6 +230,7 @@ function read_time_data(file_path) result(time_data)
     call global_mpi%broadcast(input_data, n_t_buf(1), 0)
     call global_mpi%broadcast(time_meta_buf, size(time_meta_buf, 1)*str_def, 0)
 
+    allocate(time_data(n_t_buf(1)))
     ref_date_str = time_meta_buf(1)
     time_units = time_meta_buf(2)
     ref_date = parse_date_as_xios(trim(adjustl(ref_date_str)))

rose-stem/app/io_demo/opt/rose-app-C48.conf

@@ -0,0 +1,10 @@
+[file:mesh_C48.nc]
+mode=auto
+source=$MESH_DIR/mesh_C48.nc
+
+[namelist:base_mesh]
+file_prefix='mesh_C48'
+geometry='spherical'
+
+[namelist:partitioning]
+partitioner='cubedsphere'

rose-stem/site/common/io_demo/tasks_io_demo.cylc

@@ -48,6 +48,32 @@
         "tsteps": 90,
     }) %}
 
+
+{% elif task_ns.conf_name == "temporal_reading-C48" %}
+
+    {% do task_dict.update({
+        "opt_confs": ["temporal_reading"],
+        "resolution": "C48",
+        "tsteps": 90,
+        "kgo_checks": [],
+        "mpi_parts": 24,
+    }) %}
+
+
+{% elif task_ns.conf_name == "temporal_reading-C48-server" %}
+
+    {% do task_dict.update({
+        "opt_confs": ["temporal_reading"],
+        "resolution": "C48",
+        "tsteps": 90,
+        "kgo_checks": [],
+        "mpi_parts": 24,
+        "mpi_parts_xios": 1,
+        "xios_nodes": 1,
+        "xios_server_mode": true,
+        "xios_server_ranks": 1,
+    }) %}
+
 {% elif task_ns.conf_name == "benchmark-C24" %}
 
     {% do task_dict.update({

rose-stem/site/meto/groups/group_io_demo.cylc

@@ -19,6 +19,7 @@
         "io_demo_multifile-C24_azspice_gnu_fast-debug-32bit",
         "io_demo_temporal_reading-C12_azspice_gnu_fast-debug-64bit",
         "io_demo_temporal_reading-C12_azspice_gnu_fast-debug-32bit",
+        "io_demo_temporal_reading-C48_azspice_gnu_fast-debug-32bit",
         "io_demo_benchmark-C24_azspice_gnu_fast-debug-64bit",
         "io_demo_benchmark-C24_azspice_gnu_fast-debug-32bit",
         "io_demo_azspice_unit_tests",
@@ -57,6 +58,8 @@
         "io_demo_temporal_reading-C12_ex1a_cce_fast-debug-32bit",
         "io_demo_temporal_reading-C12_ex1a_gnu_fast-debug-64bit",
         "io_demo_temporal_reading-C12_ex1a_gnu_fast-debug-32bit",
+        "io_demo_temporal_reading-C48_ex1a_cce_fast-debug-32bit",
+        "io_demo_temporal_reading-C48_ex1a_gnu_fast-debug-64bit",
         "io_demo_benchmark-C24_ex1a_cce_fast-debug-32bit",
         "io_demo_benchmark-C24_ex1a_gnu_fast-debug-32bit",
         "io_demo_benchmark-C24_ex1a_gnu_fast-debug-64bit",
@@ -66,6 +69,10 @@
         "io_demo_benchmark-nwp-C224_ex1a_cce_fast-debug-32bit",
         "io_demo_benchmark-nwp-C224_ex1a_gnu_fast-debug-32bit",
     ],
+    "io_demo_ex1a_servers": [
+        "io_demo_temporal_reading-C48-server_ex1a_cce_fast-debug-32bit",
+        "io_demo_temporal_reading-C48-server_ex1a_gnu_fast-debug-64bit",
+    ],
     "io_demo_ex1a": [
         "io_demo_ex1a_developer"
     ],