Skip to content

Change wind names in lfricinputs to match names used in lfric_atm #565

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
Harry Shepherd (harry-shepherd) merged 5 commits into from
Jul 16, 2026
Merged

Change wind names in lfricinputs to match names used in lfric_atm #565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a05730a
Change wind names to those used in lfric_atm
stevemullerworth Jun 25, 2026
81a7110
Change wind names in xml to match lfricinputs code change
stevemullerworth Jun 25, 2026
44ba118
Point lfric2um tasks to modified dumps
stevemullerworth Jun 26, 2026
f9c8fc3
Merge branch 'main' into winds_change
harry-shepherd Jul 16, 2026
fe762cd
Input and KGO file paths
harry-shepherd Jul 16, 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
6 changes: 3 additions & 3 deletions applications/lfricinputs/source/common/lfricinp_stash_to_lfric_map_mod.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@ subroutine lfricinp_init_stash_to_lfric_map()

! PLEASE KEEP THIS LIST OF SUPPORTED STASHCODES in NUMERICAL ORDER
if (winds_on_w3) then
call map_field_name(stashcode_u, 'ew_wind') ! stash 2
call map_field_name(stashcode_v, 'ns_wind') ! stash 3
call map_field_name(stashcode_u, 'u_in_w3') ! stash 2
call map_field_name(stashcode_v, 'v_in_w3') ! stash 3
else
call map_field_name(stashcode_u, 'h_wind') ! stash 2&3
!combined into single W2H field
Expand All @@ -137,7 +137,7 @@ subroutine lfricinp_init_stash_to_lfric_map()
call map_field_name(stashcode_sea_ice_temp, 'sea_ice_temperature') ! stash 49
call map_field_name(stashcode_ozone, 'ozone') ! stash 60
call map_field_name(stashcode_total_aero, 'total_aero') ! stash 90
call map_field_name(stashcode_w, 'upward_wind') ! stash 150
call map_field_name(stashcode_w, 'w_in_wth') ! stash 150
call map_field_name(stashcode_cpl_sw_rad_sea,'cpl_sw_rad') ! stash 171
call map_field_name(stashcode_cpl_sw_surf_sea,'cpl_sw_surf') ! stash 172
call map_field_name(stashcode_cpl_lw_rad_sea,'cpl_lw_rad') ! stash 173
Expand Down
6 changes: 3 additions & 3 deletions rose-stem/app/lfric2um/file/iodef.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@
<!-- 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_ew_wind" name="ew_wind" long_name="eastward_wind" standard_name="eastward_wind" unit="m s-1" grid_ref="half_level_face_grid" operation="instant" />
<field id="read_ns_wind" name="ns_wind" long_name="northward_wind" standard_name="northward_wind" unit="m s-1" grid_ref="half_level_face_grid" operation="instant" />
<field id="read_upward_wind" name="upward_wind" long_name="upward_air_velocity" 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" />
Expand Down
6 changes: 3 additions & 3 deletions rose-stem/app/lfric2um/file/iodef_performance.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@
<!-- 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_ew_wind" name="ew_wind" long_name="eastward_wind" standard_name="eastward_wind" unit="m s-1" grid_ref="half_level_face_grid" operation="instant" />
<field id="read_ns_wind" name="ns_wind" long_name="northward_wind" standard_name="northward_wind" unit="m s-1" grid_ref="half_level_face_grid" operation="instant" />
<field id="read_upward_wind" name="upward_wind" long_name="upward_air_velocity" 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" />
Expand Down
6 changes: 3 additions & 3 deletions rose-stem/app/lfric2um/file/iodef_um_lam.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@
<!-- 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_ew_wind" name="ew_wind" long_name="eastward_wind" standard_name="eastward_wind" unit="m s-1" grid_ref="half_level_face_grid" operation="instant" />
<field id="read_ns_wind" name="ns_wind" long_name="northward_wind" standard_name="northward_wind" unit="m s-1" grid_ref="half_level_face_grid" operation="instant" />
<field id="read_upward_wind" name="upward_wind" long_name="upward_air_velocity" 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_q" name="q" long_name="humidity_mixing_ratio" unit="kg/kg" grid_ref="full_level_face_grid" operation="instant" />
<field id="read_qcf" name="qcf" long_name="cloud_ice_mixing_ratio" unit="kg/kg" grid_ref="full_level_face_grid" operation="instant" />
Expand Down
6 changes: 3 additions & 3 deletions rose-stem/app/scintelapi/file/iodef.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@

