Skip to content

Clean-up of tests in LFRic2UM #809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
James Bruten (james-bruten-mo) merged 3 commits into from
Sep 29, 2026
Merged

Clean-up of tests in LFRic2UM #809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c36ab50
moving iodef file and adding fields and stashcodes
mo-lottieturner Sep 23, 2026
296142a
renaming rose-app.conf and changing test names
mo-lottieturner Sep 23, 2026
1fab4f3
Merge branch 'main' into lfric2um_testing_reorg
james-bruten-mo Sep 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 40 additions & 4 deletions ...m/app/lfric2um/file/iodef_performance.xml → ...stem/app/lfric2um/file/iodef_nwp_gal9.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,23 +53,59 @@
<!-- File definition for lfric checkpoint read -->
<file id="lfric_checkpoint_read" name="lfric_checkpoint_read" mode="read" output_freq="1ts" convention="UGRID" cyclic="true" enabled=".FALSE.">
<field_group id="lfric_checkpoint_read_field_group" >
<field id="read_u_in_w3" name="u_in_w3" long_name="eastward_wind_at_cell_centres" standard_name="eastward_wind" unit="ms-1" grid_ref="half_level_face_grid" operation="instant" />
<field id="read_v_in_w3" name="v_in_w3" long_name="northward_wind_at_cell_centres" standard_name="northward_wind" unit="ms-1" grid_ref="half_level_face_grid" operation="instant" />
<field id="read_w_in_wth" name="w_in_wth" long_name="upward_air_velocity_at_cell_interfaces" standard_name="upward_air_velocity" unit="m s-1" grid_ref="full_level_face_grid" operation="instant" />
<field id="read_u_in_w3" name="u_in_w3" long_name="eastward_wind_at_cell_centres" standard_name="eastward_wind" unit="ms-1" grid_ref="half_level_face_grid" operation="instant" />
<field id="read_v_in_w3" name="v_in_w3" long_name="northward_wind_at_cell_centres" standard_name="northward_wind" unit="ms-1" grid_ref="half_level_face_grid" operation="instant" />
<field id="read_w_in_wth" name="w_in_wth" long_name="upward_air_velocity_at_cell_interfaces" standard_name="upward_air_velocity" unit="m s-1" grid_ref="full_level_face_grid" operation="instant" />
<field id="read_theta" name="theta" long_name="air_potential_temperature" standard_name="air_potential_temperature" unit="K" grid_ref="full_level_face_grid" operation="instant" />
<field id="read_rho" name="rho" long_name="air_density" unit="1" grid_ref="half_level_face_grid" operation="instant" />
<field id="read_m_v" name="m_v" long_name="humidity_mixing_ratio" unit="1" grid_ref="full_level_face_grid" operation="instant" />
<field id="read_m_cl" name="m_cl" long_name="cloud_liquid_water_mixing_ratio" unit="1" grid_ref="full_level_face_grid" operation="instant" />
<field id="read_m_cf" name="m_cf" long_name="cloud_ice_mixing_ratio" unit="1" grid_ref="full_level_face_grid" operation="instant" />
<field id="read_m_r" name="m_r" long_name="rain_mixing_ratio" unit="1" grid_ref="full_level_face_grid" operation="instant" />
<field id="read_zh" name="zh" long_name="boundary_layer_depth" unit="m" domain_ref="face" operation="instant" />
<field id="read_area_fraction" name="area_fraction" long_name="cloud_area_fraction" unit="1" grid_ref="full_level_face_grid" operation="instant" />
<field id="read_bulk_fraction" name="bulk_fraction" long_name="cloud_bulk_fraction" unit="1" grid_ref="full_level_face_grid" operation="instant" />
<field id="read_liquid_fraction" name="liquid_fraction" long_name="cloud_liquid_fraction" unit="1" grid_ref="full_level_face_grid" operation="instant" />
<field id="read_frozen_fraction" name="frozen_fraction" long_name="cloud_frozen_fraction" unit="1" grid_ref="full_level_face_grid" operation="instant" />
<field id="read_zh" name="zh" long_name="boundary_layer_depth" unit="m" domain_ref="face" operation="instant" />
<field id="read_z0msea" name="z0msea" long_name="sea_surface_roughness_length" unit="m" domain_ref="face" operation="instant" />
<!--<field id="read_tstar" name="tstar" long_name="surface_temperature" standard_name="surface_temperature" unit="K" domain_ref="face" operation="instant" />-->
<!--<field id="read_ozone" name="ozone" long_name="mass_fraction_of_ozone_in_air" standard_name="mass_fraction_of_ozone_in_air" unit="1" grid_ref="full_level_face_grid" operation="instant" />-->

<!-- Additional fields for basic_gal
<field id="read_dd_mf_cb" name="dd_mf_cb" long_name="Downdraft massflux at cloud base" unit="Pa s-1" domain_ref="face" operation="instant" />
<field id="read_snow_soot" name="snow_soot" long_name="Snow soot content" unit="kg kg-1" domain_ref="face" operation="instant" />
<field id="read_soil_sat_frac" name="soil_sat_frac" long_name="Soil saturated fraction" unit="1" domain_ref="face" operation="instant" />
<field id="read_water_table" name="water_table" long_name="Water table depth" unit="m" domain_ref="face" operation="instant" />
<field id="read_wetness_under_soil" name="wetness_under_soil" long_name="Wetness below soil column" unit="1" domain_ref="face" operation="instant" />
<field id="read_surface_conductance" name="surface_conductance" long_name="Surface conductance" unit="m s-1" domain_ref="face" operation="instant" />
<field id="read_tstar_sea_ice" name="tstar_sea_ice" long_name="Sea ice surface temperature" unit="K" domain_ref="face" operation="instant" />
<field id="read_sea_ice_temperature" name="sea_ice_temperature" long_name="Sea-ice bulk temperature" unit="K" domain_ref="face" operation="instant" />
-->

