-
Notifications
You must be signed in to change notification settings - Fork 100
#474: LFRic-Nudging: Part-A: Introduce ability to read nudging datafiles #474
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.
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
Open
Mohit Dalvi (mcdalvi)
wants to merge
19
commits into
MetOffice:main
Choose a base branch
from
mcdalvi:vn3.1.1_read_nudging_data
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 12 commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
0389dfc
Interim Commit while migrating from FCM branch - XML, namelist and ro…
mcdalvi 388b69b
Second commit transferring changes from FCM: Nudging field and file ,…
mcdalvi 8a745da
Compilation fixes, mainly updating other calls to setup_model_data fo…
mcdalvi e2c6817
Improve trigerring in metadata
mcdalvi 05b457a
include files that were not explicitly 'git add'ed
mcdalvi f1f0ddb
First round of fixes from testing: only handle fields and settings th…
mcdalvi dd2ed96
Fixes -mostly aligning field definitions; rationalised tests to use 3…
mcdalvi de251b0
merge into origin/main at 08455b0
mcdalvi 8baec12
modify path to point to files containing licence information
mcdalvi ea85331
Minor fixes, style fixer, update KGOs
mcdalvi d4f3adc
Metadata fiex and re-alignment with configuration variables in modeld…
mcdalvi 50f08f3
more metadata and style fixes
mcdalvi 7723834
Changes in response to Code owner review: Remove new fields from xml …
mcdalvi d48f524
Rename test group to reflect target system and add to *lfric_atm_azsp…
mcdalvi 642225b
Changes from review -configure *nudging_era_coarse* test to use coars…
mcdalvi 3293ee2
Update KGO for *nudging_coarse* test, now reverted back to main mesh …
mcdalvi b906772
Changes from Review- mainly consistent naming of fields; remove dupli…
mcdalvi 6975f0a
Attempt to get away from hardwired numbers in collection declaration.
mcdalvi 344ff27
Revert some changes after review as modeldb may not available in all …
mcdalvi File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -33,8 +33,10 @@ | |
| <axis id="sw_bands_radiation_levels" name="sw_bands_radiation_levels" /> | ||
| <axis id="lw_bands_radiation_levels" name="lw_bands_radiation_levels" /> | ||
| <axis id="photolysis_pathways" name="photolysis_pathways" /> | ||
| <axis id="photol_species" name="photol_species" /> | ||
| <axis id="photol_species" name="photol_species" /> | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Only thing to note from me is this rogue space here
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Thanks DanStoneMO . I have fixed that in my copy |
||
| <axis id="one_time_axis" name="one_time_axis" n_glo="1" /> | ||
| <axis id="nudging_time_axis" name="nudging_time_axis" /> | ||
| <axis id="ecmwf_levels" name="ecmwf_levels" /> | ||
|
|
||
| <axis id="random_seed_size" name="random_seed_size" /> | ||
| <axis id="stph_spectral_dimensions" name="stph_spectral_dimensions" /> | ||
|
|
||
|
mcdalvi marked this conversation as resolved.
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| <!-- Nudging ancillary grid definitions - on prime mesh--> | ||
| <!-- Grid for reading input fields --> | ||
| <grid_definition> | ||
| <grid id="nudging_input_full_grid"> | ||
| <domain domain_ref="face"/> | ||
| <axis axis_ref="nudging_time_axis"/> | ||
| <axis axis_ref="ecmwf_levels"/> | ||
| </grid> | ||
|
|
||
| <grid id="nudging_input_2D_grid"> | ||
| <domain domain_ref="face"/> | ||
| <axis axis_ref="nudging_time_axis"/> | ||
| </grid> | ||
|
|
||
| <!-- Grids for outputting diagnostics --> | ||
| <grid id="nudging_ref_full_grid"> | ||
| <domain domain_ref="face"/> | ||
| <axis axis_ref="ecmwf_levels"/> | ||
| </grid> | ||
|
|
||
| <grid id="nudging_ref_2D_grid"> | ||
| <domain domain_ref="face"/> | ||
| </grid> | ||
| </grid_definition> |
24 changes: 24 additions & 0 deletions
24
applications/lfric_atm/metadata/grid_def_nudging_coarse.xml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| <!-- Nudging ancillary grid definitions - on coarse mesh--> | ||
| <!-- Grid for reading input fields --> | ||
| <grid_definition> | ||
| <grid id="nudging_input_full_grid"> | ||
| <domain domain_ref="multigrid_l2_face"/> | ||
| <axis axis_ref="nudging_time_axis"/> | ||
| <axis axis_ref="ecmwf_levels"/> | ||
| </grid> | ||
|
|
||
| <grid id="nudging_input_2D_grid"> | ||
| <domain domain_ref="multigrid_l2_face"/> | ||
| <axis axis_ref="nudging_time_axis"/> | ||
| </grid> | ||
|
|
||
| <!-- Grids for outputting diagnostics --> | ||
| <grid id="nudging_ref_full_grid"> | ||
| <domain domain_ref="multigrid_l2_face"/> | ||
| <axis axis_ref="ecmwf_levels"/> | ||
| </grid> | ||
|
|
||
| <grid id="nudging_ref_2D_grid"> | ||
| <domain domain_ref="multigrid_l2_face"/> | ||
| </grid> | ||
| </grid_definition> |
|
mcdalvi marked this conversation as resolved.
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
189 changes: 189 additions & 0 deletions
189
rose-stem/app/lfric_atm/file/file_def_diags_gal_nwp_nudging.xml
|
mcdalvi marked this conversation as resolved.
Outdated
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,189 @@ | ||
| <file_definition> | ||
|
|
||
| <!-- Diagnostic fields - Daily - mean/min/max --> | ||
| <file id="lfric_diagnostics" name="results/lfric_gal_diagnostics" output_freq="6h" convention="UGRID" enabled=".TRUE."> | ||
| <!-- 2D fields averaged every timestep --> | ||
| <field_group operation="average" freq_op="1ts" prec="4"> | ||
| <field field_ref="processed__pstar"/> | ||
| <field field_ref="processed__tot_col_dry_air_mass"/> | ||
| <field field_ref="processed__tot_col_wetplusdry_mass"/> | ||
| <field field_ref="processed__tot_col_m_v"/> | ||
| <field field_ref="processed__tot_col_m_cl"/> | ||
| <field field_ref="processed__tot_col_m_cf"/> | ||
| <field field_ref="processed__tot_col_m_r"/> | ||
| <field field_ref="processed__total_rain"/> | ||
| <field field_ref="processed__total_snow"/> | ||
| <field field_ref="processed__total_prec"/> | ||
| <field field_ref="microphysics__ls_rain"/> | ||
| <field field_ref="microphysics__ls_snow"/> | ||
| <field field_ref="microphysics__ls_prec"/> | ||
| <field field_ref="convection__conv_rain"/> | ||
| <field field_ref="convection__conv_snow"/> | ||
| <field field_ref="convection__conv_prec"/> | ||
| <field field_ref="turbulence__bl_type_ind"/> | ||
| <field field_ref="turbulence__zh"/> | ||
| <field field_ref="turbulence__zht"/> | ||
| <field field_ref="turbulence__rib"/> | ||
| <field field_ref="turbulence__cumulus"/> | ||
| <field field_ref="convection__pres_cv_base"/> | ||
| <field field_ref="convection__pres_cv_top"/> | ||
| <field field_ref="convection__mid_cfl_limited"/> | ||
| <field field_ref="convection__mid_prec"/> | ||
| <field field_ref="convection__mid_in_col"/> | ||
| <field field_ref="convection__shallow_prec"/> | ||
| <field field_ref="convection__shallow_in_col"/> | ||
| <field field_ref="soil__soil_moisture_content"/> | ||
| <field field_ref="soil__soil_moisture"/> | ||
| <field field_ref="soil__soil_temperature"/> | ||
| <field field_ref="soil__unfrozen_soil_moisture"/> | ||
| <field field_ref="soil__frozen_soil_moisture"/> | ||
| <field field_ref="soil__surface_runoff"/> | ||
| <field field_ref="soil__sub_surface_runoff"/> | ||
| <field field_ref="cloud__cloud_amount_rnd"/> | ||
| <field field_ref="cloud__cloud_amount_maxrnd"/> | ||
| <field field_ref="cloud__very_low_type_cloud_amount"/> | ||
| <field field_ref="cloud__low_type_cloud_amount"/> | ||
| <field field_ref="cloud__medium_type_cloud_amount"/> | ||
| <field field_ref="cloud__high_type_cloud_amount"/> | ||
| <field field_ref="cloud__very_high_type_cloud_amount"/> | ||
| <field field_ref="surface__grid_sensible_heat"/> | ||
| <field field_ref="surface__grid_moisture_flux"/> | ||
| <field field_ref="surface__surface_taux"/> | ||
| <field field_ref="surface__surface_tauy"/> | ||
| <field field_ref="surface__grid_latent_heat"/> | ||
| <field field_ref="surface__grid_canopy_water"/> | ||
| <field field_ref="surface__grid_surface_temperature"/> | ||
| <field field_ref="surface__u10m"/> | ||
| <field field_ref="surface__v10m"/> | ||
| <field field_ref="surface__wspd10m"/> | ||
| <field field_ref="surface__t1p5m"/> | ||
| <field field_ref="surface__q1p5m"/> | ||
| <field field_ref="surface__rh1p5m"/> | ||
| <field field_ref="surface__z0m"/> | ||
| <field field_ref="snow__grid_snow_mass"/> | ||
| </field_group> | ||
|
|
||
| <!-- 2D fields, minimum over sampling period --> | ||
| <field_group operation="minimum" freq_op="1ts" prec="4"> | ||
| <field field_ref="surface__t1p5m" name="t1p5m_minimum"/> | ||
| <field field_ref="surface__grid_surface_temperature" name="tstar_minimum"/> | ||
| </field_group> | ||
|
|
||
| <!-- 2D fields, maximum over sampling period --> | ||
| <field_group operation="maximum" freq_op="1ts" prec="4"> | ||
| <field field_ref="turbulence__zh" name="zh_maximum"/> | ||
| <field field_ref="surface__t1p5m" name="t1p5m_maximum"/> | ||
| <field field_ref="surface__grid_surface_temperature" name="tstar_maximum"/> | ||
| </field_group> | ||
|
|
||
| <!-- Model timestep radiation diagnostics ("corrected") --> | ||
| <field_group operation="average" freq_op="1ts" prec="4"> | ||
| <field field_ref="radiation__lw_net_surf"/> | ||
| <field field_ref="radiation__lw_down_surf"/> | ||
| <field field_ref="radiation__lw_up_surf"/> | ||
| <field field_ref="radiation__lw_up_toa"/> | ||
| <field field_ref="radiation__sw_net_surf"/> | ||
| <field field_ref="radiation__sw_down_surf"/> | ||
| <field field_ref="radiation__sw_up_surf"/> | ||
| <field field_ref="radiation__sw_up_toa"/> | ||
| <field field_ref="radiation__sw_direct_toa"/> | ||
| </field_group> | ||
|
|
||
| <!-- Radiation timestep radiation diagnostics --> | ||
| <field_group operation="average" freq_op="1h" freq_offset="0ts" prec="4"> | ||
| <field field_ref="radiation__cloud_cover_rts"/> | ||
| <field field_ref="radiation__lw_net_surf_rts"/> | ||
| <field field_ref="radiation__lw_down_surf_rts"/> | ||
| <field field_ref="radiation__lw_up_surf_rts"/> | ||
| <field field_ref="radiation__lw_up_toa_rts"/> | ||
| <field field_ref="radiation__sw_net_surf_rts"/> | ||
| <field field_ref="radiation__sw_down_surf_rts"/> | ||
| <field field_ref="radiation__sw_up_surf_rts"/> | ||
| <field field_ref="radiation__sw_up_toa_rts"/> | ||
| <field field_ref="radiation__sw_direct_toa_rts"/> | ||
| <field field_ref="radiation__sw_down_uv_surf_rts"/> | ||
| <field field_ref="radiation__sw_direct_uv_surf_rts"/> | ||
| <field field_ref="radiation__sw_up_uv_surf_rts"/> | ||
| <field field_ref="radiation__sw_down_uv_clear_surf_rts"/> | ||
| <field field_ref="radiation__sw_direct_uv_clear_surf_rts"/> | ||
| <field field_ref="radiation__sw_up_uv_clear_surf_rts"/> | ||
| <field field_ref="radiation__lw_down_clear_surf_rts"/> | ||
| <field field_ref="radiation__lw_up_clear_surf_rts"/> | ||
| <field field_ref="radiation__lw_up_clear_toa_rts"/> | ||
| <field field_ref="radiation__sw_down_clear_surf_rts"/> | ||
| <field field_ref="radiation__sw_up_clear_surf_rts"/> | ||
| <field field_ref="radiation__sw_up_clear_toa_rts"/> | ||
| <field field_ref="radiation__warm_cloud_top_weight_rts"/> | ||
| <field field_ref="radiation__warm_cloud_top_re_microns_rts"/> | ||
| <field field_ref="processed__sw_aer_optical_depth_rts"/> | ||
| <field field_ref="processed__lw_aer_optical_depth_rts"/> | ||
| <field field_ref="aerosol__aod_ukca_ait_sol"/> | ||
| <field field_ref="aerosol__aaod_ukca_ait_sol"/> | ||
| <field field_ref="aerosol__aod_ukca_acc_sol"/> | ||
| <field field_ref="aerosol__aaod_ukca_acc_sol"/> | ||
| <field field_ref="aerosol__aod_ukca_cor_sol"/> | ||
| <field field_ref="aerosol__aaod_ukca_cor_sol"/> | ||
| <field field_ref="aerosol__aod_ukca_ait_ins"/> | ||
| <field field_ref="aerosol__aaod_ukca_ait_ins"/> | ||
| <field field_ref="aerosol__aod_ukca_acc_ins"/> | ||
| <field field_ref="aerosol__aaod_ukca_acc_ins"/> | ||
| <field field_ref="aerosol__aod_ukca_cor_ins"/> | ||
| <field field_ref="aerosol__aaod_ukca_cor_ins"/> | ||
| </field_group> | ||
|
|
||
| <!-- Full model level diagnostics - not being interpolated to pressure levels --> | ||
| <field_group operation="average" freq_op="1ts" prec="4"> | ||
| <field field_ref="processed__pressure_in_wth"/> | ||
| <field field_ref="theta"/> | ||
| <field field_ref="w_in_wth"/> | ||
| <field field_ref="m_v"/> | ||
| <field field_ref="m_cl"/> | ||
| <field field_ref="m_cf"/> | ||
| <field field_ref="m_r"/> | ||
| <field field_ref="processed__temperature"/> | ||
| <field field_ref="cloud__frozen_fraction"/> | ||
| <field field_ref="cloud__liquid_fraction"/> | ||
| <field field_ref="cloud__bulk_fraction"/> | ||
| <field field_ref="cloud__area_fraction"/> | ||
| <field field_ref="convection__cca"/> | ||
| <field field_ref="convection__massflux_up"/> | ||
| <field field_ref="convection__massflux_down"/> | ||
| <field field_ref="orographic_drag__taux_orographic_drag"/> | ||
| <field field_ref="orographic_drag__tauy_orographic_drag"/> | ||
| </field_group> | ||
|
|
||
| <!-- Half model level diagnostics - not being interpolated to pressure levels --> | ||
| <field_group operation="average" freq_op="1ts" prec="4"> | ||
| <field field_ref="processed__pressure_in_w3"/> | ||
| <field field_ref="u_in_w3"/> | ||
| <field field_ref="v_in_w3"/> | ||
| <field field_ref="rho"/> | ||
| <field field_ref="orographic_drag__dudt_orographic_drag"/> | ||
| <field field_ref="orographic_drag__dvdt_orographic_drag"/> | ||
| </field_group> | ||
|
|
||
| <!-- Full level diagnostics on radiation timesteps --> | ||
| <field_group operation="average" freq_op="1h" freq_offset="0ts" prec="4"> | ||
| <field field_ref="radiation__liq_cloud_mmr_rts"/> | ||
| <field field_ref="radiation__ice_cloud_mmr_rts"/> | ||
| <field field_ref="radiation__liq_cloud_frac_rts"/> | ||
| <field field_ref="radiation__ice_cloud_frac_rts"/> | ||
| </field_group> | ||
|
|
||
| <!-- Specific quantities For UM comparison --> | ||
| <field_group operation="average" freq_op="1ts" prec="4"> | ||
| <field field_ref="processed__qv"/> | ||
| <field field_ref="processed__qcl"/> | ||
| <field field_ref="processed__qcf"/> | ||
| </field_group> | ||
|
|
||
| <!-- Nudging reference fields --> | ||
| <field_group operation="average" freq_op="1ts" prec="4"> | ||
| <field field_ref="temperature_nudging_ext_ref"/> | ||
| <field field_ref="u_nudging_ext_ref"/> | ||
| <field field_ref="v_nudging_ext_ref"/> | ||
| </field_group> | ||
|
|
||
| </file> | ||
|
|
||
| </file_definition> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| <file_definition> | ||
|
|
||
| <!-- Nudging reference data files --> | ||
| <file id="nudging" name="nudging" mode="read" output_freq="6h" convention="UGRID" cyclic="true" enabled=".FALSE."> | ||
| <field id="nudging_time" name="time" unit="hours" operation="once" axis_ref="nudging_time_axis" /> | ||
| <field id="u_nudging_ext_ref_data" name="U" long_name="Eastward wind component for Nudging" unit="m s-1" grid_ref="nudging_input_full_grid" operation="instant" /> | ||
| <field id="v_nudging_ext_ref_data" name="V" long_name="Northward wind component for Nudging" unit="m s-1" grid_ref="nudging_input_full_grid" operation="instant" /> | ||
| <field id="temperature_nudging_ext_ref_data" name="T" long_name="Air temperature for Nudging" unit="K" grid_ref="nudging_input_full_grid" operation="instant" /> | ||
| <field id="surface_pressure_nudging_ext_ref_data" name="LNSP" long_name="Log surface pressure for Nudging" unit="Pa" grid_ref="nudging_input_2D_grid" operation="instant" /> | ||
| </file> | ||
|
|
||
| </file_definition> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.