<!-- File definition for lfric checkpoint write -->
<file id="lfric_checkpoint_write" name="lfric_checkpoint_write" output_freq="1ts" convention="UGRID" enabled=".FALSE.">
<field id="write_ew_wind_in_w3" name="ew_wind_in_w3" long_name="eastward_wind" standard_name="eastward_wind" unit="m s-1" grid_ref="half_level_face_grid" operation="once" prec="8" />
<field id="write_ns_wind_in_w3" name="ns_wind_in_w3" long_name="northward_wind" standard_name="northward_wind" unit="m s-1" grid_ref="half_level_face_grid" operation="once" prec="8" />
<field id="write_u_in_w3" name="u_in_w3" long_name="eastward_wind_at_cell_centres" standard_name="eastward_wind" unit="m s-1" grid_ref="half_level_face_grid" operation="once" prec="8" />
<field id="write_v_in_w3" name="v_in_w3" long_name="northward_wind_at_cell_centres" standard_name="northward_wind" unit="m s-1" grid_ref="half_level_face_grid" operation="once" prec="8" />
<field id="write_theta_in_wtheta" name="theta_in_wtheta" long_name="air_potential_temperature" standard_name="air_potential_temperature" unit="K" grid_ref="full_level_face_grid" operation="once" prec="8" />
<field id="write_ozone_in_wtheta" name="ozone_in_wtheta" 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="once" prec="8" />
<field id="write_upward_wind_in_wtheta" name="upward_wind_in_wtheta" long_name="upward_air_velocity" standard_name="upward_air_velocity" unit="m s-1" grid_ref="full_level_face_grid" operation="once" prec="8" />
<field id="write_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="once" prec="8" />
<field id="write_dry_rho_in_w3" name="dry_rho_in_w3" long_name="air_density" unit="1" grid_ref="half_level_face_grid" operation="once" prec="8" />
<field id="write_mv_in_wtheta" name="mv_in_wtheta" long_name="humidity_mixing_ratio" unit="1" grid_ref="full_level_face_grid" operation="once" prec="8" />
<field id="write_mcl_in_wtheta" name="mcl_in_wtheta" long_name="cloud_liquid_water_mixing_ratio" unit="1" grid_ref="full_level_face_grid" operation="once" prec="8" />
Expand Down
6 changes: 3 additions & 3 deletions rose-stem/app/scintelapi/file/iodef_basic.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@

<!-- File definition for lfric checkpoint write -->
<file id="lfric_checkpoint_write" name="lfric_checkpoint_write" output_freq="1ts" convention="UGRID" enabled=".FALSE.">
<field id="write_ew_wind_in_w3" name="ew_wind_in_w3" long_name="eastward_wind" standard_name="eastward_wind" unit="m s-1" grid_ref="half_level_face_grid" operation="once" prec="8" />
<field id="write_ns_wind_in_w3" name="ns_wind_in_w3" long_name="northward_wind" standard_name="northward_wind" unit="m s-1" grid_ref="half_level_face_grid" operation="once" prec="8" />
<field id="write_u_in_w3" name="u_in_w3" long_name="eastward_wind_at_cell_centres" standard_name="eastward_wind" unit="m s-1" grid_ref="half_level_face_grid" operation="once" prec="8" />
<field id="write_v_in_w3" name="v_in_w3" long_name="northward_wind_at_cell_centres" standard_name="northward_wind" unit="m s-1" grid_ref="half_level_face_grid" operation="once" prec="8" />
<field id="write_theta_in_wtheta" name="theta_in_wtheta" long_name="air_potential_temperature" standard_name="air_potential_temperature" unit="K" grid_ref="full_level_face_grid" operation="once" prec="8" />
<field id="write_ozone_in_wtheta" name="ozone_in_wtheta" 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="once" prec="8" />
<field id="write_upward_wind_in_wtheta" name="upward_wind_in_wtheta" long_name="upward_air_velocity" standard_name="upward_air_velocity" unit="m s-1" grid_ref="full_level_face_grid" operation="once" prec="8" />
<field id="write_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="once" prec="8" />
<field id="write_dry_rho_in_w3" name="dry_rho_in_w3" long_name="air_density" unit="1" grid_ref="half_level_face_grid" operation="once" prec="8" />
<field id="write_mv_in_wtheta" name="mv_in_wtheta" long_name="humidity_mixing_ratio" unit="1" grid_ref="full_level_face_grid" operation="once" prec="8" />
<field id="write_mcl_in_wtheta" name="mcl_in_wtheta" long_name="cloud_liquid_water_mixing_ratio" unit="1" grid_ref="full_level_face_grid" operation="once" prec="8" />
Expand Down
20 changes: 10 additions & 10 deletions rose-stem/app/scintelapi/opt/rose-app-basic.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@ output_fields='wind_speed'
generator='a_times_X_dep_alg'
genpar='0.65'
input_fields='wind_speed'
output_fields='ns_wind'
output_fields='v_in_w3'

