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.

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

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

Merged
merged 8 commits into from
Feb 14, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9eac203
Update teout standard name for check_energy
jimmielin Dec 16, 2024
0ed78b9
Merge branch 'development' into hplin/check_energy_diags
jimmielin Jan 24, 2025
d4a8a67
Merge branch 'development' into hplin/check_energy_diags
jimmielin Feb 14, 2025
fd18773
Update atmospheric_physics to latest development (diags for check_ene…
jimmielin Feb 14, 2025
9b42399
Update existing test failures (CAM7 will have missing pblh)
jimmielin Feb 14, 2025
c5d0f0e
Use kessler_test SDF instead of kessler which includes after_coupler
jimmielin Feb 14, 2025
2786a2f
Finalize atmos_phys tag. Note derecho/gnu FCAM7 pre-existing failure.
jimmielin Feb 14, 2025
40a30a5
Finalize submodule
jimmielin Feb 14, 2025
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
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
[submodule "ncar-physics"]
path = src/physics/ncar_ccpp
url = https://github.com/ESCOMP/atmospheric_physics
fxtag = atmos_phys0_08_000
fxtag = 252b500a93c89f36ece7d8ba08fd8eb025279eaa
fxrequired = AlwaysRequired
fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics
[submodule "ccs_config"]
Expand Down
2 changes: 1 addition & 1 deletion cime_config/testdefs/testmods_dirs/cam/outfrq_kessler_derecho/shell_commands
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
./xmlchange CAM_CONFIG_OPTS="--dyn none --physics-suites kessler"
./xmlchange CAM_CONFIG_OPTS="--dyn none --physics-suites kessler_test"
4 changes: 2 additions & 2 deletions src/data/registry.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,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 @@ -343,7 +343,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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1072,8 +1072,8 @@ subroutine mark_variables_as_initialized()
! While we are not responsible for initializing or updating them, we still need to help mark them as initialized.

! These variables are to be set externally by the `check_energy_chng` CCPP physics scheme.
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
View file
Open in desktop
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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion src/physics/ncar_ccpp
Open in desktop
Submodule ncar_ccpp updated 26 files
+205 −203 doc/NamesNotInDictionary.txt
+1 −1 schemes/check_energy/check_energy_chng.meta
+2 −2 schemes/check_energy/check_energy_gmean/check_energy_gmean.meta
+1 −1 schemes/check_energy/check_energy_save_teout.meta
+12 −12 schemes/musica/musica_ccpp.F90
+7 −2 schemes/musica/musica_ccpp.meta
+3 −3 schemes/musica/musica_ccpp_namelist.xml
+12 −11 schemes/musica/tuvx/musica_ccpp_tuvx.F90
+3 −3 schemes/musica/tuvx/musica_ccpp_tuvx_surface_albedo.F90
+2 −9 schemes/sima_diagnostics/check_energy_diagnostics.F90
+0 −12 schemes/sima_diagnostics/check_energy_diagnostics.meta
+73 −0 schemes/sima_diagnostics/check_energy_fix_diagnostics.F90
+59 −0 schemes/sima_diagnostics/check_energy_fix_diagnostics.meta
+1 −1 schemes/sima_diagnostics/check_energy_gmean_diagnostics.meta
+66 −2 schemes/sima_diagnostics/sima_state_diagnostics.F90
+50 −0 schemes/thermo_water_update/thermo_water_update.F90
+50 −0 schemes/thermo_water_update/thermo_water_update.meta
+7 −3 suites/suite_adiabatic.xml
+0 −202 suites/suite_cam4.xml
+0 −364 suites/suite_cam6.xml
+0 −379 suites/suite_cam6_silhs.xml
+10 −3 suites/suite_cam7.xml
+4 −0 suites/suite_kessler.xml
+3 −0 suites/suite_tj2016.xml
+6 −6 test/musica/test_musica_api.F90
+24 −0 test/test_suites/suite_kessler_test.xml
5 changes: 4 additions & 1 deletion test/existing-test-failures.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
All clear!
SMS_Ln9.ne5pg3_ne5pg3_mg37.FCAM7.derecho_intel.cam-outfrq_se_cslam_analy_ic (Overall: FAIL) details:
SMS_Ln9.ne5pg3_ne5pg3_mg37.FCAM7.derecho_gnu.cam-outfrq_se_cslam_analy_ic (Overall: FAIL) details:
- CAM7 suite will not work without a PBL scheme
- CAM7 suite will not work with snapshot fields in registry.xml even if initial_value is defined (CAM-SIMA#359)