Skip to content

Commit

Permalink
Update to head of atmos_phys with check_energy_fix_run arguments
Browse files Browse the repository at this point in the history
  • Loading branch information
jimmielin committed Dec 31, 2024
1 parent e56d13f commit bdb3b76
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
[submodule "atmos_phys"]
path = src/atmos_phys
url = https://github.com/ESCOMP/atmospheric_physics
fxtag = atmos_phys0_07_000
fxtag = 8e3d0bdff98ff70a4e815160ebd13a150c662a12
fxrequired = AlwaysRequired
fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics

Expand Down
2 changes: 1 addition & 1 deletion src/atmos_phys
Submodule atmos_phys updated 51 files
+19 −11 doc/NamesNotInDictionary.txt
+6 −0 schemes/check_energy/check_energy_chng.F90
+7 −1 schemes/check_energy/check_energy_fix.F90
+12 −0 schemes/check_energy/check_energy_fix.meta
+8 −1 schemes/check_energy/check_energy_gmean/check_energy_gmean.F90
+12 −0 schemes/check_energy/check_energy_gmean/check_energy_gmean.meta
+6 −1 schemes/check_energy/check_energy_save_teout.F90
+12 −0 schemes/check_energy/check_energy_save_teout.meta
+6 −1 schemes/check_energy/check_energy_zero_fluxes.F90
+12 −0 schemes/check_energy/check_energy_zero_fluxes.meta
+8 −2 schemes/check_energy/dycore_energy_consistency_adjust.F90
+12 −0 schemes/check_energy/dycore_energy_consistency_adjust.meta
+1 −0 schemes/dry_adiabatic_adjust/dadadj.meta
+0 −33 schemes/dry_adiabatic_adjust/dadadj_apply_qv_tendency.F90
+0 −42 schemes/dry_adiabatic_adjust/dadadj_apply_qv_tendency.meta
+1 −1 schemes/held_suarez/held_suarez_1994.meta
+9 −4 schemes/musica/micm/musica_ccpp_micm.F90
+74 −27 schemes/musica/musica_ccpp.F90
+57 −21 schemes/musica/musica_ccpp.meta
+15 −3 schemes/musica/musica_ccpp_namelist.xml
+5 −0 schemes/musica/musica_ccpp_util.F90
+335 −122 schemes/musica/tuvx/musica_ccpp_tuvx.F90
+127 −0 schemes/musica/tuvx/musica_ccpp_tuvx_cloud_optics.F90
+110 −0 schemes/musica/tuvx/musica_ccpp_tuvx_extraterrestrial_flux.F90
+10 −11 schemes/musica/tuvx/musica_ccpp_tuvx_surface_albedo.F90
+3 −4 schemes/musica/tuvx/musica_ccpp_tuvx_temperature.F90
+0 −55 schemes/musica/tuvx/musica_ccpp_tuvx_util.F90
+4 −1 schemes/musica/tuvx/musica_ccpp_tuvx_wavelength_grid.F90
+3 −3 schemes/tj2016/tj2016_sfc_pbl_hs.meta
+5 −5 schemes/tropopause_find/tropopause_find.meta
+38 −4 schemes/utilities/physics_tendency_updaters.F90
+53 −4 schemes/utilities/physics_tendency_updaters.meta
+1 −1 schemes/utilities/state_converters.meta
+12 −10 test/CMakeLists.txt
+23 −21 test/docker/Dockerfile.musica
+12 −9 test/docker/Dockerfile.musica.no_install
+12 −5 test/musica/CMakeLists.txt
+2 −1 test/musica/musica_ccpp_namelist.F90
+162 −86 test/musica/test_musica_api.F90
+62 −1 test/musica/tuvx/CMakeLists.txt
+0 −2,061 test/musica/tuvx/configs/ts1_tsmlt.json
+115 −0 test/musica/tuvx/test_tuvx_cloud_optics.F90
+67 −0 test/musica/tuvx/test_tuvx_extraterrestrial_flux.F90
+155 −0 test/test_schemes/initialize_constituents.F90
+44 −0 test/test_schemes/initialize_constituents.meta
+1 −1 test/test_suites/suite_dry_adiabatic_adjust.xml
+2 −0 test/test_suites/suite_tj2016_precip.xml
+2 −0 test/test_suites/suite_tj2016_sfc_pbl_hs.xml
+43 −0 test/valgrind.supp
+5 −5 to_be_ccppized/ccpp_const_utils.F90
+91 −0 to_be_ccppized/ccpp_tuvx_utils.F90
21 changes: 13 additions & 8 deletions src/physics/cam/check_energy.F90
Original file line number Diff line number Diff line change
Expand Up @@ -877,6 +877,9 @@ subroutine check_energy_cam_fix(state, ptend, nstep, eshflx)
real(r8) :: heat_out(pcols)
character(len=64) :: dummy_scheme_name ! dummy scheme name for CCPP-ized scheme

integer :: errflg
character(len=512) :: errmsg

lchnk = state%lchnk
ncol = state%ncol

Expand Down Expand Up @@ -904,14 +907,16 @@ subroutine check_energy_cam_fix(state, ptend, nstep, eshflx)
! Call the CCPP-ized subroutine (for non-SCAM)
! to compute the effective sensible heat flux and save to ptend%s
call check_energy_fix_run( &
ncol = ncol, &
pver = pver, &
pint = state%pint(:ncol,:), &
gravit = gravit, &
heat_glob = heat_glob, &
ptend_s = ptend%s(:ncol,:), &
eshflx = eshflx(:ncol), &
scheme_name = dummy_scheme_name &
ncol = ncol, &
pver = pver, &
pint = state%pint(:ncol,:), &
gravit = gravit, &
heat_glob = heat_glob, &
ptend_s = ptend%s(:ncol,:), &
eshflx = eshflx(:ncol), &
scheme_name = dummy_scheme_name, &
errmsg = errmsg, &
errflg = errflg &
)

end subroutine check_energy_cam_fix
Expand Down

0 comments on commit bdb3b76

Please sign in to comment.