[namelist:dependency_graphs(03)]
generator='X_minus_Y_dep_alg'
!!genpar=
input_fields='wind_speed','ns_wind'
output_fields='ew_wind'
input_fields='wind_speed','v_in_w3'
output_fields='u_in_w3'

[namelist:dependency_graphs(04)]
generator='init_field'
genpar='mdi'
!!input_fields=
output_fields='upward_wind'
output_fields='w_in_wth'

[namelist:dependency_graphs(05)]
generator='read_from_file'
Expand Down Expand Up @@ -176,9 +176,9 @@ field_kind='W3_field'
write_to_dump='n'

[namelist:field_definitions(ew_wind)]
field_id='ew_wind'
field_id='u_in_w3'
field_kind='W3_field'
write_name='ew_wind_in_w3'
write_name='u_in_w3'
write_to_dump='y'

[namelist:field_definitions(land_fraction_from_ancil)]
Expand Down Expand Up @@ -224,9 +224,9 @@ field_kind='Wtheta_field'
write_to_dump='n'

[namelist:field_definitions(ns_wind)]
field_id='ns_wind'
field_id='v_in_w3'
field_kind='W3_field'
write_name='ns_wind_in_w3'
write_name='v_in_w3'
write_to_dump='y'

[namelist:field_definitions(ozone)]
Expand Down Expand Up @@ -311,9 +311,9 @@ field_kind='Wtheta_field'
write_to_dump='n'

[namelist:field_definitions(upward_wind)]
field_id='upward_wind'
field_id='w_in_wth'
field_kind='Wtheta_field'
write_name='upward_wind_in_wtheta'
write_name='w_in_wth'
write_to_dump='y'

[namelist:field_definitions(upward_wind_from_dump)]
Expand Down
4 changes: 2 additions & 2 deletions rose-stem/app/um2lfric/file/iodef_aquaplanet_lam_stash_list.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<field_group id="um2lfric_fields" freq_op="1ts" operation="once" enabled=".TRUE." >
<!-- Fields for Aquaplanet -->
<field id="h_wind" name="h_wind" long_name="horizontal_wind" standard_name="horizontal_wind" unit="m s-1" grid_ref="half_level_edge_grid" />
<field id="upward_wind" name="upward_wind" long_name="upward_air_velocity" standard_name="upward_air_velocity" unit="m s-1" grid_ref="full_level_face_grid" />
<field id="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" />
<field id="theta" name="theta" long_name="air_potential_temperature" standard_name="air_potential_temperature" unit="K" grid_ref="full_level_face_grid" />
<field id="rho" name="rho" long_name="air_density" unit="1" grid_ref="half_level_face_grid" />
<field id="m_v" name="m_v" long_name="humidity_mixing_ratio" unit="kg/kg" grid_ref="full_level_face_grid" />
Expand Down Expand Up @@ -110,7 +110,7 @@
<!-- File definition for checkpoint write -->
<file id="lfric_checkpoint_write" name="lfric_checkpoint_write" output_freq="1ts" convention="UGRID" enabled=".TRUE.">
<field field_ref="h_wind"/>
<field field_ref="upward_wind"/>
<field field_ref="w_in_wth"/>
<field field_ref="theta"/>
<field field_ref="rho" />
<field field_ref="m_v" />
Expand Down
2 changes: 1 addition & 1 deletion rose-stem/app/um2lfric/file/iodef_aquaplanet_lbc_stash_list.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<field_group id="um2lfric_lbc_fields" freq_op="1ts" operation="instant" enabled=".TRUE.">
<!-- Fields for Aquaplanet LBCs-->
<field id="h_wind" name="h_wind" long_name="horizontal_wind" standard_name="horizontal_wind" unit="m s-1" grid_ref="half_level_edge_grid" />
<field id="upward_wind" name="upward_wind" long_name="upward_air_velocity" standard_name="upward_air_velocity" unit="m s-1" grid_ref="full_level_face_grid" />
<field id="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" />
<field id="theta" name="theta" long_name="air_potential_temperature" standard_name="air_potential_temperature" unit="K" grid_ref="full_level_face_grid" />
<field id="rho" name="rho" long_name="air_density" unit="1" grid_ref="half_level_face_grid" />
<field id="m_v" name="m_v" long_name="humidity_mixing_ratio" unit="kg/kg" grid_ref="full_level_face_grid" />
Expand Down
11 changes: 6 additions & 5 deletions rose-stem/app/um2lfric/file/iodef_aquaplanet_stash_list.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,9 @@
<!-- UM2LFRIc fields used in checkpoint -->
<field_group id="um2lfric_fields" freq_op="1ts" operation="once" enabled=".TRUE." >
<!-- Fields for Aquaplanet -->
<field id="ew_wind" name="ew_wind" long_name="eastward_wind" standard_name="eastward_wind" unit="m s-1" grid_ref="half_level_face_grid" />
<field id="ns_wind" name="ns_wind" long_name="northward_wind" standard_name="northward_wind" unit="m s-1" grid_ref="half_level_face_grid" />
<field id="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" />
<field id="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" />
<field id="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" />
<field id="upward_wind" name="upward_wind" long_name="upward_air_velocity" standard_name="upward_air_velocity" unit="m s-1" grid_ref="full_level_face_grid" />
<field id="theta" name="theta" long_name="air_potential_temperature" standard_name="air_potential_temperature" unit="K" grid_ref="full_level_face_grid" />
<field id="rho" name="rho" long_name="air_density" unit="1" grid_ref="half_level_face_grid" />
Expand Down Expand Up @@ -110,9 +111,9 @@