<!-- land tiles fields for basic_gal
<field id="read_tile_snow_mass" name="tile_snow_mass" long_name="Tile snow mass" unit="kg" grid_ref="land_tiles_face_grid" operation="instant" />
<field id="read_tile_n_snow_layers" name="tile_n_snow_layers" long_name="Number of snow layers on tiles" unit="1" grid_ref="land_tiles_face_grid" operation="instant" />
<field id="read_tile_snow_depth" name="tile_snow_depth" long_name="Snow depth on tiles" unit="m" grid_ref="land_tiles_face_grid" operation="instant" />
<field id="read_tile_snow_rgrain" name="tile_snow_rgrain" long_name="Tile snow grain size" unit="microns" grid_ref="land_tiles_face_grid" operation="instant" />
<field id="read_tile_snow_under_canopy" name="tile_snow_under_canopy" long_name="Snow under canopy on tiles" unit="m" grid_ref="land_tiles_face_grid" operation="instant" />
<field id="read_tile_snowpack_density" name="tile_snowpack_density" long_name="Snowpack density on tiles" unit="kg m-3" grid_ref="land_tiles_face_grid" operation="instant" />
<field id="read_tile_canopy_water" name="tile_canopy_water" long_name="Canopy water content on tiles" unit="kg m-2" grid_ref="land_tiles_face_grid" operation="instant" />
<field id="read_tile_temperature" name="tile_temperature" long_name="Tile temperature" unit="K" grid_ref="land_tiles_face_grid" operation="instant" />
-->

<!-- snow layers fields for basic_gal
<field id="read_tile_snow_layer_thickness" name="tile_snow_layer_thickness" long_name="Snow layer thickness on tiles" unit="m" grid_ref="snow_layers_face_grid" operation="instant" />
<field id="read_tile_snow_layer_ice_mass" name="tile_snow_layer_ice_mass" long_name="Snow layer ice mass on tiles" unit="kg m-2" grid_ref="snow_layers_face_grid" operation="instant" />
<field id="read_tile_snow_layer_liq_mass" name="tile_snow_layer_liq_mass" long_name="Snow layer liquid mass on tiles" unit="kg m-2" grid_ref="snow_layers_face_grid" operation="instant" />
<field id="read_tile_snow_layer_temp" name="tile_snow_layer_temp" long_name="Snow layer temperature on tiles" unit="K" grid_ref="snow_layers_face_grid" operation="instant" />
<field id="read_tile_snow_layer_rgrain" name="tile_snow_layer_rgrain" long_name="Snow layer grain size on tiles" unit="microns" grid_ref="snow_layers_face_grid" operation="instant" />
-->

<!-- soil levels fields for basic_gal
<field id="read_soil_temperature" name="soil_temperature" long_name="Soil temperature" unit="K" grid_ref="soil_levels_face_grid" operation="instant" />
<field id="read_soil_moisture" name="soil_moisture" long_name="Soil moisture content" unit="kg kg-1" grid_ref="soil_levels_face_grid" operation="instant" />
-->

</field_group>
</file>

Expand Down
2 changes: 1 addition & 1 deletion ...pp/lfric2um/opt/rose-app-performance.conf → ...m/app/lfric2um/opt/rose-app-nwp_gal9.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[file:iodef.xml]
source=$ROSE_SUITE_DIR/app/lfric2um/file/iodef_performance.xml
source=$ROSE_SUITE_DIR/app/lfric2um/file/iodef_nwp_gal9.xml

[namelist:configure_lfric2um]
stash_list=2,3,150,4,389,391,392,393,394,265,266,267,268,25,26
Expand Down
4 changes: 2 additions & 2 deletions rose-stem/site/common/lfricinputs/tasks_lfric2um.cylc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
"namelist_src": "um_grid.nml",
}) %}

{% elif task_ns.conf_name == "lfric2um-performance-C224L70_N512L70" %}
{% elif task_ns.conf_name == "lfric2um-nwp_gal9-C224L70_N512L70" %}

{% do task_dict.update({
"opt_confs": ["performance"],
"opt_confs": ["nwp_gal9"],
"resolution": "C224",
"mesh_name": "dynamics",
"source_grid_res": "C224",
Expand Down
4 changes: 2 additions & 2 deletions rose-stem/site/meto/groups/groups_lfricinputs.cylc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,8 +219,8 @@
"lfricinputs_lfric2um-umlam-C48L70_N512L70_ex1a_gnu_fast-debug-64bit",
],
"lfric2um_ex1a_weekly": [
"lfricinputs_lfric2um-performance-C224L70_N512L70_ex1a_gnu_full-debug-64bit",
"lfricinputs_lfric2um-performance-C224L70_N512L70_ex1a_gnu_fast-debug-64bit",
"lfricinputs_lfric2um-nwp_gal9-C224L70_N512L70_ex1a_gnu_full-debug-64bit",
"lfricinputs_lfric2um-nwp_gal9-C224L70_N512L70_ex1a_gnu_fast-debug-64bit",
],
"scintelapi_ex1a_developer": [
"lfricinputs_scintelapi-basic-C48L38_C48L38_ex1a_gnu_fast-debug-64bit",
Expand Down
Loading