From 2b2bd4edd7356dd84ae2c20a4d8d05ffeac5395d Mon Sep 17 00:00:00 2001 From: Christine Johnson <74597224+cjohnson-pi@users.noreply.github.com> Date: Thu, 23 Jul 2026 12:21:07 +0100 Subject: [PATCH 01/18] From #530 --- .../initialisation/lfric2lfric_init_mesh.f90 | 74 +++++++++++++------ .../app/lfric2lfric/file/iodef_diag_file.xml | 70 ++++++++++++++++++ .../opt/rose-app-dst_melbourne.conf | 13 ++++ .../app/lfric2lfric/opt/rose-app-dst_ukv.conf | 13 ++++ .../opt/rose-app-src_C224_L70.conf | 30 ++++++++ .../opt/rose-app-src_C896_L70.conf | 30 ++++++++ .../app/mesh/opt/rose-app-melbourne.conf | 25 +++++++ rose-stem/app/mesh/opt/rose-app-ukv.conf | 33 +++++++++ .../common/lfric2lfric/tasks_lfric2lfric.cylc | 43 +++++++++++ .../site/meto/groups/groups_lfric2lfric.cylc | 5 ++ 10 files changed, 315 insertions(+), 21 deletions(-) create mode 100644 rose-stem/app/lfric2lfric/file/iodef_diag_file.xml create mode 100644 rose-stem/app/lfric2lfric/opt/rose-app-dst_melbourne.conf create mode 100644 rose-stem/app/lfric2lfric/opt/rose-app-dst_ukv.conf create mode 100644 rose-stem/app/lfric2lfric/opt/rose-app-src_C224_L70.conf create mode 100644 rose-stem/app/lfric2lfric/opt/rose-app-src_C896_L70.conf create mode 100644 rose-stem/app/mesh/opt/rose-app-melbourne.conf create mode 100644 rose-stem/app/mesh/opt/rose-app-ukv.conf diff --git a/applications/lfric2lfric/source/initialisation/lfric2lfric_init_mesh.f90 b/applications/lfric2lfric/source/initialisation/lfric2lfric_init_mesh.f90 index 734ca96d17..d8535963d6 100644 --- a/applications/lfric2lfric/source/initialisation/lfric2lfric_init_mesh.f90 +++ b/applications/lfric2lfric/source/initialisation/lfric2lfric_init_mesh.f90 @@ -334,29 +334,61 @@ subroutine init_mesh( config, & ! Read in all global meshes from input file !=========================================================== if (mesh_file(dst) == mesh_file(src)) then - call load_global_mesh( mesh_file(dst), mesh_names ) + call load_global_mesh( mesh_file(dst), mesh_names ) + + ! Partition the global meshes + !=========================================================== + call create_local_mesh( mesh_names(dst:dst), & + local_rank, total_ranks, & + decomposition_dst, & + stencil_depths, & + generate_inner_halos(dst), & + partitioner_dst, & + enforce_constraints = .false. ) + call create_local_mesh( mesh_names(src:src), & + local_rank, total_ranks, & + decomposition_src, & + stencil_depths, & + generate_inner_halos(src), & + partitioner_src, & + enforce_constraints = .false. ) + else - call load_global_mesh( mesh_file(dst), mesh_names(dst) ) + + !! SOURCE call load_global_mesh( mesh_file(src), mesh_names(src) ) - endif + write( log_scratch_space, '(A)' ) & + 'Loaded src' + call log_event(log_scratch_space, log_level_debug) - ! Partition the global meshes - !=========================================================== - call create_local_mesh( mesh_names(dst:dst), & - local_rank, total_ranks, & - decomposition_dst, & - stencil_depths, & - generate_inner_halos(dst), & - partitioner_dst, & - enforce_constraints = .false. ) - - call create_local_mesh( mesh_names(src:src), & - local_rank, total_ranks, & - decomposition_src, & - stencil_depths, & - generate_inner_halos(src), & - partitioner_src, & - enforce_constraints = .false. ) + call create_local_mesh( mesh_names(src:src), & + local_rank, total_ranks, & + decomposition_src, & + stencil_depths, & + generate_inner_halos(src), & + partitioner_src, & + enforce_constraints = .false. ) + + call global_mesh_collection%clear() + + !! DESTINATION + call load_global_mesh( mesh_file(dst), mesh_names(dst) ) + write( log_scratch_space, '(A)' ) & + 'Loaded dest' + call log_event(log_scratch_space, log_level_debug) + + call create_local_mesh( mesh_names(dst:dst), & + local_rank, total_ranks, & + decomposition_dst, & + stencil_depths, & + generate_inner_halos(dst), & + partitioner_dst, & + enforce_constraints = .false. ) + + call global_mesh_collection%clear() + + + endif ! Read in the global intergrid mesh mappings, ! then create the associated local mesh maps @@ -385,4 +417,4 @@ subroutine init_mesh( config, & end subroutine init_mesh -end module lfric2lfric_init_mesh_mod +end module lfric2lfric_init_mesh diff --git a/rose-stem/app/lfric2lfric/file/iodef_diag_file.xml b/rose-stem/app/lfric2lfric/file/iodef_diag_file.xml new file mode 100644 index 0000000000..28ccc8e19b --- /dev/null +++ b/rose-stem/app/lfric2lfric/file/iodef_diag_file.xml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + performance + 1.0 + + + + false + false + 50 + true + lfric2lfric lfric2lfric + + + + + diff --git a/rose-stem/app/lfric2lfric/opt/rose-app-dst_melbourne.conf b/rose-stem/app/lfric2lfric/opt/rose-app-dst_melbourne.conf new file mode 100644 index 0000000000..d4a93fe040 --- /dev/null +++ b/rose-stem/app/lfric2lfric/opt/rose-app-dst_melbourne.conf @@ -0,0 +1,13 @@ +[namelist:files] +checkpoint_stem_name='restart_lfric2lfric_ral_seuk_MG' + +[namelist:lfric2lfric] +target_domain='LAM' +dst_ancil_directory='$BIG_DATA_DIR/ancils/proto-ral/Ticket255/Melbourne' +destination_meshfile_prefix='${MESH_DIR}/melbourne/mesh_melbourne' +destination_mesh_name='melbourne' +dst_orography_mean_ancil_path='' +destination_topology='non_periodic' + +[namelist:partitioning(destination)] +partitioner='planar' \ No newline at end of file diff --git a/rose-stem/app/lfric2lfric/opt/rose-app-dst_ukv.conf b/rose-stem/app/lfric2lfric/opt/rose-app-dst_ukv.conf new file mode 100644 index 0000000000..dfd81462c4 --- /dev/null +++ b/rose-stem/app/lfric2lfric/opt/rose-app-dst_ukv.conf @@ -0,0 +1,13 @@ +[namelist:files] +checkpoint_stem_name='restart_lfric2lfric_ral_ukv_MG' + +[namelist:lfric2lfric] +target_domain='LAM' +dst_ancil_directory='' +destination_meshfile_prefix='${MESH_DIR}/ukv/mesh_ukv' +destination_mesh_name='ukv' +dst_orography_mean_ancil_path='' +destination_topology='non_periodic' + +[namelist:partitioning(destination)] +partitioner='planar' \ No newline at end of file diff --git a/rose-stem/app/lfric2lfric/opt/rose-app-src_C224_L70.conf b/rose-stem/app/lfric2lfric/opt/rose-app-src_C224_L70.conf new file mode 100644 index 0000000000..f60125a3d0 --- /dev/null +++ b/rose-stem/app/lfric2lfric/opt/rose-app-src_C224_L70.conf @@ -0,0 +1,30 @@ +[file:iodef.xml] +source=$ROSE_SUITE_DIR/app/lfric2lfric/file/iodef_orography.xml + +[file:source_data_C224.nc] +source="/data/users/christine.johnson/lfric_data/lfric2lfric/startdump_C224.nc" +mode=symlink + +[namelist:extrusion] +domain_height=80000.0 +method='um_L70_50t_20s_80km' +number_of_layers=70 +stretching_height=17507.0 +stretching_method='smooth' + +[namelist:files] +start_dump_filename='source_data_C224' + +[namelist:lfric2lfric] +source_mesh_name='dynamics' +source_meshfile_prefix='${MESH_DIR}/C224_MG/mesh_C224_MG' +src_ancil_directory='$BIG_DATA_DIR/ancils/basic-gal/yak/C224' +src_orography_mean_ancil_path='orography/gmted_ramp2/qrparm.orog.ugrid' + +[namelist:partitioning(source)] +panel_decomposition='custom' +panel_xproc=6 +panel_yproc=6 + +[namelist:orography] +orog_init_option='none' \ No newline at end of file diff --git a/rose-stem/app/lfric2lfric/opt/rose-app-src_C896_L70.conf b/rose-stem/app/lfric2lfric/opt/rose-app-src_C896_L70.conf new file mode 100644 index 0000000000..570ddbf9bb --- /dev/null +++ b/rose-stem/app/lfric2lfric/opt/rose-app-src_C896_L70.conf @@ -0,0 +1,30 @@ +[file:iodef.xml] +source=$ROSE_SUITE_DIR/app/lfric2lfric/file/iodef_diag_file.xml + +[file:source_data_C896.nc] +source="/data/users/christine.johnson/lfric_data/lfric2lfric/rho_theta_C896_t1.nc" +mode=symlink + +[namelist:extrusion] +domain_height=80000.0 +method='um_L70_50t_20s_80km' +number_of_layers=70 +stretching_height=17507.0 +stretching_method='smooth' + +[namelist:files] +start_dump_filename='source_data_C896' + +[namelist:lfric2lfric] +source_mesh_name='l0_cubedsphere' +source_meshfile_prefix='${MESH_DIR}/C896_MG/mesh_C896_MG' +src_ancil_directory='' +src_orography_mean_ancil_path='' + +[namelist:partitioning(source)] +panel_decomposition='custom' +panel_xproc=16 +panel_yproc=8 + +[namelist:orography] +orog_init_option='none' \ No newline at end of file diff --git a/rose-stem/app/mesh/opt/rose-app-melbourne.conf b/rose-stem/app/mesh/opt/rose-app-melbourne.conf new file mode 100644 index 0000000000..7e9435103c --- /dev/null +++ b/rose-stem/app/mesh/opt/rose-app-melbourne.conf @@ -0,0 +1,25 @@ +[command] +default=mkdir -p $MESH_DIR ; mpiexec -n 1 $BIN_DIR/planar_mesh_generator mesh_generation.nml + +[env] +mesh_generator=Planar + +[!!namelist:cubedsphere_mesh] + +[namelist:mesh] +mesh_maps='' +mesh_names='melbourne' +n_meshes=1 +rotate_mesh=.true. +topology='non_periodic' + +[namelist:planar_mesh] +domain_centre=144.578,-37.472 +domain_size=3.456,3.456 +edge_cells_x=256 +edge_cells_y=256 +periodic_x=.false. +periodic_y=.false. + +[namelist:rotation] +target_north_pole=180.0,90.0 diff --git a/rose-stem/app/mesh/opt/rose-app-ukv.conf b/rose-stem/app/mesh/opt/rose-app-ukv.conf new file mode 100644 index 0000000000..88a260df29 --- /dev/null +++ b/rose-stem/app/mesh/opt/rose-app-ukv.conf @@ -0,0 +1,33 @@ +[command] +default=mkdir -p $MESH_DIR ; mpiexec -n 1 $BIN_DIR/planar_mesh_generator mesh_generation.nml + +[env] +mesh_generator=Planar + +[!!namelist:cubedsphere_mesh] + +[namelist:mesh] +mesh_maps='' +mesh_names='ukv' +n_meshes=1 +rotate_mesh=.true. +topology='non_periodic' + +[namelist:planar_mesh] +domain_centre=-0.872500,1.6968 +domain_size=1,1 +edge_cells_x=960 +edge_cells_y=1024 +periodic_x=.false. +periodic_y=.false. +stretch_function='inflation' + +[namelist:rotation] +target_north_pole=177.5,37.5 + +[namelist:stretch_transform] +cell_size_inner=0.0135,0.0135 +cell_size_outer=0.036,0.036 +n_cells_outer=140,85 +n_cells_stretch=21,21 +stretching_on='p_points' diff --git a/rose-stem/site/common/lfric2lfric/tasks_lfric2lfric.cylc b/rose-stem/site/common/lfric2lfric/tasks_lfric2lfric.cylc index 535f735232..f51283b9dd 100644 --- a/rose-stem/site/common/lfric2lfric/tasks_lfric2lfric.cylc +++ b/rose-stem/site/common/lfric2lfric/tasks_lfric2lfric.cylc @@ -205,6 +205,49 @@ "mpi_parts": 4, }) %} +{% elif task_ns.conf_name == "oasis_C224_to_Melbourne" %} + "opt_confs": ["oasis","source-C224","destination-melbourne"], + "resolution": ["melbourne","C224_MG"], + "dst_mesh": "melbourne", + "dst_name": "melbourne", + "dst_type": "regional", + "src_mesh": "C224_MG", + "src_name": "dynamics", + "src_type": "global", + "mpi_parts": 216, + "kgo_checks": [], + }) %} + +{% elif task_ns.conf_name == "oasis_C896_to_Melbourne" %} + + {% do task_dict.update({ + "opt_confs": ["oasis","source-C896","destination-melbourne"], + "resolution": ["melbourne","C896_MG"], + "dst_mesh": "melbourne", + "dst_name": "melbourne", + "dst_type": "regional", + "src_mesh": "C896_MG", + "src_name": "dynamics", + "src_type": "global", + "mpi_parts": 768, + "memory": [250, "GB"], + "kgo_checks": [], + }) %} + +{% elif task_ns.conf_name == "oasis_C896_to_ukv" %} + + {% do task_dict.update({ + "opt_confs": ["oasis","source-C896","destination-ukv"], + "resolution": ["ukv","C896_MG"], + "dst_mesh": "ukv", + "dst_name": "ukv", + "dst_type": "regional", + "src_mesh": "C896_MG", + "src_name": "dynamics", + "src_type": "global", + "mpi_parts": 768, + "kgo_checks": [], + }) %} {% elif task_ns.conf_name == "canned" %} {% do task_dict.update({ diff --git a/rose-stem/site/meto/groups/groups_lfric2lfric.cylc b/rose-stem/site/meto/groups/groups_lfric2lfric.cylc index 8ccdff8070..09e99468c1 100644 --- a/rose-stem/site/meto/groups/groups_lfric2lfric.cylc +++ b/rose-stem/site/meto/groups/groups_lfric2lfric.cylc @@ -61,6 +61,11 @@ "lfric2lfric_oasis_clim_gal9_C12-ral_seuk_C16_lam_4cpu_ex1a_cce_fast-debug-64bit", "lfric2lfric_oasis_clim_gal9_C12-ral_seuk_C16_lam-lbc_4cpu_ex1a_cce_fast-debug-64bit", ], + "lfric2lfric_ex1a_weekly": [ + "lfric2lfric_oasis_C224_to_Melbourne_ex1a_cce_fast-debug-64bit", + "lfric2lfric_oasis_C896_to_Melbourne_ex1a_cce_fast-debug-64bit", + "lfric2lfric_oasis_C896_to_ukv_ex1a_cce_fast-debug-64bit", + ], "lfric2lfric_ex1a": [ "lfric2lfric_ex1a_developer", "lfric2lfric_ex1a_extra", From 65fbef9bbd31fa678a6fb2601d750bbb7c51a6b6 Mon Sep 17 00:00:00 2001 From: Christine Johnson <74597224+cjohnson-pi@users.noreply.github.com> Date: Thu, 23 Jul 2026 14:29:02 +0100 Subject: [PATCH 02/18] correction --- rose-stem/site/common/lfric2lfric/tasks_lfric2lfric.cylc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rose-stem/site/common/lfric2lfric/tasks_lfric2lfric.cylc b/rose-stem/site/common/lfric2lfric/tasks_lfric2lfric.cylc index f51283b9dd..30f652d81d 100644 --- a/rose-stem/site/common/lfric2lfric/tasks_lfric2lfric.cylc +++ b/rose-stem/site/common/lfric2lfric/tasks_lfric2lfric.cylc @@ -206,6 +206,8 @@ }) %} {% elif task_ns.conf_name == "oasis_C224_to_Melbourne" %} + + {% do task_dict.update({ "opt_confs": ["oasis","source-C224","destination-melbourne"], "resolution": ["melbourne","C224_MG"], "dst_mesh": "melbourne", From 86a642bf8becdbd8361e8c6e996a40b9feddbec9 Mon Sep 17 00:00:00 2001 From: Christine Johnson <74597224+cjohnson-pi@users.noreply.github.com> Date: Thu, 23 Jul 2026 14:39:55 +0100 Subject: [PATCH 03/18] correction --- rose-stem/app/mesh/opt/rose-app-ukv.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/rose-stem/app/mesh/opt/rose-app-ukv.conf b/rose-stem/app/mesh/opt/rose-app-ukv.conf index 88a260df29..a3683e67a6 100644 --- a/rose-stem/app/mesh/opt/rose-app-ukv.conf +++ b/rose-stem/app/mesh/opt/rose-app-ukv.conf @@ -31,3 +31,4 @@ cell_size_outer=0.036,0.036 n_cells_outer=140,85 n_cells_stretch=21,21 stretching_on='p_points' +transform_mesh='ukv' From 4316da9a13b73d2506e20057f9eb2ec08263e580 Mon Sep 17 00:00:00 2001 From: Christine Johnson <74597224+cjohnson-pi@users.noreply.github.com> Date: Thu, 23 Jul 2026 14:54:32 +0100 Subject: [PATCH 04/18] correction --- .../lfric2lfric/source/initialisation/lfric2lfric_init_mesh.f90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/lfric2lfric/source/initialisation/lfric2lfric_init_mesh.f90 b/applications/lfric2lfric/source/initialisation/lfric2lfric_init_mesh.f90 index d8535963d6..7f520b2dbd 100644 --- a/applications/lfric2lfric/source/initialisation/lfric2lfric_init_mesh.f90 +++ b/applications/lfric2lfric/source/initialisation/lfric2lfric_init_mesh.f90 @@ -417,4 +417,4 @@ subroutine init_mesh( config, & end subroutine init_mesh -end module lfric2lfric_init_mesh +end module lfric2lfric_init_mesh_mod From 1e0527f51741acd85b593e6fc9debee1e19b364d Mon Sep 17 00:00:00 2001 From: Christine Johnson <74597224+cjohnson-pi@users.noreply.github.com> Date: Thu, 23 Jul 2026 15:06:48 +0100 Subject: [PATCH 05/18] memory --- rose-stem/templates/default_directives.cylc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rose-stem/templates/default_directives.cylc b/rose-stem/templates/default_directives.cylc index 8abf4df340..a3a26ec5aa 100644 --- a/rose-stem/templates/default_directives.cylc +++ b/rose-stem/templates/default_directives.cylc @@ -17,7 +17,7 @@ "tech-tests_memory": [6, "GB"], "tech-tests_wallclock": 20, "tech-tests_cpus": 1, - "gen_weights_tasks": 8, + "gen_weights_tasks": 16, "gen_weights_memory": [16, "GB"], } %} From 23b3f803c42b9b024b5a797e9d46698141a14e85 Mon Sep 17 00:00:00 2001 From: Christine Johnson <74597224+cjohnson-pi@users.noreply.github.com> Date: Thu, 23 Jul 2026 15:13:43 +0100 Subject: [PATCH 06/18] config names correction --- rose-stem/site/common/lfric2lfric/tasks_lfric2lfric.cylc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rose-stem/site/common/lfric2lfric/tasks_lfric2lfric.cylc b/rose-stem/site/common/lfric2lfric/tasks_lfric2lfric.cylc index 30f652d81d..553607a338 100644 --- a/rose-stem/site/common/lfric2lfric/tasks_lfric2lfric.cylc +++ b/rose-stem/site/common/lfric2lfric/tasks_lfric2lfric.cylc @@ -208,7 +208,7 @@ {% elif task_ns.conf_name == "oasis_C224_to_Melbourne" %} {% do task_dict.update({ - "opt_confs": ["oasis","source-C224","destination-melbourne"], + "opt_confs": ["oasis","src_C224_L70","dst_melbourne"], "resolution": ["melbourne","C224_MG"], "dst_mesh": "melbourne", "dst_name": "melbourne", @@ -223,7 +223,7 @@ {% elif task_ns.conf_name == "oasis_C896_to_Melbourne" %} {% do task_dict.update({ - "opt_confs": ["oasis","source-C896","destination-melbourne"], + "opt_confs": ["oasis","src_C896_L70","dst_melbourne"], "resolution": ["melbourne","C896_MG"], "dst_mesh": "melbourne", "dst_name": "melbourne", @@ -239,7 +239,7 @@ {% elif task_ns.conf_name == "oasis_C896_to_ukv" %} {% do task_dict.update({ - "opt_confs": ["oasis","source-C896","destination-ukv"], + "opt_confs": ["oasis","src_C896_L70","dst_ukv"], "resolution": ["ukv","C896_MG"], "dst_mesh": "ukv", "dst_name": "ukv", From facae2144e89b75f8a0355e504b7981cd8088cde Mon Sep 17 00:00:00 2001 From: Christine Johnson <74597224+cjohnson-pi@users.noreply.github.com> Date: Thu, 23 Jul 2026 16:33:17 +0100 Subject: [PATCH 07/18] correct mesh name --- rose-stem/app/lfric2lfric/opt/rose-app-src_C896_L70.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rose-stem/app/lfric2lfric/opt/rose-app-src_C896_L70.conf b/rose-stem/app/lfric2lfric/opt/rose-app-src_C896_L70.conf index 570ddbf9bb..ee368a3859 100644 --- a/rose-stem/app/lfric2lfric/opt/rose-app-src_C896_L70.conf +++ b/rose-stem/app/lfric2lfric/opt/rose-app-src_C896_L70.conf @@ -16,7 +16,7 @@ stretching_method='smooth' start_dump_filename='source_data_C896' [namelist:lfric2lfric] -source_mesh_name='l0_cubedsphere' +source_mesh_name='dynamics' source_meshfile_prefix='${MESH_DIR}/C896_MG/mesh_C896_MG' src_ancil_directory='' src_orography_mean_ancil_path='' From d4c94fdf8a2f297d9f54af540bb554dcf93f89da Mon Sep 17 00:00:00 2001 From: Christine Johnson <74597224+cjohnson-pi@users.noreply.github.com> Date: Thu, 23 Jul 2026 17:18:34 +0100 Subject: [PATCH 08/18] corrections --- .../app/mesh/opt/rose-app-melbourne.conf | 2 -- rose-stem/app/mesh/opt/rose-app-ukv.conf | 2 -- .../common/lfric2lfric/tasks_lfric2lfric.cylc | 22 +++++++++---------- .../site/meto/groups/groups_lfric2lfric.cylc | 4 ++-- rose-stem/templates/default_directives.cylc | 2 +- 5 files changed, 14 insertions(+), 18 deletions(-) diff --git a/rose-stem/app/mesh/opt/rose-app-melbourne.conf b/rose-stem/app/mesh/opt/rose-app-melbourne.conf index 7e9435103c..8eb9c79bd2 100644 --- a/rose-stem/app/mesh/opt/rose-app-melbourne.conf +++ b/rose-stem/app/mesh/opt/rose-app-melbourne.conf @@ -7,9 +7,7 @@ mesh_generator=Planar [!!namelist:cubedsphere_mesh] [namelist:mesh] -mesh_maps='' mesh_names='melbourne' -n_meshes=1 rotate_mesh=.true. topology='non_periodic' diff --git a/rose-stem/app/mesh/opt/rose-app-ukv.conf b/rose-stem/app/mesh/opt/rose-app-ukv.conf index a3683e67a6..6aa2501344 100644 --- a/rose-stem/app/mesh/opt/rose-app-ukv.conf +++ b/rose-stem/app/mesh/opt/rose-app-ukv.conf @@ -7,9 +7,7 @@ mesh_generator=Planar [!!namelist:cubedsphere_mesh] [namelist:mesh] -mesh_maps='' mesh_names='ukv' -n_meshes=1 rotate_mesh=.true. topology='non_periodic' diff --git a/rose-stem/site/common/lfric2lfric/tasks_lfric2lfric.cylc b/rose-stem/site/common/lfric2lfric/tasks_lfric2lfric.cylc index 553607a338..c5eed3d4c2 100644 --- a/rose-stem/site/common/lfric2lfric/tasks_lfric2lfric.cylc +++ b/rose-stem/site/common/lfric2lfric/tasks_lfric2lfric.cylc @@ -212,12 +212,12 @@ "resolution": ["melbourne","C224_MG"], "dst_mesh": "melbourne", "dst_name": "melbourne", - "dst_type": "regional", + "dst_type": "regional", "src_mesh": "C224_MG", "src_name": "dynamics", - "src_type": "global", - "mpi_parts": 216, - "kgo_checks": [], + "src_type": "global", + "mpi_parts": 216, + "kgo_checks": [], }) %} {% elif task_ns.conf_name == "oasis_C896_to_Melbourne" %} @@ -228,12 +228,12 @@ "dst_mesh": "melbourne", "dst_name": "melbourne", "dst_type": "regional", - "src_mesh": "C896_MG", + "src_mesh": "C896_MG", "src_name": "dynamics", "src_type": "global", - "mpi_parts": 768, - "memory": [250, "GB"], - "kgo_checks": [], + "mpi_parts": 768, + "memory": [250, "GB"], + "kgo_checks": [], }) %} {% elif task_ns.conf_name == "oasis_C896_to_ukv" %} @@ -244,11 +244,11 @@ "dst_mesh": "ukv", "dst_name": "ukv", "dst_type": "regional", - "src_mesh": "C896_MG", + "src_mesh": "C896_MG", "src_name": "dynamics", "src_type": "global", - "mpi_parts": 768, - "kgo_checks": [], + "mpi_parts": 768, + "kgo_checks": [], }) %} {% elif task_ns.conf_name == "canned" %} diff --git a/rose-stem/site/meto/groups/groups_lfric2lfric.cylc b/rose-stem/site/meto/groups/groups_lfric2lfric.cylc index 09e99468c1..873ff90e41 100644 --- a/rose-stem/site/meto/groups/groups_lfric2lfric.cylc +++ b/rose-stem/site/meto/groups/groups_lfric2lfric.cylc @@ -63,8 +63,8 @@ ], "lfric2lfric_ex1a_weekly": [ "lfric2lfric_oasis_C224_to_Melbourne_ex1a_cce_fast-debug-64bit", - "lfric2lfric_oasis_C896_to_Melbourne_ex1a_cce_fast-debug-64bit", - "lfric2lfric_oasis_C896_to_ukv_ex1a_cce_fast-debug-64bit", + "lfric2lfric_oasis_C896_to_Melbourne_ex1a_cce_fast-debug-64bit", + "lfric2lfric_oasis_C896_to_ukv_ex1a_cce_fast-debug-64bit", ], "lfric2lfric_ex1a": [ "lfric2lfric_ex1a_developer", diff --git a/rose-stem/templates/default_directives.cylc b/rose-stem/templates/default_directives.cylc index a3a26ec5aa..d0c2a5b5f4 100644 --- a/rose-stem/templates/default_directives.cylc +++ b/rose-stem/templates/default_directives.cylc @@ -17,7 +17,7 @@ "tech-tests_memory": [6, "GB"], "tech-tests_wallclock": 20, "tech-tests_cpus": 1, - "gen_weights_tasks": 16, + "gen_weights_tasks": 12, "gen_weights_memory": [16, "GB"], } %} From 2e91da4753f15e41bfa3072f787eb81e61e6af6c Mon Sep 17 00:00:00 2001 From: Christine Johnson <74597224+cjohnson-pi@users.noreply.github.com> Date: Thu, 23 Jul 2026 17:34:21 +0100 Subject: [PATCH 09/18] rose config dump --- .../app/lfric2lfric/opt/rose-app-dst_melbourne.conf | 10 +++++----- rose-stem/app/lfric2lfric/opt/rose-app-dst_ukv.conf | 10 +++++----- .../app/lfric2lfric/opt/rose-app-src_C224_L70.conf | 8 ++++---- .../app/lfric2lfric/opt/rose-app-src_C896_L70.conf | 8 ++++---- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/rose-stem/app/lfric2lfric/opt/rose-app-dst_melbourne.conf b/rose-stem/app/lfric2lfric/opt/rose-app-dst_melbourne.conf index d4a93fe040..4b3e759b80 100644 --- a/rose-stem/app/lfric2lfric/opt/rose-app-dst_melbourne.conf +++ b/rose-stem/app/lfric2lfric/opt/rose-app-dst_melbourne.conf @@ -2,12 +2,12 @@ checkpoint_stem_name='restart_lfric2lfric_ral_seuk_MG' [namelist:lfric2lfric] -target_domain='LAM' -dst_ancil_directory='$BIG_DATA_DIR/ancils/proto-ral/Ticket255/Melbourne' -destination_meshfile_prefix='${MESH_DIR}/melbourne/mesh_melbourne' destination_mesh_name='melbourne' -dst_orography_mean_ancil_path='' +destination_meshfile_prefix='${MESH_DIR}/melbourne/mesh_melbourne' destination_topology='non_periodic' +dst_ancil_directory='$BIG_DATA_DIR/ancils/proto-ral/Ticket255/Melbourne' +dst_orography_mean_ancil_path='' +target_domain='LAM' [namelist:partitioning(destination)] -partitioner='planar' \ No newline at end of file +partitioner='planar' diff --git a/rose-stem/app/lfric2lfric/opt/rose-app-dst_ukv.conf b/rose-stem/app/lfric2lfric/opt/rose-app-dst_ukv.conf index dfd81462c4..6ab7ae90f4 100644 --- a/rose-stem/app/lfric2lfric/opt/rose-app-dst_ukv.conf +++ b/rose-stem/app/lfric2lfric/opt/rose-app-dst_ukv.conf @@ -2,12 +2,12 @@ checkpoint_stem_name='restart_lfric2lfric_ral_ukv_MG' [namelist:lfric2lfric] -target_domain='LAM' -dst_ancil_directory='' -destination_meshfile_prefix='${MESH_DIR}/ukv/mesh_ukv' destination_mesh_name='ukv' -dst_orography_mean_ancil_path='' +destination_meshfile_prefix='${MESH_DIR}/ukv/mesh_ukv' destination_topology='non_periodic' +dst_ancil_directory='' +dst_orography_mean_ancil_path='' +target_domain='LAM' [namelist:partitioning(destination)] -partitioner='planar' \ No newline at end of file +partitioner='planar' diff --git a/rose-stem/app/lfric2lfric/opt/rose-app-src_C224_L70.conf b/rose-stem/app/lfric2lfric/opt/rose-app-src_C224_L70.conf index f60125a3d0..841e265cc1 100644 --- a/rose-stem/app/lfric2lfric/opt/rose-app-src_C224_L70.conf +++ b/rose-stem/app/lfric2lfric/opt/rose-app-src_C224_L70.conf @@ -2,8 +2,8 @@ source=$ROSE_SUITE_DIR/app/lfric2lfric/file/iodef_orography.xml [file:source_data_C224.nc] -source="/data/users/christine.johnson/lfric_data/lfric2lfric/startdump_C224.nc" mode=symlink +source="/data/users/christine.johnson/lfric_data/lfric2lfric/startdump_C224.nc" [namelist:extrusion] domain_height=80000.0 @@ -21,10 +21,10 @@ source_meshfile_prefix='${MESH_DIR}/C224_MG/mesh_C224_MG' src_ancil_directory='$BIG_DATA_DIR/ancils/basic-gal/yak/C224' src_orography_mean_ancil_path='orography/gmted_ramp2/qrparm.orog.ugrid' +[namelist:orography] +orog_init_option='none' + [namelist:partitioning(source)] panel_decomposition='custom' panel_xproc=6 panel_yproc=6 - -[namelist:orography] -orog_init_option='none' \ No newline at end of file diff --git a/rose-stem/app/lfric2lfric/opt/rose-app-src_C896_L70.conf b/rose-stem/app/lfric2lfric/opt/rose-app-src_C896_L70.conf index ee368a3859..fe5f381a69 100644 --- a/rose-stem/app/lfric2lfric/opt/rose-app-src_C896_L70.conf +++ b/rose-stem/app/lfric2lfric/opt/rose-app-src_C896_L70.conf @@ -2,8 +2,8 @@ source=$ROSE_SUITE_DIR/app/lfric2lfric/file/iodef_diag_file.xml [file:source_data_C896.nc] -source="/data/users/christine.johnson/lfric_data/lfric2lfric/rho_theta_C896_t1.nc" mode=symlink +source="/data/users/christine.johnson/lfric_data/lfric2lfric/rho_theta_C896_t1.nc" [namelist:extrusion] domain_height=80000.0 @@ -21,10 +21,10 @@ source_meshfile_prefix='${MESH_DIR}/C896_MG/mesh_C896_MG' src_ancil_directory='' src_orography_mean_ancil_path='' +[namelist:orography] +orog_init_option='none' + [namelist:partitioning(source)] panel_decomposition='custom' panel_xproc=16 panel_yproc=8 - -[namelist:orography] -orog_init_option='none' \ No newline at end of file From ce114b486f9e9fb7021ca5769d39ef8b938b0495 Mon Sep 17 00:00:00 2001 From: Christine Johnson <74597224+cjohnson-pi@users.noreply.github.com> Date: Fri, 24 Jul 2026 09:26:04 +0100 Subject: [PATCH 10/18] tidy --- .../initialisation/lfric2lfric_init_mesh.f90 | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/applications/lfric2lfric/source/initialisation/lfric2lfric_init_mesh.f90 b/applications/lfric2lfric/source/initialisation/lfric2lfric_init_mesh.f90 index 7f520b2dbd..f3d2e03ae5 100644 --- a/applications/lfric2lfric/source/initialisation/lfric2lfric_init_mesh.f90 +++ b/applications/lfric2lfric/source/initialisation/lfric2lfric_init_mesh.f90 @@ -334,7 +334,7 @@ subroutine init_mesh( config, & ! Read in all global meshes from input file !=========================================================== if (mesh_file(dst) == mesh_file(src)) then - call load_global_mesh( mesh_file(dst), mesh_names ) + call load_global_mesh( mesh_file(dst), mesh_names ) ! Partition the global meshes !=========================================================== @@ -355,10 +355,10 @@ subroutine init_mesh( config, & else - !! SOURCE + ! SOURCE call load_global_mesh( mesh_file(src), mesh_names(src) ) - write( log_scratch_space, '(A)' ) & - 'Loaded src' + write( log_scratch_space, '(A)' ) & + 'Loaded source mesh' call log_event(log_scratch_space, log_level_debug) call create_local_mesh( mesh_names(src:src), & @@ -371,10 +371,10 @@ subroutine init_mesh( config, & call global_mesh_collection%clear() - !! DESTINATION + ! DESTINATION call load_global_mesh( mesh_file(dst), mesh_names(dst) ) - write( log_scratch_space, '(A)' ) & - 'Loaded dest' + write( log_scratch_space, '(A)' ) & + 'Loaded destination mesh' call log_event(log_scratch_space, log_level_debug) call create_local_mesh( mesh_names(dst:dst), & @@ -387,7 +387,6 @@ subroutine init_mesh( config, & call global_mesh_collection%clear() - endif ! Read in the global intergrid mesh mappings, From dfae217ad2336f4effe84a8da6b511b5a83923bd Mon Sep 17 00:00:00 2001 From: Christine Johnson <74597224+cjohnson-pi@users.noreply.github.com> Date: Fri, 24 Jul 2026 09:43:01 +0100 Subject: [PATCH 11/18] tidy --- .../app/lfric2lfric/file/iodef_diag_file.xml | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/rose-stem/app/lfric2lfric/file/iodef_diag_file.xml b/rose-stem/app/lfric2lfric/file/iodef_diag_file.xml index 28ccc8e19b..e292200d47 100644 --- a/rose-stem/app/lfric2lfric/file/iodef_diag_file.xml +++ b/rose-stem/app/lfric2lfric/file/iodef_diag_file.xml @@ -1,37 +1,35 @@ - + + - + - + - - - + + - + - + - - @@ -43,9 +41,8 @@ - - + From 19d0371c53c352dc6884c8edb72492d40839f37a Mon Sep 17 00:00:00 2001 From: Christine Johnson <74597224+cjohnson-pi@users.noreply.github.com> Date: Fri, 24 Jul 2026 09:51:10 +0100 Subject: [PATCH 12/18] Move output to share --- rose-stem/app/lfric2lfric/opt/rose-app-clim_gal9.conf | 1 - rose-stem/app/lfric2lfric/opt/rose-app-clim_gal9_ral_seuk.conf | 1 - rose-stem/app/lfric2lfric/opt/rose-app-dst_melbourne.conf | 3 --- rose-stem/app/lfric2lfric/opt/rose-app-dst_ukv.conf | 3 --- rose-stem/app/lfric2lfric/opt/rose-app-ral3.conf | 1 - rose-stem/templates/runtime/generate_runtime_application.cylc | 1 + 6 files changed, 1 insertion(+), 9 deletions(-) diff --git a/rose-stem/app/lfric2lfric/opt/rose-app-clim_gal9.conf b/rose-stem/app/lfric2lfric/opt/rose-app-clim_gal9.conf index 723f79bc39..9aa1e4d4e6 100644 --- a/rose-stem/app/lfric2lfric/opt/rose-app-clim_gal9.conf +++ b/rose-stem/app/lfric2lfric/opt/rose-app-clim_gal9.conf @@ -9,5 +9,4 @@ stretching_height=17507.0 stretching_method='smooth' [namelist:files] -checkpoint_stem_name='restart_lfric2lfric_clim_gal9_C12_MG' start_dump_filename='lfric2lfric_clim_gal9_C12_MG' diff --git a/rose-stem/app/lfric2lfric/opt/rose-app-clim_gal9_ral_seuk.conf b/rose-stem/app/lfric2lfric/opt/rose-app-clim_gal9_ral_seuk.conf index c9a2536321..aafac84b2e 100644 --- a/rose-stem/app/lfric2lfric/opt/rose-app-clim_gal9_ral_seuk.conf +++ b/rose-stem/app/lfric2lfric/opt/rose-app-clim_gal9_ral_seuk.conf @@ -9,7 +9,6 @@ stretching_height=17507.0 stretching_method='smooth' [namelist:files] -checkpoint_stem_name='restart_lfric2lfric_ral_seuk_MG' start_dump_filename='lfric2lfric_clim_gal9_C12_MG' [namelist:lfric2lfric] diff --git a/rose-stem/app/lfric2lfric/opt/rose-app-dst_melbourne.conf b/rose-stem/app/lfric2lfric/opt/rose-app-dst_melbourne.conf index 4b3e759b80..9e058ec329 100644 --- a/rose-stem/app/lfric2lfric/opt/rose-app-dst_melbourne.conf +++ b/rose-stem/app/lfric2lfric/opt/rose-app-dst_melbourne.conf @@ -1,6 +1,3 @@ -[namelist:files] -checkpoint_stem_name='restart_lfric2lfric_ral_seuk_MG' - [namelist:lfric2lfric] destination_mesh_name='melbourne' destination_meshfile_prefix='${MESH_DIR}/melbourne/mesh_melbourne' diff --git a/rose-stem/app/lfric2lfric/opt/rose-app-dst_ukv.conf b/rose-stem/app/lfric2lfric/opt/rose-app-dst_ukv.conf index 6ab7ae90f4..1a08a7de07 100644 --- a/rose-stem/app/lfric2lfric/opt/rose-app-dst_ukv.conf +++ b/rose-stem/app/lfric2lfric/opt/rose-app-dst_ukv.conf @@ -1,6 +1,3 @@ -[namelist:files] -checkpoint_stem_name='restart_lfric2lfric_ral_ukv_MG' - [namelist:lfric2lfric] destination_mesh_name='ukv' destination_meshfile_prefix='${MESH_DIR}/ukv/mesh_ukv' diff --git a/rose-stem/app/lfric2lfric/opt/rose-app-ral3.conf b/rose-stem/app/lfric2lfric/opt/rose-app-ral3.conf index 4235bafd08..6a2d1f9340 100644 --- a/rose-stem/app/lfric2lfric/opt/rose-app-ral3.conf +++ b/rose-stem/app/lfric2lfric/opt/rose-app-ral3.conf @@ -12,7 +12,6 @@ stretching_height=16641.984 stretching_method='smooth' [namelist:files] -checkpoint_stem_name='restart_lfric2lfric_ral3_seuk' !!lbc_directory='$BIG_DATA_DIR/lbcs/proto-ral/Ticket3510/seuk' !!lbc_filename='checkpoint_um2lfric_000001_fixedtime_date' start_dump_filename='lfric2lfric_ral3_seuk' diff --git a/rose-stem/templates/runtime/generate_runtime_application.cylc b/rose-stem/templates/runtime/generate_runtime_application.cylc index c101fed93b..25fed9ea9f 100644 --- a/rose-stem/templates/runtime/generate_runtime_application.cylc +++ b/rose-stem/templates/runtime/generate_runtime_application.cylc @@ -83,6 +83,7 @@ task_values["app_name"]~'-checksums.txt $TASK_OUTPUT_DIR/checksum.txt', 'touch $CYLC_TASK_WORK_DIR/tmp.m', 'mv $CYLC_TASK_WORK_DIR/*.m $TASK_OUTPUT_DIR/results', + 'mv $CYLC_TASK_WORK_DIR/restart_lfric2lfric*.nc $TASK_OUTPUT_DIR/results' 'test -f $CYLC_TASK_WORK_DIR/timer.txt && '~ 'cp $CYLC_TASK_WORK_DIR/timer.txt $TASK_OUTPUT_DIR || true' ] %} From 80fc84e402bb378df143a56bfe53277fb8d3a1f4 Mon Sep 17 00:00:00 2001 From: Christine Johnson <74597224+cjohnson-pi@users.noreply.github.com> Date: Fri, 24 Jul 2026 10:34:26 +0100 Subject: [PATCH 13/18] correction --- rose-stem/templates/runtime/generate_runtime_application.cylc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rose-stem/templates/runtime/generate_runtime_application.cylc b/rose-stem/templates/runtime/generate_runtime_application.cylc index 25fed9ea9f..25ab41e730 100644 --- a/rose-stem/templates/runtime/generate_runtime_application.cylc +++ b/rose-stem/templates/runtime/generate_runtime_application.cylc @@ -83,7 +83,7 @@ task_values["app_name"]~'-checksums.txt $TASK_OUTPUT_DIR/checksum.txt', 'touch $CYLC_TASK_WORK_DIR/tmp.m', 'mv $CYLC_TASK_WORK_DIR/*.m $TASK_OUTPUT_DIR/results', - 'mv $CYLC_TASK_WORK_DIR/restart_lfric2lfric*.nc $TASK_OUTPUT_DIR/results' + 'mv $CYLC_TASK_WORK_DIR/lfric_checkpoint_write.nc $TASK_OUTPUT_DIR/results' 'test -f $CYLC_TASK_WORK_DIR/timer.txt && '~ 'cp $CYLC_TASK_WORK_DIR/timer.txt $TASK_OUTPUT_DIR || true' ] %} From d53ed8ea6b395040d9a21fd06af8e23ebe67cd08 Mon Sep 17 00:00:00 2001 From: Christine Johnson <74597224+cjohnson-pi@users.noreply.github.com> Date: Fri, 24 Jul 2026 10:45:28 +0100 Subject: [PATCH 14/18] correction --- rose-stem/app/lfric2lfric/opt/rose-app-clim_gal9_ral_seuk.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/rose-stem/app/lfric2lfric/opt/rose-app-clim_gal9_ral_seuk.conf b/rose-stem/app/lfric2lfric/opt/rose-app-clim_gal9_ral_seuk.conf index aafac84b2e..c9a2536321 100644 --- a/rose-stem/app/lfric2lfric/opt/rose-app-clim_gal9_ral_seuk.conf +++ b/rose-stem/app/lfric2lfric/opt/rose-app-clim_gal9_ral_seuk.conf @@ -9,6 +9,7 @@ stretching_height=17507.0 stretching_method='smooth' [namelist:files] +checkpoint_stem_name='restart_lfric2lfric_ral_seuk_MG' start_dump_filename='lfric2lfric_clim_gal9_C12_MG' [namelist:lfric2lfric] From c7dd68dc0671e8d134f695e543b9c1e01cc6d31a Mon Sep 17 00:00:00 2001 From: Christine Johnson <74597224+cjohnson-pi@users.noreply.github.com> Date: Fri, 24 Jul 2026 11:29:27 +0100 Subject: [PATCH 15/18] missing comma --- rose-stem/templates/runtime/generate_runtime_application.cylc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rose-stem/templates/runtime/generate_runtime_application.cylc b/rose-stem/templates/runtime/generate_runtime_application.cylc index 25ab41e730..306efdc173 100644 --- a/rose-stem/templates/runtime/generate_runtime_application.cylc +++ b/rose-stem/templates/runtime/generate_runtime_application.cylc @@ -83,7 +83,7 @@ task_values["app_name"]~'-checksums.txt $TASK_OUTPUT_DIR/checksum.txt', 'touch $CYLC_TASK_WORK_DIR/tmp.m', 'mv $CYLC_TASK_WORK_DIR/*.m $TASK_OUTPUT_DIR/results', - 'mv $CYLC_TASK_WORK_DIR/lfric_checkpoint_write.nc $TASK_OUTPUT_DIR/results' + 'mv $CYLC_TASK_WORK_DIR/lfric_checkpoint_write.nc $TASK_OUTPUT_DIR/results', 'test -f $CYLC_TASK_WORK_DIR/timer.txt && '~ 'cp $CYLC_TASK_WORK_DIR/timer.txt $TASK_OUTPUT_DIR || true' ] %} From d2be4dc745f0083a73ec99f9d80b6b58596a3caf Mon Sep 17 00:00:00 2001 From: Christine Johnson <74597224+cjohnson-pi@users.noreply.github.com> Date: Fri, 24 Jul 2026 12:08:53 +0100 Subject: [PATCH 16/18] test before mv --- rose-stem/templates/runtime/generate_runtime_application.cylc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rose-stem/templates/runtime/generate_runtime_application.cylc b/rose-stem/templates/runtime/generate_runtime_application.cylc index 306efdc173..330c787446 100644 --- a/rose-stem/templates/runtime/generate_runtime_application.cylc +++ b/rose-stem/templates/runtime/generate_runtime_application.cylc @@ -83,7 +83,8 @@ task_values["app_name"]~'-checksums.txt $TASK_OUTPUT_DIR/checksum.txt', 'touch $CYLC_TASK_WORK_DIR/tmp.m', 'mv $CYLC_TASK_WORK_DIR/*.m $TASK_OUTPUT_DIR/results', - 'mv $CYLC_TASK_WORK_DIR/lfric_checkpoint_write.nc $TASK_OUTPUT_DIR/results', + 'test -f $CYLC_TASK_WORK_DIR/lfric_checkpoint_write.nc && '~ + 'mv $CYLC_TASK_WORK_DIR/lfric_checkpoint_write.nc $TASK_OUTPUT_DIR/results || true', 'test -f $CYLC_TASK_WORK_DIR/timer.txt && '~ 'cp $CYLC_TASK_WORK_DIR/timer.txt $TASK_OUTPUT_DIR || true' ] %} From 8eb3214f773b95f4123c9cb660d0ebd18cbbdece Mon Sep 17 00:00:00 2001 From: Christine Johnson <74597224+cjohnson-pi@users.noreply.github.com> Date: Tue, 28 Jul 2026 09:11:00 +0100 Subject: [PATCH 17/18] Response to science review --- .../initialisation/lfric2lfric_init_mesh.f90 | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/applications/lfric2lfric/source/initialisation/lfric2lfric_init_mesh.f90 b/applications/lfric2lfric/source/initialisation/lfric2lfric_init_mesh.f90 index f3d2e03ae5..f8a232152c 100644 --- a/applications/lfric2lfric/source/initialisation/lfric2lfric_init_mesh.f90 +++ b/applications/lfric2lfric/source/initialisation/lfric2lfric_init_mesh.f90 @@ -353,6 +353,15 @@ subroutine init_mesh( config, & partitioner_src, & enforce_constraints = .false. ) + ! Create the associated local mesh maps + !=========================================================== + if (regrid_method == regrid_method_map) then + call create_local_mesh_maps( mesh_file(dst) ) + end if + + ! Clear the + call global_mesh_collection%clear() + else ! SOURCE @@ -387,15 +396,8 @@ subroutine init_mesh( config, & call global_mesh_collection%clear() - endif - - ! Read in the global intergrid mesh mappings, - ! then create the associated local mesh maps - !=========================================================== - if (regrid_method == regrid_method_map) then - call create_local_mesh_maps( mesh_file(dst) ) end if - + end if ! prepartitioned !============================================================================ From da89ca54f427f800a7636856c9ee6b0abbf6158e Mon Sep 17 00:00:00 2001 From: Christine Johnson <74597224+cjohnson-pi@users.noreply.github.com> Date: Tue, 28 Jul 2026 10:39:07 +0100 Subject: [PATCH 18/18] whitespace --- .../source/initialisation/lfric2lfric_init_mesh.f90 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/applications/lfric2lfric/source/initialisation/lfric2lfric_init_mesh.f90 b/applications/lfric2lfric/source/initialisation/lfric2lfric_init_mesh.f90 index f8a232152c..2d417fa803 100644 --- a/applications/lfric2lfric/source/initialisation/lfric2lfric_init_mesh.f90 +++ b/applications/lfric2lfric/source/initialisation/lfric2lfric_init_mesh.f90 @@ -359,9 +359,9 @@ subroutine init_mesh( config, & call create_local_mesh_maps( mesh_file(dst) ) end if - ! Clear the + ! Clear the call global_mesh_collection%clear() - + else ! SOURCE @@ -397,7 +397,7 @@ subroutine init_mesh( config, & call global_mesh_collection%clear() end if - + end if ! prepartitioned !============================================================================