<!-- File definition for checkpoint write -->
<file id="lfric_checkpoint_write" name="lfric_checkpoint_write" output_freq="1ts" convention="UGRID" enabled=".TRUE.">
<field field_ref="ew_wind"/>
<field field_ref="ns_wind"/>
<field field_ref="upward_wind"/>
<field field_ref="u_in_w3"/>
<field field_ref="v_in_w3"/>
<field field_ref="w_in_wth"/>
<field field_ref="theta"/>
<field field_ref="rho" />
<field field_ref="m_v" />
Expand Down
12 changes: 6 additions & 6 deletions rose-stem/app/um2lfric/file/iodef_basicgal_stash_list.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@
<!-- UM2LFRIc fields used in checkpoint -->
<field_group id="um2lfric_fields" freq_op="1ts" operation="once" enabled=".TRUE." >
<!-- Fields for Aquaplanet -->
<field id="ew_wind" name="ew_wind" long_name="eastward_wind" standard_name="eastward_wind" unit="m s-1" grid_ref="half_level_face_grid" />
<field id="ns_wind" name="ns_wind" long_name="northward_wind" standard_name="northward_wind" unit="m s-1" grid_ref="half_level_face_grid" />
<field id="upward_wind" name="upward_wind" long_name="upward_air_velocity" standard_name="upward_air_velocity" unit="m s-1" grid_ref="full_level_face_grid" />
<field id="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" />
<field id="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" />
<field id="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" />
<field id="theta" name="theta" long_name="air_potential_temperature" standard_name="air_potential_temperature" unit="K" grid_ref="full_level_face_grid" />
<field id="rho" name="rho" long_name="air_density" unit="1" grid_ref="half_level_face_grid" />
<field id="m_v" name="m_v" long_name="humidity_mixing_ratio" unit="kg/kg" grid_ref="full_level_face_grid" />
Expand Down Expand Up @@ -110,9 +110,9 @@

<!-- File definition for checkpoint write -->
<file id="lfric_checkpoint_write" name="lfric_checkpoint_write" output_freq="1ts" convention="UGRID" enabled=".TRUE.">
<field field_ref="ew_wind"/>
<field field_ref="ns_wind"/>
<field field_ref="upward_wind"/>
<field field_ref="u_in_w3"/>
<field field_ref="v_in_w3"/>
<field field_ref="w_in_wth"/>
<field field_ref="theta"/>
<field field_ref="rho" />
<field field_ref="m_v" />
Expand Down
Loading
Loading