Skip to content

cam6_4_168: Mini misc tag: ZM reserved ice cleanup; zmconv_tiedtke_add typo; HEMCO_CESM external update; ccpp_scheme_utils stub update #1536

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

Merged
jimmielin merged 12 commits into from
Apr 24, 2026
Merged

cam6_4_168: Mini misc tag: ZM reserved ice cleanup; zmconv_tiedtke_add typo; HEMCO_CESM external update; ccpp_scheme_utils stub update #1536

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
951ae99
draft for removing rice - needs atmos_phys update
jimmielin Apr 10, 2026
92ebb57
Correct spelling of Tiedtke in zmconv_tiedtke_add
jimmielin Apr 15, 2026
a68808b
update hemco_cesm to hemco-cesm2_3_0_hemco3_10_3
jimmielin Apr 15, 2026
d071951
Remove rice from physpkg
jimmielin Apr 15, 2026
90cd675
Update ccpp_constituent_prop_mod.F90 stub
jimmielin Apr 21, 2026
c89887a
Update ccpp_scheme_utils stub; allow numliq/numice/cldliq/cldice and …
jimmielin Apr 22, 2026
4f22abc
Merge branch 'cam_development' into hplin/remove_rice
jimmielin Apr 22, 2026
4d40349
GPU ERS restart fix (closes #1540)
jimmielin Apr 22, 2026
64d4854
Update atmos_phys to atmos_phys0_21_002
jimmielin Apr 23, 2026
52ceb48
Merge branch 'cam_development' into hplin/remove_rice
jimmielin Apr 23, 2026
0d12ef6
Update SILHS testmods for CLUBB
jimmielin Apr 24, 2026
c969f7a
Finalize ChangeLog for cam6_4_168.
jimmielin Apr 24, 2026
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 .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
[submodule "atmos_phys"]
path = src/atmos_phys
url = https://github.com/ESCOMP/atmospheric_physics
fxtag = atmos_phys0_21_000
fxtag = atmos_phys0_21_002
fxrequired = AlwaysRequired
fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics

Expand Down Expand Up @@ -72,7 +72,7 @@
[submodule "hemco"]
path = src/hemco
url = https://github.com/ESCOMP/HEMCO_CESM.git
fxtag = hemco-cesm2_2_0_hemco3_10_3
fxtag = hemco-cesm2_3_0_hemco3_10_3
fxrequired = AlwaysRequired
fxDONOTUSEurl = https://github.com/ESCOMP/HEMCO_CESM.git

Expand Down
2 changes: 1 addition & 1 deletion bld/build-namelist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3783,7 +3783,7 @@ if (!$simple_phys) {
add_default($nl, 'zmconv_ke_lnd');
add_default($nl, 'zmconv_num_cin');
add_default($nl, 'zmconv_dmpdz');
add_default($nl, 'zmconv_tiedke_add');
add_default($nl, 'zmconv_tiedtke_add');
add_default($nl, 'zmconv_capelmt');
add_default($nl, 'zmconv_tau');
add_default($nl, 'zmconv_parcel_hscale');
Expand Down
2 changes: 1 addition & 1 deletion bld/namelist_files/namelist_defaults_cam.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2919,7 +2919,7 @@
<zmconv_num_cin phys="cam7" > 1 </zmconv_num_cin>

<zmconv_dmpdz > -1.0E-3 </zmconv_dmpdz>
<zmconv_tiedke_add > 0.5 </zmconv_tiedke_add>
<zmconv_tiedtke_add > 0.5 </zmconv_tiedtke_add>
<zmconv_capelmt > 70.0 </zmconv_capelmt>
<zmconv_tau > 3600.0 </zmconv_tau>

Expand Down
2 changes: 1 addition & 1 deletion bld/namelist_files/namelist_definition.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3206,7 +3206,7 @@ Tunable entrainment rate in ZM deep convection scheme in units of (m-1).
Default: -1.0e-3 m-1
</entry>

<entry id="zmconv_tiedke_add" type="real" category="conv"
<entry id="zmconv_tiedtke_add" type="real" category="conv"
group="zmconv_nl" valid_values="" >
Tunable parcel temperature perturbation in ZM deep convection scheme in units of (K).
Default: 0.5K perturbation
Expand Down
2 changes: 1 addition & 1 deletion src/atmos_phys
Open in desktop
Submodule atmos_phys updated 65 files
+1 −0 .gitattributes
+1 −1 .github/workflows/unit-tests.yaml
+1 −1 .gitmodules
+331 −0 schemes/chemistry/prescribed_aerosol_deposition_flux.F90
+215 −0 schemes/chemistry/prescribed_aerosol_deposition_flux.meta
+202 −0 schemes/chemistry/prescribed_aerosol_deposition_flux_namelist.xml
+656 −0 schemes/chemistry/prescribed_aerosols.F90
+246 −0 schemes/chemistry/prescribed_aerosols.meta
+230 −0 schemes/chemistry/prescribed_aerosols_namelist.xml
+260 −0 schemes/chemistry/prescribed_ozone.F90
+210 −0 schemes/chemistry/prescribed_ozone.meta
+192 −0 schemes/chemistry/prescribed_ozone_namelist.xml
+4 −4 schemes/gravity_wave_drag/gravity_wave_drag_convection.F90
+9 −9 schemes/gravity_wave_drag/gravity_wave_drag_convection.meta
+4 −4 schemes/gravity_wave_drag/gravity_wave_drag_frontogenesis.F90
+2 −2 schemes/gravity_wave_drag/gravity_wave_drag_frontogenesis.meta
+5 −5 schemes/gravity_wave_drag/gravity_wave_drag_moving_mountain.meta
+2 −2 schemes/gravity_wave_drag/gravity_wave_drag_orographic.F90
+2 −2 schemes/gravity_wave_drag/gravity_wave_drag_orographic.meta
+8 −6 schemes/mmm/CMakeLists.txt
+21 −6 schemes/mmm/cu_ntiedtke_compat.F90
+1 −19 schemes/mmm/cu_ntiedtke_compat.meta
+1 −1 schemes/mmm/mmm_physics
+46 −3 schemes/mmm/mmm_physics_compat.F90
+72 −0 schemes/mmm/mmm_physics_compat.meta
+541 −0 schemes/mmm/sf_mynn_compat.F90
+982 −0 schemes/mmm/sf_mynn_compat.meta
+7 −1 schemes/rrtmgp/objects/ccpp_gas_optics_rrtmgp.meta
+3 −0 schemes/rrtmgp/rrtmgp_constituents.F90
+5 −0 schemes/rrtmgp/rrtmgp_lw_cloud_optics.meta
+6 −0 schemes/rrtmgp/rrtmgp_lw_gas_optics.meta
+5 −1 schemes/rrtmgp/rrtmgp_lw_rte.meta
+6 −0 schemes/rrtmgp/rrtmgp_sw_gas_optics.meta
+5 −1 schemes/rrtmgp/rrtmgp_sw_rte.meta
+56 −2 schemes/sima_diagnostics/gravity_wave_drag_common_diagnostics.F90
+36 −0 schemes/sima_diagnostics/gravity_wave_drag_common_diagnostics.meta
+103 −0 schemes/sima_diagnostics/gravity_wave_drag_convection_deep_diagnostics.F90
+113 −0 schemes/sima_diagnostics/gravity_wave_drag_convection_deep_diagnostics.meta
+127 −0 schemes/sima_diagnostics/gravity_wave_drag_frontogenesis_diagnostics.F90
+137 −0 schemes/sima_diagnostics/gravity_wave_drag_frontogenesis_diagnostics.meta
+126 −0 schemes/sima_diagnostics/gravity_wave_drag_moving_mountain_diagnostics.F90
+161 −0 schemes/sima_diagnostics/gravity_wave_drag_moving_mountain_diagnostics.meta
+92 −0 schemes/sima_diagnostics/gravity_wave_drag_orographic_diagnostics.F90
+89 −0 schemes/sima_diagnostics/gravity_wave_drag_orographic_diagnostics.meta
+108 −0 schemes/sima_diagnostics/gravity_wave_drag_ridge_beta_diagnostics.F90
+113 −0 schemes/sima_diagnostics/gravity_wave_drag_ridge_beta_diagnostics.meta
+55 −2 schemes/utilities/state_converters.F90
+88 −0 schemes/utilities/state_converters.meta
+0 −1 schemes/zhang_mcfarlane/zm_conv_evap.F90
+3 −3 schemes/zhang_mcfarlane/zm_conv_options.F90
+1 −1 schemes/zhang_mcfarlane/zm_conv_options.meta
+1 −1 schemes/zhang_mcfarlane/zm_conv_options_namelist.xml
+8 −44 schemes/zhang_mcfarlane/zm_convr.F90
+1 −13 schemes/zhang_mcfarlane/zm_convr.meta
+1 −0 suites/suite_cam4.xml
+4 −0 suites/suite_cam7.xml
+14 −1 test/test_schemes/initialize_constituents.F90
+11 −0 test/test_suites/suite_convection_permitting.xml
+1 −0 test/test_suites/suite_gw_cam4.xml
+4 −0 test/test_suites/suite_gw_cam7_se.xml
+14 −0 test/test_suites/suite_tracer_data_test.xml
+6 −0 test/unit-test/tests/mmm/CMakeLists.txt
+65 −2 test/unit-test/tests/mmm/mmm_physics_compat_tests.pf
+60 −0 test/unit-test/tests/utilities/test_state_converters.pf
+44 −0 to_be_ccppized/ccpp_chem_utils.F90
2 changes: 1 addition & 1 deletion src/hemco
Open in desktop
Submodule hemco updated 5 files
+4 −0 CHANGELOG.md
+8 −10 hco_cam_convert_state_mod.F90
+1 −1 hco_cam_exports.F90
+2 −4 hco_esmf_grid.F90
+51 −244 hemco_interface.F90
10 changes: 1 addition & 9 deletions src/physics/cam/cam_snapshot.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ subroutine cam_snapshot_init(cam_in_arr, cam_out_arr, pbuf, index)
end subroutine cam_snapshot_init

subroutine cam_snapshot_all_outfld_tphysbc(file_num, state, tend, cam_in, cam_out, pbuf, flx_heat, cmfmc, cmfcme, &
zdu, rliq, rice, dlf, dlf2, rliq2, det_s, det_ice, net_flx)
zdu, rliq, dlf, dlf2, rliq2, det_s, det_ice, net_flx)

use time_manager, only: is_first_step, is_first_restart_step

Expand All @@ -97,7 +97,6 @@ subroutine cam_snapshot_all_outfld_tphysbc(file_num, state, tend, cam_in, cam_ou
real(r8), intent(in) :: cmfcme(:,:) ! cmf condensation - evaporation
real(r8), intent(in) :: zdu(:,:) ! detraining mass flux from deep convection
real(r8), intent(in) :: rliq(:) ! vertical integral of liquid not yet in q(ixcldliq)
real(r8), intent(in) :: rice(:) ! vertical integral of ice not yet in q(ixcldice)
real(r8), intent(in) :: dlf(:,:) ! local copy of DLFZM (copy so need to output)
real(r8), intent(in) :: dlf2(:,:) ! Detraining cld H20 from shallow convections
real(r8), intent(in) :: rliq2(:) ! vertical integral of liquid from shallow scheme
Expand Down Expand Up @@ -135,10 +134,6 @@ subroutine cam_snapshot_all_outfld_tphysbc(file_num, state, tend, cam_in, cam_ou
call outfld('tphysbc_rliq', rliq, pcols, lchnk)
call cam_history_snapshot_deactivate('tphysbc_rliq')

call cam_history_snapshot_activate('tphysbc_rice', file_num)
call outfld('tphysbc_rice', rice, pcols, lchnk)
call cam_history_snapshot_deactivate('tphysbc_rice')

call cam_history_snapshot_activate('tphysbc_dlf', file_num)
call outfld('tphysbc_dlf', dlf, pcols, lchnk)
call cam_history_snapshot_deactivate('tphysbc_dlf')
Expand Down Expand Up @@ -250,9 +245,6 @@ subroutine cam_tphysbc_snapshot_init(cam_snapshot_before_num, cam_snapshot_after
call snapshot_addfld( ntphysbc_var, tphysbc_snapshot, cam_snapshot_before_num, cam_snapshot_after_num, &
'rliq', 'tphysbc_rliq', 'unset', horiz_only)

call snapshot_addfld( ntphysbc_var, tphysbc_snapshot, cam_snapshot_before_num, cam_snapshot_after_num, &
'rice', 'tphysbc_rice', 'unset', horiz_only)

call snapshot_addfld( ntphysbc_var, tphysbc_snapshot, cam_snapshot_before_num, cam_snapshot_after_num, &
'dlf', 'tphysbc_dlf', 'unset', 'lev')

Expand Down
3 changes: 2 additions & 1 deletion src/physics/cam/clubb_intr.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2809,6 +2809,7 @@ subroutine clubb_tend_cam( state, ptend_all, pbuf, hdtime, &
!$acc copyout( clubb_s, clubbtop_pbuf, &
!$acc qclvar, wprcp, rcm_in_layer, rcm, cloud_frac, thlm, rtm, &
!$acc um, vm, wm_zt, exner, zt_g, zi_g, invrs_cpairv, &
!$acc rho_zm, rho_zt, &
!$acc pdf_params_chnk(lchnk)%rt_1, pdf_params_chnk(lchnk)%rt_2, &
!$acc pdf_params_chnk(lchnk)%varnce_rt_1, pdf_params_chnk(lchnk)%varnce_rt_2, &
!$acc pdf_params_chnk(lchnk)%mixt_frac ) &
Expand All @@ -2824,7 +2825,7 @@ subroutine clubb_tend_cam( state, ptend_all, pbuf, hdtime, &
!$acc vm_forcing, wprtp_forcing, wpthlp_forcing, rtp2_forcing, thlp2_forcing, &
!$acc rtpthlp_forcing, wm_zm, wpthlp_sfc, wprtp_sfc, upwp_sfc, vpwp_sfc, invrs_dz_g, &
!$acc p_sfc, upwp_sfc_pert, vpwp_sfc_pert, rtm_ref, thlm_ref, um_ref, vm_ref, &
!$acc ug, vg, p_in_Pa, rho_zm, rho_zt, rho_ds_zm, rho_ds_zt, invrs_rho_ds_zm, &
!$acc ug, vg, p_in_Pa, rho_ds_zm, rho_ds_zt, invrs_rho_ds_zm, &
!$acc invrs_rho_ds_zt, thv_ds_zm, thv_ds_zt, rfrzm, clubb_params, deltaz, err_info%err_code, &
!$acc pdf_params_chnk(lchnk)%w_1, pdf_params_chnk(lchnk)%w_2, &
!$acc pdf_params_chnk(lchnk)%varnce_w_1, pdf_params_chnk(lchnk)%varnce_w_2, &
Expand Down
6 changes: 2 additions & 4 deletions src/physics/cam/convect_deep.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ end subroutine convect_deep_init
subroutine convect_deep_tend( &
mcon ,cme , &
zdu , &
rliq ,rice , &
rliq , &
ztodt , &
state ,ptend ,landfrac ,pbuf)

Expand Down Expand Up @@ -194,7 +194,6 @@ subroutine convect_deep_tend( &
real(r8), intent(out) :: zdu(pcols,pver) ! detraining mass flux

real(r8), intent(out) :: rliq(pcols) ! reserved liquid (not yet in cldliq) for energy integrals
real(r8), intent(out) :: rice(pcols) ! reserved ice (not yet in cldice) for energy integrals

real(r8), pointer :: prec(:) ! total precipitation
real(r8), pointer :: snow(:) ! snow from ZM convection
Expand Down Expand Up @@ -229,7 +228,6 @@ subroutine convect_deep_tend( &
cme = 0
zdu = 0
rliq = 0
rice = 0

call physics_ptend_init(ptend, state%psetcols, 'convect_deep')

Expand Down Expand Up @@ -261,7 +259,7 @@ subroutine convect_deep_tend( &

call zm_conv_tend( pblh ,mcon ,cme , &
tpert ,zdu , &
rliq ,rice , &
rliq , &
ztodt , &
jctop, jcbot , &
state ,ptend ,landfrac, pbuf)
Expand Down
46 changes: 21 additions & 25 deletions src/physics/cam/physpkg.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2289,7 +2289,6 @@ subroutine tphysbc (ztodt, state, &
real(r8) :: zero(pcols) ! array of zeros
real(r8) :: zero_sc(pcols*psubcols) ! array of zeros
real(r8) :: rliq(pcols) ! vertical integral of liquid not yet in q(ixcldliq)
real(r8) :: rice(pcols) ! vertical integral of ice not yet in q(ixcldice)
real(r8) :: rliq2(pcols) ! vertical integral of liquid from shallow scheme
real(r8) :: det_s (pcols) ! vertical integral of detrained static energy from ice
real(r8) :: det_ice(pcols) ! vertical integral of detrained ice
Expand Down Expand Up @@ -2387,7 +2386,6 @@ subroutine tphysbc (ztodt, state, &
cmfcme(:,:) = 0._r8
zdu(:,:) = 0._r8
rliq(:) = 0._r8
rice(:) = 0._r8
dlf(:,:) = 0._r8
dlf2(:,:) = 0._r8
rliq2(:) = 0._r8
Expand Down Expand Up @@ -2461,7 +2459,7 @@ subroutine tphysbc (ztodt, state, &

if (trim(cam_take_snapshot_before) == "dadadj_tend") then
call cam_snapshot_all_outfld_tphysbc(cam_snapshot_before_num, state, tend, cam_in, cam_out, pbuf, &
flx_heat, cmfmc, cmfcme, zdu, rliq, rice, dlf, dlf2, rliq2, det_s, det_ice, net_flx)
flx_heat, cmfmc, cmfcme, zdu, rliq, dlf, dlf2, rliq2, det_s, det_ice, net_flx)
end if

call dadadj_tend(ztodt, state, ptend)
Expand All @@ -2474,7 +2472,7 @@ subroutine tphysbc (ztodt, state, &

if (trim(cam_take_snapshot_after) == "dadadj_tend") then
call cam_snapshot_all_outfld_tphysbc(cam_snapshot_after_num, state, tend, cam_in, cam_out, pbuf, &
flx_heat, cmfmc, cmfcme, zdu, rliq, rice, dlf, dlf2, rliq2, det_s, det_ice, net_flx)
flx_heat, cmfmc, cmfcme, zdu, rliq, dlf, dlf2, rliq2, det_s, det_ice, net_flx)
end if

call t_stopf('dry_adjustment')
Expand All @@ -2488,13 +2486,13 @@ subroutine tphysbc (ztodt, state, &

if (trim(cam_take_snapshot_before) == "convect_deep_tend") then
call cam_snapshot_all_outfld_tphysbc(cam_snapshot_before_num, state, tend, cam_in, cam_out, pbuf, &
flx_heat, cmfmc, cmfcme, zdu, rliq, rice, dlf, dlf2, rliq2, det_s, det_ice, net_flx)
flx_heat, cmfmc, cmfcme, zdu, rliq, dlf, dlf2, rliq2, det_s, det_ice, net_flx)
end if

call convect_deep_tend( &
cmfmc, cmfcme, &
zdu, &
rliq, rice, &
rliq, &
ztodt, &
state, ptend, cam_in%landfrac, pbuf)

Expand All @@ -2513,7 +2511,7 @@ subroutine tphysbc (ztodt, state, &

if (trim(cam_take_snapshot_after) == "convect_deep_tend") then
call cam_snapshot_all_outfld_tphysbc(cam_snapshot_after_num, state, tend, cam_in, cam_out, pbuf, &
flx_heat, cmfmc, cmfcme, zdu, rliq, rice, dlf, dlf2, rliq2, det_s, det_ice, net_flx)
flx_heat, cmfmc, cmfcme, zdu, rliq, dlf, dlf2, rliq2, det_s, det_ice, net_flx)
end if

call t_stopf('convect_deep_tend')
Expand All @@ -2536,9 +2534,7 @@ subroutine tphysbc (ztodt, state, &

! Check energy integrals, including "reserved liquid"
flx_cnd(:ncol) = prec_dp(:ncol) + rliq(:ncol)
snow_dp(:ncol) = snow_dp(:ncol) + rice(:ncol)
call check_energy_cam_chng(state, tend, "convect_deep", nstep, ztodt, zero, flx_cnd, snow_dp, zero)
snow_dp(:ncol) = snow_dp(:ncol) - rice(:ncol)

!
! Call Hack (1994) convection scheme to deal with shallow/mid-level convection
Expand All @@ -2554,7 +2550,7 @@ subroutine tphysbc (ztodt, state, &

if (trim(cam_take_snapshot_before) == "convect_shallow_tend") then
call cam_snapshot_all_outfld_tphysbc(cam_snapshot_before_num, state, tend, cam_in, cam_out, pbuf, &
flx_heat, cmfmc, cmfcme, zdu, rliq, rice, dlf, dlf2, rliq2, det_s, det_ice, net_flx)
flx_heat, cmfmc, cmfcme, zdu, rliq, dlf, dlf2, rliq2, det_s, det_ice, net_flx)
end if

call convect_shallow_tend (ztodt , cmfmc, &
Expand All @@ -2578,7 +2574,7 @@ subroutine tphysbc (ztodt, state, &

if (trim(cam_take_snapshot_after) == "convect_shallow_tend") then
call cam_snapshot_all_outfld_tphysbc(cam_snapshot_after_num, state, tend, cam_in, cam_out, pbuf, &
flx_heat, cmfmc, cmfcme, zdu, rliq, rice, dlf, dlf2, rliq2, det_s, det_ice, net_flx)
flx_heat, cmfmc, cmfcme, zdu, rliq, dlf, dlf2, rliq2, det_s, det_ice, net_flx)
end if

flx_cnd(:ncol) = prec_sh(:ncol) + rliq2(:ncol)
Expand Down Expand Up @@ -2633,7 +2629,7 @@ subroutine tphysbc (ztodt, state, &

if (trim(cam_take_snapshot_before) == "rk_stratiform_tend") then
call cam_snapshot_all_outfld_tphysbc(cam_snapshot_before_num, state, tend, cam_in, cam_out, pbuf, &
flx_heat, cmfmc, cmfcme, zdu, rliq, rice, dlf, dlf2, rliq2, det_s, det_ice, net_flx)
flx_heat, cmfmc, cmfcme, zdu, rliq, dlf, dlf2, rliq2, det_s, det_ice, net_flx)
end if

call rk_stratiform_cam_tend(state, ptend, pbuf, ztodt, &
Expand All @@ -2653,7 +2649,7 @@ subroutine tphysbc (ztodt, state, &

if (trim(cam_take_snapshot_after) == "rk_stratiform_tend") then
call cam_snapshot_all_outfld_tphysbc(cam_snapshot_after_num, state, tend, cam_in, cam_out, pbuf, &
flx_heat, cmfmc, cmfcme, zdu, rliq, rice, dlf, dlf2, rliq2, det_s, det_ice, net_flx)
flx_heat, cmfmc, cmfcme, zdu, rliq, dlf, dlf2, rliq2, det_s, det_ice, net_flx)
end if

call check_energy_cam_chng(state, tend, "cldwat_tend", nstep, ztodt, zero, prec_str, snow_str, zero)
Expand Down Expand Up @@ -2694,7 +2690,7 @@ subroutine tphysbc (ztodt, state, &

if (trim(cam_take_snapshot_before) == "macrop_driver_tend") then
call cam_snapshot_all_outfld_tphysbc(cam_snapshot_before_num, state, tend, cam_in, cam_out, pbuf, &
flx_heat, cmfmc, cmfcme, zdu, rliq, rice, dlf, dlf2, rliq2, det_s, det_ice, net_flx)
flx_heat, cmfmc, cmfcme, zdu, rliq, dlf, dlf2, rliq2, det_s, det_ice, net_flx)
end if

call macrop_driver_tend( &
Expand Down Expand Up @@ -2725,7 +2721,7 @@ subroutine tphysbc (ztodt, state, &

if (trim(cam_take_snapshot_after) == "macrop_driver_tend") then
call cam_snapshot_all_outfld_tphysbc(cam_snapshot_after_num, state, tend, cam_in, cam_out, pbuf, &
flx_heat, cmfmc, cmfcme, zdu, rliq, rice, dlf, dlf2, rliq2, det_s, det_ice, net_flx)
flx_heat, cmfmc, cmfcme, zdu, rliq, dlf, dlf2, rliq2, det_s, det_ice, net_flx)
end if

call check_energy_cam_chng(state, tend, "macrop_tend", nstep, ztodt, &
Expand All @@ -2741,7 +2737,7 @@ subroutine tphysbc (ztodt, state, &

if (trim(cam_take_snapshot_before) == "clubb_tend_cam") then
call cam_snapshot_all_outfld_tphysbc(cam_snapshot_before_num, state, tend, cam_in, cam_out, pbuf, &
flx_heat, cmfmc, cmfcme, zdu, rliq, rice, dlf, dlf2, rliq2, det_s, det_ice, net_flx)
flx_heat, cmfmc, cmfcme, zdu, rliq, dlf, dlf2, rliq2, det_s, det_ice, net_flx)
end if

call clubb_tend_cam(state, ptend, pbuf, cld_macmic_ztodt,&
Expand Down Expand Up @@ -2771,7 +2767,7 @@ subroutine tphysbc (ztodt, state, &

if (trim(cam_take_snapshot_after) == "clubb_tend_cam") then
call cam_snapshot_all_outfld_tphysbc(cam_snapshot_after_num, state, tend, cam_in, cam_out, pbuf, &
flx_heat, cmfmc, cmfcme, zdu, rliq, rice, dlf, dlf2, rliq2, det_s, det_ice, net_flx)
flx_heat, cmfmc, cmfcme, zdu, rliq, dlf, dlf2, rliq2, det_s, det_ice, net_flx)
end if

! Use actual qflux (not lhf/latvap) for consistency with surface fluxes and revised code
Expand Down Expand Up @@ -2808,7 +2804,7 @@ subroutine tphysbc (ztodt, state, &

if (trim(cam_take_snapshot_before) == "microp_section") then
call cam_snapshot_all_outfld_tphysbc(cam_snapshot_before_num, state, tend, cam_in, cam_out, pbuf, &
flx_heat, cmfmc, cmfcme, zdu, rliq, rice, dlf, dlf2, rliq2, det_s, det_ice, net_flx)
flx_heat, cmfmc, cmfcme, zdu, rliq, dlf, dlf2, rliq2, det_s, det_ice, net_flx)
end if

call carma_diags_obj%update(cam_in, state, pbuf)
Expand All @@ -2823,7 +2819,7 @@ subroutine tphysbc (ztodt, state, &

if (trim(cam_take_snapshot_before) == "microp_driver_tend_subcol") then
call cam_snapshot_all_outfld_tphysbc(cam_snapshot_before_num, state_sc, tend_sc, cam_in, cam_out, pbuf, &
flx_heat, cmfmc, cmfcme, zdu, rliq, rice, dlf, dlf2, rliq2, det_s, det_ice, net_flx)
flx_heat, cmfmc, cmfcme, zdu, rliq, dlf, dlf2, rliq2, det_s, det_ice, net_flx)
end if

call microp_driver_tend(state_sc, ptend_sc, cld_macmic_ztodt, pbuf)
Expand Down Expand Up @@ -2875,7 +2871,7 @@ subroutine tphysbc (ztodt, state, &

if (trim(cam_take_snapshot_after) == "microp_driver_tend_subcol") then
call cam_snapshot_all_outfld_tphysbc(cam_snapshot_after_num, state_sc, tend_sc, cam_in, cam_out, pbuf, &
flx_heat, cmfmc, cmfcme, zdu, rliq, rice, dlf, dlf2, rliq2, det_s, det_ice, net_flx)
flx_heat, cmfmc, cmfcme, zdu, rliq, dlf, dlf2, rliq2, det_s, det_ice, net_flx)
end if

call check_energy_cam_chng(state_sc, tend_sc, "microp_tend_subcol", &
Expand Down Expand Up @@ -2912,7 +2908,7 @@ subroutine tphysbc (ztodt, state, &

if (trim(cam_take_snapshot_after) == "microp_section") then
call cam_snapshot_all_outfld_tphysbc(cam_snapshot_after_num, state, tend, cam_in, cam_out, pbuf, &
flx_heat, cmfmc, cmfcme, zdu, rliq, rice, dlf, dlf2, rliq2, det_s, det_ice, net_flx)
flx_heat, cmfmc, cmfcme, zdu, rliq, dlf, dlf2, rliq2, det_s, det_ice, net_flx)
end if

call check_energy_cam_chng(state, tend, "microp_tend", nstep, ztodt, &
Expand Down Expand Up @@ -2988,7 +2984,7 @@ subroutine tphysbc (ztodt, state, &

if (trim(cam_take_snapshot_before) == "aero_model_wetdep") then
call cam_snapshot_all_outfld_tphysbc(cam_snapshot_before_num, state, tend, cam_in, cam_out, pbuf, &
flx_heat, cmfmc, cmfcme, zdu, rliq, rice, dlf, dlf2, rliq2, det_s, det_ice, net_flx)
flx_heat, cmfmc, cmfcme, zdu, rliq, dlf, dlf2, rliq2, det_s, det_ice, net_flx)
end if

call carma_diags_obj%update(cam_in, state, pbuf)
Expand All @@ -3003,7 +2999,7 @@ subroutine tphysbc (ztodt, state, &

if (trim(cam_take_snapshot_after) == "aero_model_wetdep") then
call cam_snapshot_all_outfld_tphysbc(cam_snapshot_after_num, state, tend, cam_in, cam_out, pbuf, &
flx_heat, cmfmc, cmfcme, zdu, rliq, rice, dlf, dlf2, rliq2, det_s, det_ice, net_flx)
flx_heat, cmfmc, cmfcme, zdu, rliq, dlf, dlf2, rliq2, det_s, det_ice, net_flx)
end if

if (carma_do_wetdep) then
Expand Down Expand Up @@ -3060,7 +3056,7 @@ subroutine tphysbc (ztodt, state, &

if (trim(cam_take_snapshot_before) == "radiation_tend") then
call cam_snapshot_all_outfld_tphysbc(cam_snapshot_before_num, state, tend, cam_in, cam_out, pbuf, &
flx_heat, cmfmc, cmfcme, zdu, rliq, rice, dlf, dlf2, rliq2, det_s, det_ice, net_flx)
flx_heat, cmfmc, cmfcme, zdu, rliq, dlf, dlf2, rliq2, det_s, det_ice, net_flx)
end if

call radiation_tend( &
Expand All @@ -3079,7 +3075,7 @@ subroutine tphysbc (ztodt, state, &

if (trim(cam_take_snapshot_after) == "radiation_tend") then
call cam_snapshot_all_outfld_tphysbc(cam_snapshot_after_num, state, tend, cam_in, cam_out, pbuf, &
flx_heat, cmfmc, cmfcme, zdu, rliq, rice, dlf, dlf2, rliq2, det_s, det_ice, net_flx)
flx_heat, cmfmc, cmfcme, zdu, rliq, dlf, dlf2, rliq2, det_s, det_ice, net_flx)
end if

call check_energy_cam_chng(state, tend, "radheat", nstep, ztodt, zero, zero, zero, net_flx)
Expand Down
Loading
Loading