Skip to content
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

Update teout standard name for check_energy; bring in check_energy diagnostic output #339

Open
wants to merge 1 commit into
base: development
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/data/registry.xml
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@
<ic_file_input_names>tw_cur state_tw_cur</ic_file_input_names>
</variable>
<variable local_name="teout"
standard_name="vertically_integrated_total_energy_at_end_of_physics_timestep"
standard_name="vertically_integrated_total_energy_using_dycore_energy_formula_at_end_of_physics_timestep"
units="J m-2" type="real" kind="kind_phys"
allocatable="allocatable">
<long_name>Total energy using dynamical core formula at the end of physics timestep</long_name>
Expand Down Expand Up @@ -341,7 +341,7 @@
<data>vertically_integrated_total_energy_using_dycore_energy_formula</data>
<data>vertically_integrated_total_water_at_start_of_physics_timestep</data>
<data>vertically_integrated_total_water</data>
<data>vertically_integrated_total_energy_at_end_of_physics_timestep</data>
<data>vertically_integrated_total_energy_using_dycore_energy_formula_at_end_of_physics_timestep</data>
</ddt>
<ddt type="physics_tend">
<data>tendency_of_air_temperature_due_to_model_physics</data>
Expand Down
2 changes: 1 addition & 1 deletion src/dynamics/mpas/dyn_comp.F90
Original file line number Diff line number Diff line change
Expand Up @@ -976,8 +976,8 @@ subroutine mark_variable_as_initialized()

! These energy variables are calculated by check_energy_timestep_init
! but need to be marked here
call mark_as_initialized('vertically_integrated_total_energy_at_end_of_physics_timestep')
call mark_as_initialized('vertically_integrated_total_energy_using_dycore_energy_formula')
call mark_as_initialized('vertically_integrated_total_energy_using_dycore_energy_formula_at_end_of_physics_timestep')
call mark_as_initialized('vertically_integrated_total_energy_using_dycore_energy_formula_at_start_of_physics_timestep')
call mark_as_initialized('vertically_integrated_total_energy_using_physics_energy_formula')
call mark_as_initialized('vertically_integrated_total_energy_using_physics_energy_formula_at_start_of_physics_timestep')
Expand Down
2 changes: 1 addition & 1 deletion src/dynamics/none/dyn_grid.F90
Original file line number Diff line number Diff line change
Expand Up @@ -703,7 +703,7 @@ subroutine find_energy_formula(file, grid_is_latlon)
call mark_as_initialized("vertically_integrated_total_energy_using_dycore_energy_formula")
call mark_as_initialized("vertically_integrated_total_water_at_start_of_physics_timestep")
call mark_as_initialized("vertically_integrated_total_water")
call mark_as_initialized("vertically_integrated_total_energy_at_end_of_physics_timestep")
call mark_as_initialized("vertically_integrated_total_energy_using_dycore_energy_formula_at_end_of_physics_timestep")

end subroutine find_energy_formula

Expand Down
2 changes: 1 addition & 1 deletion src/dynamics/se/dyn_comp.F90
Original file line number Diff line number Diff line change
Expand Up @@ -1873,7 +1873,7 @@ subroutine read_inidat(dyn_in)
call mark_as_initialized("vertically_integrated_total_energy_using_dycore_energy_formula")
call mark_as_initialized("vertically_integrated_total_water_at_start_of_physics_timestep")
call mark_as_initialized("vertically_integrated_total_water")
call mark_as_initialized("vertically_integrated_total_energy_at_end_of_physics_timestep")
call mark_as_initialized("vertically_integrated_total_energy_using_dycore_energy_formula_at_end_of_physics_timestep")

end subroutine read_inidat

Expand Down
Loading