From a6a7fbdf6a077e97c63bf0d4bee1dd87abf858a0 Mon Sep 17 00:00:00 2001 From: "ukmo-juan.castillo" Date: Wed, 28 Jan 2026 20:04:41 +0000 Subject: [PATCH 1/6] Proposed changes: change type of duplicated namelist, add test with multiple CPUs, and update KGOs --- .../lfric-lfric2lfric/HEAD/rose-meta.conf | 3 +- .../common/lfric2lfric/tasks_lfric2lfric.cylc | 3 + ...9-C24_C12_azspice_gnu_fast-debug-64bit.txt | 6 +- ...9-C24_C12_azspice_gnu_fast-debug-64bit.txt | 6 +- ...32_lam_MG_azspice_gnu_fast-debug-64bit.txt | 130 +++++++++--------- ...gal9-C24_C12_ex1a_cce_fast-debug-64bit.txt | 6 +- ...gal9-C24_C12_ex1a_cce_fast-debug-64bit.txt | 2 +- ...k-C32_lam_MG_ex1a_cce_fast-debug-64bit.txt | 108 +++++++-------- 8 files changed, 134 insertions(+), 130 deletions(-) diff --git a/applications/lfric2lfric/rose-meta/lfric-lfric2lfric/HEAD/rose-meta.conf b/applications/lfric2lfric/rose-meta/lfric-lfric2lfric/HEAD/rose-meta.conf index 9b114f74..67a199c3 100644 --- a/applications/lfric2lfric/rose-meta/lfric-lfric2lfric/HEAD/rose-meta.conf +++ b/applications/lfric2lfric/rose-meta/lfric-lfric2lfric/HEAD/rose-meta.conf @@ -239,10 +239,11 @@ duplicate=true [namelist:partitioning=mesh_type] compulsory=true description=The purpose of the mesh -!enumeration=true help=The mesh can be used to perform a LFRic forecast (Dynamics), =or to describe the source and the destination grids in =the lfric2lfric regridding program. ns=namelist/lfric2lfric/configuration +!string_length=default +type=character value-titles=Dynamics, Source, Destination values='dynamics', 'source', 'destination' diff --git a/rose-stem/site/common/lfric2lfric/tasks_lfric2lfric.cylc b/rose-stem/site/common/lfric2lfric/tasks_lfric2lfric.cylc index 26e8a9af..53f69305 100644 --- a/rose-stem/site/common/lfric2lfric/tasks_lfric2lfric.cylc +++ b/rose-stem/site/common/lfric2lfric/tasks_lfric2lfric.cylc @@ -16,6 +16,7 @@ "src_mesh": "", "src_name": "", "src_type": "", + "mpi_parts": 4, }) %} {% elif task_ns.conf_name == "oasis_ral_seuk-C32_lam_MG" %} @@ -81,6 +82,7 @@ "src_mesh": "", "src_name": "", "src_type": "", + "mpi_parts": 6, }) %} {% elif task_ns.conf_name == "oasis_clim_gal9-C24_C12" %} @@ -94,6 +96,7 @@ "src_mesh": "C24_C12", "src_name": "C12", "src_type": "global", + "mpi_parts": 6, }) %} {% elif task_ns.conf_name == "oasis_clim_gal9_C12-ral_seuk_C16_lam" %} diff --git a/rose-stem/site/meto/kgos/lfric2lfric/azspice/checksum_lfric2lfric_clim_gal9-C24_C12_azspice_gnu_fast-debug-64bit.txt b/rose-stem/site/meto/kgos/lfric2lfric/azspice/checksum_lfric2lfric_clim_gal9-C24_C12_azspice_gnu_fast-debug-64bit.txt index 22bdf8cb..bc5fc695 100644 --- a/rose-stem/site/meto/kgos/lfric2lfric/azspice/checksum_lfric2lfric_clim_gal9-C24_C12_azspice_gnu_fast-debug-64bit.txt +++ b/rose-stem/site/meto/kgos/lfric2lfric/azspice/checksum_lfric2lfric_clim_gal9-C24_C12_azspice_gnu_fast-debug-64bit.txt @@ -1,3 +1,3 @@ -Inner product checksum zh = 41EC942AC03AF332 -Inner product checksum rho = 40FA7F5C1F732D71 -Inner product checksum theta = 4252B9378905BFA5 +Inner product checksum zh = 41EC942AC03AF31C +Inner product checksum rho = 40FA7F5C1F732DD0 +Inner product checksum theta = 4252B9378905BF6B diff --git a/rose-stem/site/meto/kgos/lfric2lfric/azspice/checksum_lfric2lfric_oasis_clim_gal9-C24_C12_azspice_gnu_fast-debug-64bit.txt b/rose-stem/site/meto/kgos/lfric2lfric/azspice/checksum_lfric2lfric_oasis_clim_gal9-C24_C12_azspice_gnu_fast-debug-64bit.txt index 84186c33..3e569013 100644 --- a/rose-stem/site/meto/kgos/lfric2lfric/azspice/checksum_lfric2lfric_oasis_clim_gal9-C24_C12_azspice_gnu_fast-debug-64bit.txt +++ b/rose-stem/site/meto/kgos/lfric2lfric/azspice/checksum_lfric2lfric_oasis_clim_gal9-C24_C12_azspice_gnu_fast-debug-64bit.txt @@ -1,3 +1,3 @@ -Inner product checksum zh = 41ECDF73332019EF -Inner product checksum rho = 40FAC5EEBDF23EBB -Inner product checksum theta = 4252EB3465F61645 +Inner product checksum zh = 41ECDF7333201A1E +Inner product checksum rho = 40FAC5EEBDF2402D +Inner product checksum theta = 4252EB3465F61725 diff --git a/rose-stem/site/meto/kgos/lfric2lfric/azspice/checksum_lfric2lfric_ral_seuk-C32_lam_MG_azspice_gnu_fast-debug-64bit.txt b/rose-stem/site/meto/kgos/lfric2lfric/azspice/checksum_lfric2lfric_ral_seuk-C32_lam_MG_azspice_gnu_fast-debug-64bit.txt index 507c327b..ef3e1eed 100644 --- a/rose-stem/site/meto/kgos/lfric2lfric/azspice/checksum_lfric2lfric_ral_seuk-C32_lam_MG_azspice_gnu_fast-debug-64bit.txt +++ b/rose-stem/site/meto/kgos/lfric2lfric/azspice/checksum_lfric2lfric_ral_seuk-C32_lam_MG_azspice_gnu_fast-debug-64bit.txt @@ -1,118 +1,118 @@ Inner product checksum conv_prog_dtheta = 0 Inner product checksum snow_soot = 0 -Inner product checksum unfrozen_soil_moisture = 40A0563B1151C132 -Inner product checksum sea_ice_temperature = 444C5AFF93A5F16B +Inner product checksum unfrozen_soil_moisture = 40A0383F38C169AB +Inner product checksum sea_ice_temperature = 444C5AFF93A5F15E Inner product checksum m_g = 0 Inner product checksum lbc_m_g = 0 -Inner product checksum m_ci = 3E1390C1077A3A5D +Inner product checksum m_ci = 3E1390C1077A3A53 Inner product checksum lbc_m_ci = 0 -Inner product checksum frozen_fraction = 4075B1ADEE0C6525 -Inner product checksum lw_up_toa_rts = 419098FDC526486B -Inner product checksum m_cl = 3EAAB54FD22D59C6 +Inner product checksum frozen_fraction = 407228D6CCCD0FB5 +Inner product checksum lw_up_toa_rts = 419098FDC526486A +Inner product checksum m_cl = 3EAAB54FD22D59AF Inner product checksum lbc_m_cl = 0 Inner product checksum conv_prog_precip = 0 -Inner product checksum tile_snow_mass = 443A39E7BCFDE106 -Inner product checksum n_snow_layers = 443A39FEDBD17564 +Inner product checksum tile_snow_mass = 443797EF91BF6053 +Inner product checksum n_snow_layers = 443797FF89834EBB Inner product checksum horizon_aspect = 0 Inner product checksum soil_moist_sat = 7FF0000000000000 -Inner product checksum lw_up_toa_rtsi = 416FAC7209B088EF +Inner product checksum lw_up_toa_rtsi = 416FAC7209B088E9 Inner product checksum acc_sol_bc = 0 -Inner product checksum lw_up_tile_rts = 41C28987BDD836EC +Inner product checksum lw_up_tile_rts = 41C24DA76F40DADD Inner product checksum u = 0 Inner product checksum lbc_u = 0 Inner product checksum ccw = 0 -Inner product checksum tile_canopy_water = 443A39FEDBCA7733 +Inner product checksum tile_canopy_water = 443797FF897912D3 Inner product checksum sw_up_toa_rts = 0 -Inner product checksum m_r = 3E73F28B7E39E169 +Inner product checksum m_r = 3E73F28B7E39E166 Inner product checksum lbc_m_r = 0 Inner product checksum lit_fraction_rts = 0 -Inner product checksum tile_snow_rgrain = 443A39FEA5A417EB +Inner product checksum tile_snow_rgrain = 443797FF4DD10105 Inner product checksum m_s = 0 Inner product checksum lbc_m_s = 0 Inner product checksum soil_moist_crit = 7FF0000000000000 -Inner product checksum lw_heating_rate_rts = 3F12F4B0E3E638E7 -Inner product checksum lw_up_tile_rtsi = 41920E8314D3E49D -Inner product checksum m_v = 3FF28510ABFC385A +Inner product checksum lw_heating_rate_rts = 3F10D84EBF75D093 +Inner product checksum lw_up_tile_rtsi = 4191D206AA086831 +Inner product checksum m_v = 3FF28510ABFC3818 Inner product checksum lbc_m_v = 0 Inner product checksum sw_up_toa_rtsi = 0 -Inner product checksum snow_layer_ice_mass = 444C09F336217838 -Inner product checksum soil_moisture = 41C1A92CF9A23675 -Inner product checksum tile_temperature = 443A39FDB80E4E3A +Inner product checksum snow_layer_ice_mass = 4457AF7A5064FFE9 +Inner product checksum soil_moisture = 41C03D84A3614BDF +Inner product checksum tile_temperature = 443797FE52509E26 Inner product checksum sw_up_tile_rts = 0 Inner product checksum sw_direct_toa_rts = 0 -Inner product checksum snow_layer_temp = 444C09FD29EB28A8 -Inner product checksum soil_roughness = 3F50C6F7617A915F -Inner product checksum zh = 4198376093F116FA -Inner product checksum lw_heating_rate_rtsi = 42B6DAF07B26C6DA -Inner product checksum a_sat_frac = 4067EF6A9F0CFE61 +Inner product checksum snow_layer_temp = 4457AF7EDF6C8650 +Inner product checksum soil_roughness = 3F50C6F7617A9156 +Inner product checksum zh = 4198376093F116FC +Inner product checksum lw_heating_rate_rtsi = 42B6DAF2287EBDE0 +Inner product checksum a_sat_frac = 4067EF6A9F0CFE57 Inner product checksum sw_heating_rate_rts = 0 Inner product checksum sw_up_tile_rtsi = 0 Inner product checksum sw_direct_toa_rtsi = 0 -Inner product checksum rho = 40E727EC608D56C5 +Inner product checksum rho = 40E727EC608D56C8 Inner product checksum lbc_rho = 0 Inner product checksum n_acc_sol = 0 -Inner product checksum snow_layer_rgrain = 444C09FEC81C14C8 -Inner product checksum c_sat_frac = 407D62B17B477F5E +Inner product checksum snow_layer_rgrain = 4457AF7F6D3CE748 +Inner product checksum c_sat_frac = 407D62B17B477F5B Inner product checksum ageofair = 0 Inner product checksum boundary_u_driving = 0 Inner product checksum soil_suction_sat = 7FF0000000000000 -Inner product checksum silhouette_area_orog = 3F906E761C4C51A4 +Inner product checksum silhouette_area_orog = 3F906E761C4C51A8 Inner product checksum cos_zenith_angle_rts = 0 -Inner product checksum soil_temperature = 443123FFA7593792 -Inner product checksum screen_temperature = 4473C37F9D4BBA74 -Inner product checksum peak_to_trough_orog = 41026B6BF51EF8AF -Inner product checksum sw_heating_rate_rtsi = 42B6DD2C806D9054 -Inner product checksum snowpack_density = 443A39FE2207A9BF +Inner product checksum soil_temperature = 443011FFA46F5114 +Inner product checksum screen_temperature = 447379DF8B8D3789 +Inner product checksum peak_to_trough_orog = 41026B6BF51EF8A9 +Inner product checksum sw_heating_rate_rtsi = 42B6DD2E2CF7DB84 +Inner product checksum snowpack_density = 443797FEC9D88253 Inner product checksum soil_moist_wilt = 7FF0000000000000 Inner product checksum theta = 42069729B9240A4A Inner product checksum lbc_theta = 0 -Inner product checksum lw_up_surf_rts = 41A127FBF79616B0 -Inner product checksum a_wet_frac = 40527B54E34DA3F2 +Inner product checksum lw_up_surf_rts = 41A127FBF79616AC +Inner product checksum a_wet_frac = 40527B54E34DA3F6 Inner product checksum acc_sol_du = 0 Inner product checksum stellar_irradiance_rts = 0 -Inner product checksum snow_under_canopy = 443A39FEDBD17564 -Inner product checksum c_wet_frac = 4077780FAB02BC5C +Inner product checksum snow_under_canopy = 443797FF89834EBB +Inner product checksum c_wet_frac = 4077780FAB02BC5D Inner product checksum ait_sol_bc = 0 Inner product checksum acc_sol_om = 0 -Inner product checksum lw_up_surf_rtsi = 4170CB64FE0AC151 +Inner product checksum lw_up_surf_rtsi = 4170CB64FE0AC159 Inner product checksum sw_up_surf_rts = 0 Inner product checksum sw_up_blue_tile_rts = 0 Inner product checksum leaf_area_index = 7FF0000000000000 -Inner product checksum snow_layer_liq_mass = 444C09FF3D043062 +Inner product checksum snow_layer_liq_mass = 4457AF7F967C45D5 Inner product checksum cor_sol_bc = 0 -Inner product checksum lw_down_surf_rts = 41961C6F10E9A433 -Inner product checksum exner = 40E77B745607A805 +Inner product checksum lw_down_surf_rts = 41961C6F10E9A439 +Inner product checksum exner = 40E77B745607A7B7 Inner product checksum lbc_exner = 0 Inner product checksum sw_up_surf_rtsi = 0 Inner product checksum sw_direct_surf_rts = 0 Inner product checksum sw_up_blue_tile_rtsi = 0 -Inner product checksum wvar = 40A91F95234DEC6D -Inner product checksum wetness_under_soil = 441857FFA492342A +Inner product checksum wvar = 40A8626BBEA4B4AE +Inner product checksum wetness_under_soil = 441857FFA492342B Inner product checksum acc_sol_ss = 0 -Inner product checksum sd_orog = 40CA0AA0BF28D234 +Inner product checksum sd_orog = 40CA0AA0BF28D23A Inner product checksum soil_albedo = 7FF0000000000000 -Inner product checksum time_since_transition = 4414FBFE7610B6F3 -Inner product checksum lw_down_surf_rtsi = 413A3B9C45CC7F6A +Inner product checksum time_since_transition = 4414FBFE7610B74B +Inner product checksum lw_down_surf_rtsi = 413A3B9C45CC7F76 Inner product checksum acc_sol_su = 0 Inner product checksum n_ait_sol = 0 Inner product checksum sw_down_surf_rts = 0 -Inner product checksum stellar_eqn_of_time_rts = 3FEA0E536CB43C50 +Inner product checksum stellar_eqn_of_time_rts = 3FEA0E536CB43C44 Inner product checksum sw_direct_surf_rtsi = 0 -Inner product checksum chloro_sea = 3E1759841C224B59 -Inner product checksum ozone = 3E9FEE5EFBFB39C4 +Inner product checksum chloro_sea = 3E1759841C224B62 +Inner product checksum ozone = 3E9A81A83D26518A Inner product checksum clapp_horn_b = 7FF0000000000000 Inner product checksum sw_down_surf_rtsi = 0 Inner product checksum n_cor_sol = 0 -Inner product checksum area_fraction = 4077A40F41638617 -Inner product checksum snow_layer_thickness = 444C09FF3D043062 +Inner product checksum area_fraction = 4073D10E643252E3 +Inner product checksum snow_layer_thickness = 4457AF7F967C45D5 Inner product checksum conv_rain = 0 Inner product checksum slope_angle = 0 Inner product checksum ait_sol_om = 0 -Inner product checksum water_table = 441857FFA4668697 +Inner product checksum water_table = 441857FFA4668695 Inner product checksum cor_sol_du = 0 Inner product checksum sw_direct_blue_surf_rts = 0 Inner product checksum cor_sol_om = 0 -Inner product checksum soil_sat_frac = 441857FFA4A2EB11 +Inner product checksum soil_sat_frac = 441857FFA4A2EB10 Inner product checksum sw_down_blue_surf_rts = 0 Inner product checksum sw_direct_blue_surf_rtsi = 0 Inner product checksum ait_sol_su = 0 @@ -121,28 +121,28 @@ Inner product checksum soil_cond_sat = 7FF0000000000000 Inner product checksum frozen_soil_moisture = 0 Inner product checksum cor_sol_ss = 0 Inner product checksum canopy_height = 7FF0000000000000 -Inner product checksum bulk_fraction = 4077A40F41638617 -Inner product checksum tile_fraction = 4078582D6A7AB05C +Inner product checksum bulk_fraction = 4073D10E643252E3 +Inner product checksum tile_fraction = 40789FE2C6F635E7 Inner product checksum cor_sol_su = 0 Inner product checksum sea_ice_thickness = 7FF0000000000000 -Inner product checksum sin_stellar_declination_rts = 405A7A1D5CCC09B4 +Inner product checksum sin_stellar_declination_rts = 405A7A1D5CCC09BA Inner product checksum slope_aspect = 0 -Inner product checksum grad_xx_orog = 3E845FF5EBED903B -Inner product checksum snow_depth = 443A39FEDBD17564 +Inner product checksum grad_xx_orog = 3E845FF5EBED9040 +Inner product checksum snow_depth = 443797FF89834EBB Inner product checksum boundary_u_diff = 0 -Inner product checksum grad_xy_orog = 3E46A45807A5777B -Inner product checksum grad_yy_orog = 3E72843F6D98C78C -Inner product checksum orographic_correction_rts = 408FFFFF87650F88 +Inner product checksum grad_xy_orog = 3E46A45807A57776 +Inner product checksum grad_yy_orog = 3E72843F6D98C78F +Inner product checksum orographic_correction_rts = 408FFFFF87650F87 Inner product checksum skyview = 0 Inner product checksum soil_thermal_cap = 7FF0000000000000 Inner product checksum conv_snow = 0 Inner product checksum horizon_angle = 0 -Inner product checksum z0msea = 4065692F5E6E9F1B +Inner product checksum z0msea = 4065692F5E6E9F24 Inner product checksum cca = 0 Inner product checksum conv_prog_dmv = 0 -Inner product checksum tile_lw_grey_albedo = 40294F555DBD37CF +Inner product checksum tile_lw_grey_albedo = 40296D99BE3307E6 Inner product checksum mean_topog_index = 7FF0000000000000 -Inner product checksum liquid_fraction = 403E673D3DD0D399 +Inner product checksum liquid_fraction = 4039C851CB10ED70 Inner product checksum dd_mf_cb = 0 Inner product checksum soil_thermal_cond = 7FF0000000000000 -Inner product checksum surface_conductance = 441857FFA4A50B33 +Inner product checksum surface_conductance = 441857FFA4A50B32 diff --git a/rose-stem/site/meto/kgos/lfric2lfric/ex1a/checksum_lfric2lfric_clim_gal9-C24_C12_ex1a_cce_fast-debug-64bit.txt b/rose-stem/site/meto/kgos/lfric2lfric/ex1a/checksum_lfric2lfric_clim_gal9-C24_C12_ex1a_cce_fast-debug-64bit.txt index 6b13b5cd..4603f2f4 100644 --- a/rose-stem/site/meto/kgos/lfric2lfric/ex1a/checksum_lfric2lfric_clim_gal9-C24_C12_ex1a_cce_fast-debug-64bit.txt +++ b/rose-stem/site/meto/kgos/lfric2lfric/ex1a/checksum_lfric2lfric_clim_gal9-C24_C12_ex1a_cce_fast-debug-64bit.txt @@ -1,3 +1,3 @@ -Inner product checksum zh = 41EC942AC03A5271 -Inner product checksum rho = 40FA7F5C1F732DAC -Inner product checksum theta = 4252B937890592AE +Inner product checksum zh = 41EC942AC03A5274 +Inner product checksum rho = 40FA7F5C1F732DE9 +Inner product checksum theta = 4252B937890592A2 diff --git a/rose-stem/site/meto/kgos/lfric2lfric/ex1a/checksum_lfric2lfric_oasis_clim_gal9-C24_C12_ex1a_cce_fast-debug-64bit.txt b/rose-stem/site/meto/kgos/lfric2lfric/ex1a/checksum_lfric2lfric_oasis_clim_gal9-C24_C12_ex1a_cce_fast-debug-64bit.txt index eb1d7b4d..8b892c6a 100644 --- a/rose-stem/site/meto/kgos/lfric2lfric/ex1a/checksum_lfric2lfric_oasis_clim_gal9-C24_C12_ex1a_cce_fast-debug-64bit.txt +++ b/rose-stem/site/meto/kgos/lfric2lfric/ex1a/checksum_lfric2lfric_oasis_clim_gal9-C24_C12_ex1a_cce_fast-debug-64bit.txt @@ -1,3 +1,3 @@ Inner product checksum zh = 41ECDF7333201A20 -Inner product checksum rho = 40FAC5EEBDF24024 +Inner product checksum rho = 40FAC5EEBDF24045 Inner product checksum theta = 4252EB3465F61708 diff --git a/rose-stem/site/meto/kgos/lfric2lfric/ex1a/checksum_lfric2lfric_ral_seuk-C32_lam_MG_ex1a_cce_fast-debug-64bit.txt b/rose-stem/site/meto/kgos/lfric2lfric/ex1a/checksum_lfric2lfric_ral_seuk-C32_lam_MG_ex1a_cce_fast-debug-64bit.txt index 50727a24..65df0c04 100644 --- a/rose-stem/site/meto/kgos/lfric2lfric/ex1a/checksum_lfric2lfric_ral_seuk-C32_lam_MG_ex1a_cce_fast-debug-64bit.txt +++ b/rose-stem/site/meto/kgos/lfric2lfric/ex1a/checksum_lfric2lfric_ral_seuk-C32_lam_MG_ex1a_cce_fast-debug-64bit.txt @@ -1,76 +1,76 @@ Inner product checksum conv_prog_dtheta = 0 Inner product checksum snow_soot = 0 -Inner product checksum unfrozen_soil_moisture = 40A0563B1151D680 -Inner product checksum sea_ice_temperature = 444C5AFF93A5FBCB +Inner product checksum unfrozen_soil_moisture = 40A0383F38C183B1 +Inner product checksum sea_ice_temperature = 444C5AFF93A5FBCC Inner product checksum m_g = 0 Inner product checksum lbc_m_g = 0 -Inner product checksum m_ci = 3E1390C107783E97 +Inner product checksum m_ci = 3E1390C107783E9C Inner product checksum lbc_m_ci = 0 -Inner product checksum frozen_fraction = 4075B1ADEE08E93E -Inner product checksum lw_up_toa_rts = 419098FDC526346A -Inner product checksum m_cl = 3EAAB54FD22B53D6 +Inner product checksum frozen_fraction = 407228D6CCC978D2 +Inner product checksum lw_up_toa_rts = 419098FDC5263469 +Inner product checksum m_cl = 3EAAB54FD22B53DA Inner product checksum lbc_m_cl = 0 Inner product checksum conv_prog_precip = 0 -Inner product checksum tile_snow_mass = 443A39E7BCFF30A6 -Inner product checksum n_snow_layers = 443A39FEDBD2C590 +Inner product checksum tile_snow_mass = 443797EF91BFA102 +Inner product checksum n_snow_layers = 443797FF89838F6B Inner product checksum horizon_aspect = 0 Inner product checksum soil_moist_sat = 7FF0000000000000 -Inner product checksum lw_up_toa_rtsi = 416FAC7209B05CCB +Inner product checksum lw_up_toa_rtsi = 416FAC7209B05CCE Inner product checksum acc_sol_bc = 0 -Inner product checksum lw_up_tile_rts = 41C28987BDD7C02E +Inner product checksum lw_up_tile_rts = 41C24DA76F403998 Inner product checksum u = 0 Inner product checksum lbc_u = 0 Inner product checksum ccw = 0 -Inner product checksum tile_canopy_water = 443A39FEDBCBC772 +Inner product checksum tile_canopy_water = 443797FF89795389 Inner product checksum sw_up_toa_rts = 0 -Inner product checksum m_r = 3E73F28B7E39F544 +Inner product checksum m_r = 3E73F28B7E39F549 Inner product checksum lbc_m_r = 0 Inner product checksum lit_fraction_rts = 0 -Inner product checksum tile_snow_rgrain = 443A39FEA5A56860 +Inner product checksum tile_snow_rgrain = 443797FF4DD141FB Inner product checksum m_s = 0 Inner product checksum lbc_m_s = 0 Inner product checksum soil_moist_crit = 7FF0000000000000 -Inner product checksum lw_heating_rate_rts = 3F12F4B0E3E54AF4 -Inner product checksum lw_up_tile_rtsi = 41920E8314D36D54 -Inner product checksum m_v = 3FF28510ABFC21DB +Inner product checksum lw_heating_rate_rts = 3F10D84EBF7529D8 +Inner product checksum lw_up_tile_rtsi = 4191D206AA07C7E2 +Inner product checksum m_v = 3FF28510ABFC21E9 Inner product checksum lbc_m_v = 0 Inner product checksum sw_up_toa_rtsi = 0 -Inner product checksum snow_layer_ice_mass = 444C09F336221CD2 -Inner product checksum soil_moisture = 41C1A92CF9A225CC -Inner product checksum tile_temperature = 443A39FDB80FA3EF +Inner product checksum snow_layer_ice_mass = 4457AF7A50638B21 +Inner product checksum soil_moisture = 41C03D84A36191FA +Inner product checksum tile_temperature = 443797FE5250DEFE Inner product checksum sw_up_tile_rts = 0 Inner product checksum sw_direct_toa_rts = 0 -Inner product checksum snow_layer_temp = 444C09FD29EBC134 +Inner product checksum snow_layer_temp = 4457AF7EDF6B111F Inner product checksum soil_roughness = 3F50C6F7617A7EBA -Inner product checksum zh = 4198376093F0D042 -Inner product checksum lw_heating_rate_rtsi = 42B6DAF07B1FAACC +Inner product checksum zh = 4198376093F0D043 +Inner product checksum lw_heating_rate_rtsi = 42B6DAF2288D4D4E Inner product checksum a_sat_frac = 4067EF6A9F0CFF79 Inner product checksum sw_heating_rate_rts = 0 Inner product checksum sw_up_tile_rtsi = 0 Inner product checksum sw_direct_toa_rtsi = 0 -Inner product checksum rho = 40E727EC608D5555 +Inner product checksum rho = 40E727EC608D5557 Inner product checksum lbc_rho = 0 Inner product checksum n_acc_sol = 0 -Inner product checksum snow_layer_rgrain = 444C09FEC81CBA96 -Inner product checksum c_sat_frac = 407D62B17B4704F3 +Inner product checksum snow_layer_rgrain = 4457AF7F6D3B72F7 +Inner product checksum c_sat_frac = 407D62B17B4704F1 Inner product checksum ageofair = 0 Inner product checksum boundary_u_driving = 0 Inner product checksum soil_suction_sat = 7FF0000000000000 Inner product checksum silhouette_area_orog = 3F906E761C4C3038 Inner product checksum cos_zenith_angle_rts = 0 -Inner product checksum soil_temperature = 443123FFA757202A -Inner product checksum screen_temperature = 4473C37F9D4B898A +Inner product checksum soil_temperature = 443011FFA46EA8F0 +Inner product checksum screen_temperature = 447379DF8B8D95AC Inner product checksum peak_to_trough_orog = 41026B6BF51E922A -Inner product checksum sw_heating_rate_rtsi = 42B6DD2C806677D0 -Inner product checksum snowpack_density = 443A39FE2208FF3E +Inner product checksum sw_heating_rate_rtsi = 42B6DD2E2D067BF6 +Inner product checksum snowpack_density = 443797FEC9D8C2AA Inner product checksum soil_moist_wilt = 7FF0000000000000 -Inner product checksum theta = 42069729B923F0FB +Inner product checksum theta = 42069729B923F102 Inner product checksum lbc_theta = 0 -Inner product checksum lw_up_surf_rts = 41A127FBF795FC56 +Inner product checksum lw_up_surf_rts = 41A127FBF795FC54 Inner product checksum a_wet_frac = 40527B54E34D6CDA Inner product checksum acc_sol_du = 0 Inner product checksum stellar_irradiance_rts = 0 -Inner product checksum snow_under_canopy = 443A39FEDBD2C590 +Inner product checksum snow_under_canopy = 443797FF89838F6B Inner product checksum c_wet_frac = 4077780FAB024800 Inner product checksum ait_sol_bc = 0 Inner product checksum acc_sol_om = 0 @@ -78,37 +78,37 @@ Inner product checksum lw_up_surf_rtsi = 4170CB64FE0AA51F Inner product checksum sw_up_surf_rts = 0 Inner product checksum sw_up_blue_tile_rts = 0 Inner product checksum leaf_area_index = 7FF0000000000000 -Inner product checksum snow_layer_liq_mass = 444C09FF3D04D52F +Inner product checksum snow_layer_liq_mass = 4457AF7F967AD11E Inner product checksum cor_sol_bc = 0 -Inner product checksum lw_down_surf_rts = 41961C6F10E97DC0 -Inner product checksum exner = 40E77B745607A69E +Inner product checksum lw_down_surf_rts = 41961C6F10E97DC1 +Inner product checksum exner = 40E77B745607A6A2 Inner product checksum lbc_exner = 0 Inner product checksum sw_up_surf_rtsi = 0 Inner product checksum sw_direct_surf_rts = 0 Inner product checksum sw_up_blue_tile_rtsi = 0 -Inner product checksum wvar = 40A91F9523465AB8 -Inner product checksum wetness_under_soil = 441857FFA4909D82 +Inner product checksum wvar = 40A8626BBE9F942C +Inner product checksum wetness_under_soil = 441857FFA4909D80 Inner product checksum acc_sol_ss = 0 -Inner product checksum sd_orog = 40CA0AA0BF279363 +Inner product checksum sd_orog = 40CA0AA0BF279362 Inner product checksum soil_albedo = 7FF0000000000000 -Inner product checksum time_since_transition = 4414FBFE76101568 +Inner product checksum time_since_transition = 4414FBFE76101550 Inner product checksum lw_down_surf_rtsi = 413A3B9C45CC0F08 Inner product checksum acc_sol_su = 0 Inner product checksum n_ait_sol = 0 Inner product checksum sw_down_surf_rts = 0 -Inner product checksum stellar_eqn_of_time_rts = 3FEA0E536CB41F5E +Inner product checksum stellar_eqn_of_time_rts = 3FEA0E536CB41F5D Inner product checksum sw_direct_surf_rtsi = 0 -Inner product checksum chloro_sea = 3E1759841C218A44 -Inner product checksum ozone = 3E9FEE5EFBF7BE60 +Inner product checksum chloro_sea = 3E1759841C218A42 +Inner product checksum ozone = 3E9A81A83D2651E2 Inner product checksum clapp_horn_b = 7FF0000000000000 Inner product checksum sw_down_surf_rtsi = 0 Inner product checksum n_cor_sol = 0 -Inner product checksum area_fraction = 4077A40F415F8504 -Inner product checksum snow_layer_thickness = 444C09FF3D04D52F +Inner product checksum area_fraction = 4073D10E642E8290 +Inner product checksum snow_layer_thickness = 4457AF7F967AD11E Inner product checksum conv_rain = 0 Inner product checksum slope_angle = 0 Inner product checksum ait_sol_om = 0 -Inner product checksum water_table = 441857FFA464EFEB +Inner product checksum water_table = 441857FFA464EFEA Inner product checksum cor_sol_du = 0 Inner product checksum sw_direct_blue_surf_rts = 0 Inner product checksum cor_sol_om = 0 @@ -121,28 +121,28 @@ Inner product checksum soil_cond_sat = 7FF0000000000000 Inner product checksum frozen_soil_moisture = 0 Inner product checksum cor_sol_ss = 0 Inner product checksum canopy_height = 7FF0000000000000 -Inner product checksum bulk_fraction = 4077A40F415F8504 -Inner product checksum tile_fraction = 4078582D6A79F6B2 +Inner product checksum bulk_fraction = 4073D10E642E8290 +Inner product checksum tile_fraction = 40789FE2C6F4D2F6 Inner product checksum cor_sol_su = 0 Inner product checksum sea_ice_thickness = 7FF0000000000000 -Inner product checksum sin_stellar_declination_rts = 405A7A1D5CCBEC60 +Inner product checksum sin_stellar_declination_rts = 405A7A1D5CCBEC5C Inner product checksum slope_aspect = 0 Inner product checksum grad_xx_orog = 3E845FF5EBEBA137 -Inner product checksum snow_depth = 443A39FEDBD2C590 +Inner product checksum snow_depth = 443797FF89838F6B Inner product checksum boundary_u_diff = 0 -Inner product checksum grad_xy_orog = 3E46A45807A202AA +Inner product checksum grad_xy_orog = 3E46A45807A202A8 Inner product checksum grad_yy_orog = 3E72843F6D9AEFAE -Inner product checksum orographic_correction_rts = 408FFFFF8764EC08 +Inner product checksum orographic_correction_rts = 408FFFFF8764EC06 Inner product checksum skyview = 0 Inner product checksum soil_thermal_cap = 7FF0000000000000 Inner product checksum conv_snow = 0 Inner product checksum horizon_angle = 0 -Inner product checksum z0msea = 4065692F5E6F071C +Inner product checksum z0msea = 4065692F5E6F071B Inner product checksum cca = 0 Inner product checksum conv_prog_dmv = 0 -Inner product checksum tile_lw_grey_albedo = 40294F555DBDEDF0 +Inner product checksum tile_lw_grey_albedo = 40296D99BE33A49C Inner product checksum mean_topog_index = 7FF0000000000000 -Inner product checksum liquid_fraction = 403E673D3DC8961F +Inner product checksum liquid_fraction = 4039C851CB0D7B2A Inner product checksum dd_mf_cb = 0 Inner product checksum soil_thermal_cond = 7FF0000000000000 Inner product checksum surface_conductance = 441857FFA4A37489 From b4df63ebab0f8db8e9c41e140d4279eab0046fac Mon Sep 17 00:00:00 2001 From: "ukmo-juan.castillo" Date: Thu, 29 Jan 2026 07:22:17 +0000 Subject: [PATCH 2/6] Issue #192: add empty upgrade macro --- .../rose-meta/lfric-lfric2lfric/versions.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/applications/lfric2lfric/rose-meta/lfric-lfric2lfric/versions.py b/applications/lfric2lfric/rose-meta/lfric-lfric2lfric/versions.py index 7e1fcc5b..2d730bd0 100644 --- a/applications/lfric2lfric/rose-meta/lfric-lfric2lfric/versions.py +++ b/applications/lfric2lfric/rose-meta/lfric-lfric2lfric/versions.py @@ -45,3 +45,13 @@ def upgrade(self, config, meta_config=None): self.add_setting(config, ["namelist:physics", "conv_gr_segment"], "16") return config, self.reports + +class vn30_t192(MacroUpgrade): + """Upgrade macro for ticket #192 by Juan M. Castillo.""" + + BEFORE_TAG = "vn3.0_t99" + AFTER_TAG = "vn3.0_t192" + + def upgrade(self, config, meta_config=None): + + return config, self.reports From cdbeaf265f02e4e1192d47edf9fe06e9607239d9 Mon Sep 17 00:00:00 2001 From: "ukmo-juan.castillo" Date: Thu, 29 Jan 2026 15:07:47 +0000 Subject: [PATCH 3/6] Issue 192: modifications agreed with the lfric team --- .../lfric2lfric/example/configuration.nml | 4 ++-- .../lfric-lfric2lfric/HEAD/rose-meta.conf | 15 ++++++++------- .../rose-meta/lfric-lfric2lfric/versions.py | 9 +++++++++ .../initialisation/lfric2lfric_init_mesh.f90 | 12 ++++++++++++ rose-stem/app/lfric2lfric/rose-app.conf | 4 ++-- 5 files changed, 33 insertions(+), 11 deletions(-) diff --git a/applications/lfric2lfric/example/configuration.nml b/applications/lfric2lfric/example/configuration.nml index b70cd2d2..3d733d89 100644 --- a/applications/lfric2lfric/example/configuration.nml +++ b/applications/lfric2lfric/example/configuration.nml @@ -72,13 +72,13 @@ coord_order = 1, / &partitioning - mesh_type = 'destination', + mesh_target = 'destination', partitioner = 'cubedsphere', panel_decomposition = 'auto', / &partitioning - mesh_type = 'source', + mesh_target = 'source', partitioner = 'cubedsphere', panel_decomposition = 'auto', / diff --git a/applications/lfric2lfric/rose-meta/lfric-lfric2lfric/HEAD/rose-meta.conf b/applications/lfric2lfric/rose-meta/lfric-lfric2lfric/HEAD/rose-meta.conf index 67a199c3..49fd51ad 100644 --- a/applications/lfric2lfric/rose-meta/lfric-lfric2lfric/HEAD/rose-meta.conf +++ b/applications/lfric2lfric/rose-meta/lfric-lfric2lfric/HEAD/rose-meta.conf @@ -234,16 +234,17 @@ type=character [namelist:partitioning] duplicate=true -!instance_key_member=mesh_type +!instance_key_member=mesh_target -[namelist:partitioning=mesh_type] +[namelist:partitioning=mesh_target] compulsory=true description=The purpose of the mesh -help=The mesh can be used to perform a LFRic forecast (Dynamics), - =or to describe the source and the destination grids in - =the lfric2lfric regridding program. +help=In the lfric2lfric program, this variable indicates the + =mesh for which the described partitioning is taking place. + = + =The only valid values of this variable in lfric2lfric + =are 'source' to indicate the source grid, and 'destination' + =to indicate the destination grid. ns=namelist/lfric2lfric/configuration !string_length=default type=character -value-titles=Dynamics, Source, Destination -values='dynamics', 'source', 'destination' diff --git a/applications/lfric2lfric/rose-meta/lfric-lfric2lfric/versions.py b/applications/lfric2lfric/rose-meta/lfric-lfric2lfric/versions.py index 2d730bd0..97b9c293 100644 --- a/applications/lfric2lfric/rose-meta/lfric-lfric2lfric/versions.py +++ b/applications/lfric2lfric/rose-meta/lfric-lfric2lfric/versions.py @@ -54,4 +54,13 @@ class vn30_t192(MacroUpgrade): def upgrade(self, config, meta_config=None): + self.rename_setting( + config, + ["namelist:partitioning(source)", "mesh_type", "mesh_target"], + ) + self.rename_setting( + config, + ["namelist:partitioning(destination)", "mesh_type", "mesh_target"], + ) + return config, self.reports diff --git a/applications/lfric2lfric/source/initialisation/lfric2lfric_init_mesh.f90 b/applications/lfric2lfric/source/initialisation/lfric2lfric_init_mesh.f90 index f1134fce..a7acfe92 100644 --- a/applications/lfric2lfric/source/initialisation/lfric2lfric_init_mesh.f90 +++ b/applications/lfric2lfric/source/initialisation/lfric2lfric_init_mesh.f90 @@ -136,11 +136,23 @@ subroutine init_mesh( configuration, & ! Extract and check configuration variables !============================================================================ ! Read partitioning namelist for source and destination meshes + if (.not. configuration%namelist_exists('partitioning', 'source') then + write( log_scratch_space, '(A)' ) & + 'Partitioning parameters for the source mesh were not found, '// & + 'please specify a partitioning namelist with mesh_target=source.' + call log_event(log_scratch_space, log_level_error) + end if src_partitioning_nml => configuration%get_namelist('partitioning', & 'source') call src_partitioning_nml%get_value( 'generate_inner_halos', & generate_inner_halos(src) ) + if (.not. configuration%namelist_exists('partitioning', 'destination') then + write( log_scratch_space, '(A)' ) & + 'Partitioning parameters for the source mesh were not found, '// & + 'please specify a partitioning namelist with mesh_target=destination.' + call log_event(log_scratch_space, log_level_error) + end if dst_partitioning_nml => configuration%get_namelist('partitioning', & 'destination') call dst_partitioning_nml%get_value( 'generate_inner_halos', & diff --git a/rose-stem/app/lfric2lfric/rose-app.conf b/rose-stem/app/lfric2lfric/rose-app.conf index f818b159..aab96e9c 100644 --- a/rose-stem/app/lfric2lfric/rose-app.conf +++ b/rose-stem/app/lfric2lfric/rose-app.conf @@ -808,7 +808,7 @@ wavelength=0 [namelist:partitioning(destination)] generate_inner_halos=.false. -mesh_type='destination' +mesh_target='destination' panel_decomposition='auto' !!panel_xproc=0 !!panel_yproc=0 @@ -816,7 +816,7 @@ partitioner='cubedsphere' [namelist:partitioning(source)] generate_inner_halos=.false. -mesh_type='source' +mesh_target='source' panel_decomposition='auto' !!panel_xproc=0 !!panel_yproc=0 From d7fe8944ba4eae41995a1690ab6c980c8e22ef47 Mon Sep 17 00:00:00 2001 From: "ukmo-juan.castillo" Date: Thu, 29 Jan 2026 17:32:56 +0000 Subject: [PATCH 4/6] Issue #192: fix missing brackets; fix update macro --- .../rose-meta/lfric-lfric2lfric/versions.py | 13 ++++++------- .../source/initialisation/lfric2lfric_init_mesh.f90 | 4 ++-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/applications/lfric2lfric/rose-meta/lfric-lfric2lfric/versions.py b/applications/lfric2lfric/rose-meta/lfric-lfric2lfric/versions.py index 97b9c293..d1481349 100644 --- a/applications/lfric2lfric/rose-meta/lfric-lfric2lfric/versions.py +++ b/applications/lfric2lfric/rose-meta/lfric-lfric2lfric/versions.py @@ -20,13 +20,10 @@ def __repr__(self): """ Copy this template and complete to add your macro - class vnXX_txxx(MacroUpgrade): # Upgrade macro for by - BEFORE_TAG = "vnX.X" AFTER_TAG = "vnX.X_txxx" - def upgrade(self, config, meta_config=None): # Add settings return config, self.reports @@ -43,9 +40,9 @@ def upgrade(self, config, meta_config=None): # Commands From: rose-meta/lfric-lfric_atm """Set segmentation size for Gregory-Rowntree convection kernel""" self.add_setting(config, ["namelist:physics", "conv_gr_segment"], "16") - return config, self.reports + class vn30_t192(MacroUpgrade): """Upgrade macro for ticket #192 by Juan M. Castillo.""" @@ -53,14 +50,16 @@ class vn30_t192(MacroUpgrade): AFTER_TAG = "vn3.0_t192" def upgrade(self, config, meta_config=None): - + # Commands From: rose-meta/lfric-lfric2lfric self.rename_setting( config, - ["namelist:partitioning(source)", "mesh_type", "mesh_target"], + ["namelist:partitioning(source)", "mesh_type"], + ["namelist:partitioning(source)", "mesh_target"], ) self.rename_setting( config, - ["namelist:partitioning(destination)", "mesh_type", "mesh_target"], + ["namelist:partitioning(destination)", "mesh_type"], + ["namelist:partitioning(destination)", "mesh_target"], ) return config, self.reports diff --git a/applications/lfric2lfric/source/initialisation/lfric2lfric_init_mesh.f90 b/applications/lfric2lfric/source/initialisation/lfric2lfric_init_mesh.f90 index a7acfe92..ad9dddbb 100644 --- a/applications/lfric2lfric/source/initialisation/lfric2lfric_init_mesh.f90 +++ b/applications/lfric2lfric/source/initialisation/lfric2lfric_init_mesh.f90 @@ -136,7 +136,7 @@ subroutine init_mesh( configuration, & ! Extract and check configuration variables !============================================================================ ! Read partitioning namelist for source and destination meshes - if (.not. configuration%namelist_exists('partitioning', 'source') then + if (.not. configuration%namelist_exists('partitioning', 'source')) then write( log_scratch_space, '(A)' ) & 'Partitioning parameters for the source mesh were not found, '// & 'please specify a partitioning namelist with mesh_target=source.' @@ -147,7 +147,7 @@ subroutine init_mesh( configuration, & call src_partitioning_nml%get_value( 'generate_inner_halos', & generate_inner_halos(src) ) - if (.not. configuration%namelist_exists('partitioning', 'destination') then + if (.not. configuration%namelist_exists('partitioning', 'destination')) then write( log_scratch_space, '(A)' ) & 'Partitioning parameters for the source mesh were not found, '// & 'please specify a partitioning namelist with mesh_target=destination.' From 4acd07066944f6f4981f40c0be0eb9818ef764b2 Mon Sep 17 00:00:00 2001 From: "ukmo-juan.castillo" Date: Fri, 30 Jan 2026 13:56:14 +0000 Subject: [PATCH 5/6] Issue #192: add name to contributor list, correct error message --- CONTRIBUTORS.md | 37 ++++++++++--------- .../initialisation/lfric2lfric_init_mesh.f90 | 4 +- 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 8d9ccac1..149374b8 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1,19 +1,20 @@ # Contributors -| GitHub user | Real Name | Affiliation | Date | -| --------------- | ------------------ | -------------------------------- | ---------- | -| james-bruten-mo | James Bruten | Met Office | 2025-12-09 | -| jedbakerMO | Jed Baker | Met Office | 2025-12-29 | -| jennyhickson | Jenny Hickson | Met Office | 2025-12-10 | -| mike-hobson | Mike Hobson | Met Office | 2025-12-17 | -| mo-marqh | mark Hedley | Met Office | 2025-12-11 | -| yaswant | Yaswant Pradhan | Met Office | 2025-12-16 | -| oakleybrunt | Oakley Brunt | Met Office | 2025-12-19 | -| harry-shepherd | Harry Shepherd | Met Office | 2026-01-08 | -| DrTVockerodtMO | Terence Vockerodt | Met Office | 2026-01-08 | -| ricky-lv426 | Ricky Olivier | University of Exeter | 2026-01-12 | -| MetBenjaminWent | Benjamin Went | Met Office | 2026-01-15 | -| timgraham-Met | Tim Graham | Met Office | 2026-01-15 | -| mo-alistairp | Alistair Pirrie | Met Office | 2026-01-19 | -| jasonjunweilyu | Junwei (Jason) Lyu | Bureau of Meteorology, Australia | 2025-12-17 | -| EdHone | Ed Hone | Met Office | 2026-01-26 | -| alanjhewitt | Alan J Hewitt | Met Office | 2026-01-28 | \ No newline at end of file +| GitHub user | Real Name | Affiliation | Date | +| --------------- | ------------------ | -------------------------------- | ---------- | +| james-bruten-mo | James Bruten | Met Office | 2025-12-09 | +| jedbakerMO | Jed Baker | Met Office | 2025-12-29 | +| jennyhickson | Jenny Hickson | Met Office | 2025-12-10 | +| mike-hobson | Mike Hobson | Met Office | 2025-12-17 | +| mo-marqh | mark Hedley | Met Office | 2025-12-11 | +| yaswant | Yaswant Pradhan | Met Office | 2025-12-16 | +| oakleybrunt | Oakley Brunt | Met Office | 2025-12-19 | +| harry-shepherd | Harry Shepherd | Met Office | 2026-01-08 | +| DrTVockerodtMO | Terence Vockerodt | Met Office | 2026-01-08 | +| ricky-lv426 | Ricky Olivier | University of Exeter | 2026-01-12 | +| MetBenjaminWent | Benjamin Went | Met Office | 2026-01-15 | +| timgraham-Met | Tim Graham | Met Office | 2026-01-15 | +| mo-alistairp | Alistair Pirrie | Met Office | 2026-01-19 | +| jasonjunweilyu | Junwei (Jason) Lyu | Bureau of Meteorology, Australia | 2025-12-17 | +| EdHone | Ed Hone | Met Office | 2026-01-26 | +| alanjhewitt | Alan J Hewitt | Met Office | 2026-01-28 | +| ukmo-juan-castillo | Juan M Castillo | Met Office | 2026-01-30 | diff --git a/applications/lfric2lfric/source/initialisation/lfric2lfric_init_mesh.f90 b/applications/lfric2lfric/source/initialisation/lfric2lfric_init_mesh.f90 index ad9dddbb..8b2d18dd 100644 --- a/applications/lfric2lfric/source/initialisation/lfric2lfric_init_mesh.f90 +++ b/applications/lfric2lfric/source/initialisation/lfric2lfric_init_mesh.f90 @@ -148,8 +148,8 @@ subroutine init_mesh( configuration, & generate_inner_halos(src) ) if (.not. configuration%namelist_exists('partitioning', 'destination')) then - write( log_scratch_space, '(A)' ) & - 'Partitioning parameters for the source mesh were not found, '// & + write( log_scratch_space, '(A)' ) & + 'Partitioning parameters for the destination mesh were not found, '// & 'please specify a partitioning namelist with mesh_target=destination.' call log_event(log_scratch_space, log_level_error) end if From 41df24c0b32522c76e6fc6831231d3f38d42d855 Mon Sep 17 00:00:00 2001 From: "ukmo-juan.castillo" Date: Fri, 30 Jan 2026 15:37:20 +0000 Subject: [PATCH 6/6] Issue #192: changes suggested by the reviewer --- .../rose-meta/lfric-lfric2lfric/HEAD/rose-meta.conf | 10 +++++----- .../source/initialisation/lfric2lfric_init_mesh.f90 | 6 ++---- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/applications/lfric2lfric/rose-meta/lfric-lfric2lfric/HEAD/rose-meta.conf b/applications/lfric2lfric/rose-meta/lfric-lfric2lfric/HEAD/rose-meta.conf index 49fd51ad..fcdf6715 100644 --- a/applications/lfric2lfric/rose-meta/lfric-lfric2lfric/HEAD/rose-meta.conf +++ b/applications/lfric2lfric/rose-meta/lfric-lfric2lfric/HEAD/rose-meta.conf @@ -239,12 +239,12 @@ duplicate=true [namelist:partitioning=mesh_target] compulsory=true description=The purpose of the mesh -help=In the lfric2lfric program, this variable indicates the - =mesh for which the described partitioning is taking place. +help=The designation of the mesh to which this + =partitioning profile is to be applied. = - =The only valid values of this variable in lfric2lfric - =are 'source' to indicate the source grid, and 'destination' - =to indicate the destination grid. + =Recognised designations are: + = * 'source' + = * 'destination' ns=namelist/lfric2lfric/configuration !string_length=default type=character diff --git a/applications/lfric2lfric/source/initialisation/lfric2lfric_init_mesh.f90 b/applications/lfric2lfric/source/initialisation/lfric2lfric_init_mesh.f90 index 8b2d18dd..c6e3930e 100644 --- a/applications/lfric2lfric/source/initialisation/lfric2lfric_init_mesh.f90 +++ b/applications/lfric2lfric/source/initialisation/lfric2lfric_init_mesh.f90 @@ -138,8 +138,7 @@ subroutine init_mesh( configuration, & ! Read partitioning namelist for source and destination meshes if (.not. configuration%namelist_exists('partitioning', 'source')) then write( log_scratch_space, '(A)' ) & - 'Partitioning parameters for the source mesh were not found, '// & - 'please specify a partitioning namelist with mesh_target=source.' + 'Source mesh partitioning namelist (partitioning:source) not found.' call log_event(log_scratch_space, log_level_error) end if src_partitioning_nml => configuration%get_namelist('partitioning', & @@ -149,8 +148,7 @@ subroutine init_mesh( configuration, & if (.not. configuration%namelist_exists('partitioning', 'destination')) then write( log_scratch_space, '(A)' ) & - 'Partitioning parameters for the destination mesh were not found, '// & - 'please specify a partitioning namelist with mesh_target=destination.' + 'Destination mesh partitioning namelist (partitioning:destination) not found.' call log_event(log_scratch_space, log_level_error) end if dst_partitioning_nml => configuration%get_namelist('partitioning', &