Skip to content

Commit

Permalink
Read total energy using dycore formula from updated CAM snapshots; up…
Browse files Browse the repository at this point in the history 
…date standard names (#296)

Companion issue in CAM: ESCOMP/CAM#1141

Companion PR in CAM: ESCOMP/CAM#1142
this PR in CAM will update snapshots with new variables.

Updates to CAM-SIMA:
- read ncdata variables te_ini_phys, te_ini_dyn, te_cur_phys, te_cur_dyn
- update to standard names per discussion in
ESCOMP/CAM#1141
  • Loading branch information
@jimmielin
jimmielin committed Sep 26, 2024
2 parents f8698e0 + 3112ab6 commit 27eacea
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 16 deletions.
38 changes: 30 additions & 8 deletions src/data/registry.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,32 +202,48 @@
<dimensions>horizontal_dimension vertical_interface_dimension</dimensions>
<ic_file_input_names>zi state_zi</ic_file_input_names>
</variable>
<variable local_name="te_ini"
standard_name="vertically_integrated_energies_of_initial_state_in_cam"
<variable local_name="te_ini_phys"
standard_name="vertically_integrated_total_energy_of_initial_state_using_physics_energy_formula"
units="J m-2"
type="real" kind="kind_phys"
allocatable="pointer">
<dimensions>horizontal_dimension</dimensions>
<ic_file_input_names>te_ini state_te_ini</ic_file_input_names>
<ic_file_input_names>te_ini_phys state_te_ini_phys</ic_file_input_names>
</variable>
<variable local_name="te_cur"
standard_name="vertically_integrated_energies_of_current_state_in_cam"
<variable local_name="te_cur_phys"
standard_name="vertically_integrated_total_energy_of_current_state_using_physics_energy_formula"
units="J m-2"
type="real" kind="kind_phys"
allocatable="pointer">
<dimensions>horizontal_dimension</dimensions>
<ic_file_input_names>te_cur state_te_cur</ic_file_input_names>
<ic_file_input_names>te_cur_phys state_te_cur_phys</ic_file_input_names>
</variable>
<variable local_name="te_ini_dyn"
standard_name="vertically_integrated_total_energy_of_initial_state_using_dycore_energy_formula"
units="J m-2"
type="real" kind="kind_phys"
allocatable="pointer">
<dimensions>horizontal_dimension</dimensions>
<ic_file_input_names>te_ini_dyn state_te_ini_dyn</ic_file_input_names>
</variable>
<variable local_name="te_cur_dyn"
standard_name="vertically_integrated_total_energy_of_current_state_using_dycore_energy_formula"
units="J m-2"
type="real" kind="kind_phys"
allocatable="pointer">
<dimensions>horizontal_dimension</dimensions>
<ic_file_input_names>te_cur_dyn state_te_cur_dyn</ic_file_input_names>
</variable>
<variable local_name="tw_ini"
standard_name="vertically_integrated_total_water_of_initial_state"
standard_name="vertically_integrated_water_vapor_and_condensed_water_of_initial_state"
units="kg m-2"
type="real" kind="kind_phys"
allocatable="pointer">
<dimensions>horizontal_dimension</dimensions>
<ic_file_input_names>tw_ini state_tw_ini</ic_file_input_names>
</variable>
<variable local_name="tw_cur"
standard_name="vertically_integrated_total_water_of_current_state"
standard_name="vertically_integrated_water_vapor_and_condensed_water_of_current_state"
units="kg m-2"
type="real" kind="kind_phys"
allocatable="pointer">
Expand Down Expand Up @@ -297,6 +313,12 @@
<data>inverse_exner_function_wrt_surface_pressure</data>
<data>frontogenesis_function</data>
<data>frontogenesis_angle</data>
<data>vertically_integrated_total_energy_of_initial_state_using_physics_energy_formula</data>
<data>vertically_integrated_total_energy_of_current_state_using_physics_energy_formula</data>
<data>vertically_integrated_total_energy_of_initial_state_using_dycore_energy_formula</data>
<data>vertically_integrated_total_energy_of_current_state_using_dycore_energy_formula</data>
<data>vertically_integrated_water_vapor_and_condensed_water_of_initial_state</data>
<data>vertically_integrated_water_vapor_and_condensed_water_of_current_state</data>
</ddt>
<ddt type="physics_tend">
<data>tendency_of_air_temperature_due_to_model_physics</data>
Expand Down
28 changes: 20 additions & 8 deletions tools/stdnames_to_inputnames_dictionary.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,25 +160,37 @@
<ic_file_input_name>state_zi</ic_file_input_name>
</ic_file_input_names>
</entry>
<entry stdname="vertically_integrated_energies_of_initial_state_in_cam">
<entry stdname="vertically_integrated_total_energy_of_initial_state_using_physics_energy_formula">
<ic_file_input_names>
<ic_file_input_name>te_ini</ic_file_input_name>
<ic_file_input_name>state_te_ini</ic_file_input_name>
<ic_file_input_name>te_ini_phys</ic_file_input_name>
<ic_file_input_name>state_te_ini_phys</ic_file_input_name>
</ic_file_input_names>
</entry>
<entry stdname="vertically_integrated_energies_of_current_state_in_cam">
<entry stdname="vertically_integrated_total_energy_of_current_state_using_physics_energy_formula">
<ic_file_input_names>
<ic_file_input_name>te_cur</ic_file_input_name>
<ic_file_input_name>state_te_cur</ic_file_input_name>
<ic_file_input_name>te_cur_phys</ic_file_input_name>
<ic_file_input_name>state_te_cur_phys</ic_file_input_name>
</ic_file_input_names>
</entry>
<entry stdname="vertically_integrated_total_water_of_initial_state">
<entry stdname="vertically_integrated_total_energy_of_initial_state_using_dycore_energy_formula">
<ic_file_input_names>
<ic_file_input_name>te_ini_dyn</ic_file_input_name>
<ic_file_input_name>state_te_ini_dyn</ic_file_input_name>
</ic_file_input_names>
</entry>
<entry stdname="vertically_integrated_total_energy_of_current_state_using_dycore_energy_formula">
<ic_file_input_names>
<ic_file_input_name>te_cur_dyn</ic_file_input_name>
<ic_file_input_name>state_te_cur_dyn</ic_file_input_name>
</ic_file_input_names>
</entry>
<entry stdname="vertically_integrated_water_vapor_and_condensed_water_of_initial_state">
<ic_file_input_names>
<ic_file_input_name>tw_ini</ic_file_input_name>
<ic_file_input_name>state_tw_ini</ic_file_input_name>
</ic_file_input_names>
</entry>
<entry stdname="vertically_integrated_total_water_of_current_state">
<entry stdname="vertically_integrated_water_vapor_and_condensed_water_of_current_state">
<ic_file_input_names>
<ic_file_input_name>tw_cur</ic_file_input_name>
<ic_file_input_name>state_tw_cur</ic_file_input_name>
Expand Down

0 comments on commit 27eacea

Please sign in to comment.