Merge branch 'development' into hplin/hk_conv_rebase

ESCOMP · Feb 14, 2025 · f73b41d · f73b41d
2 parents dd09b41 + 8b4d541
commit f73b41d
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 9 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -20,7 +20,7 @@
 [submodule "ncar-physics"]
         path          = src/physics/ncar_ccpp
 	url           = https://github.com/jimmielin/atmospheric_physics
-	fxtag         = 1564399165ad6ffb71c19d04d60d611cf226727b
+	fxtag         = 414b6a69112b3955db85469cbc56059c32419ba5
         fxrequired    = AlwaysRequired
         fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics
 [submodule "ccs_config"]

diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq_kessler_derecho/shell_commands b/cime_config/testdefs/testmods_dirs/cam/outfrq_kessler_derecho/shell_commands
@@ -1 +1 @@
- ./xmlchange CAM_CONFIG_OPTS="--dyn none --physics-suites kessler"
+ ./xmlchange CAM_CONFIG_OPTS="--dyn none --physics-suites kessler_test"
diff --git a/src/data/registry.xml b/src/data/registry.xml
@@ -328,7 +328,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>
@@ -415,7 +415,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>

diff --git a/src/dynamics/mpas/dyn_comp.F90 b/src/dynamics/mpas/dyn_comp.F90
@@ -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')

diff --git a/src/dynamics/none/dyn_grid.F90 b/src/dynamics/none/dyn_grid.F90
@@ -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
 

diff --git a/src/dynamics/se/dyn_comp.F90 b/src/dynamics/se/dyn_comp.F90
@@ -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
 

diff --git a/src/physics/ncar_ccpp b/src/physics/ncar_ccpp
diff --git a/test/existing-test-failures.txt b/test/existing-test-failures.txt
@@ -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)
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"
+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
+18 −0		schemes/hack_shallow/cmfmca.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 −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