Skip to content

Modifications for bringing in PUMAS round3 ccpp'ization #1600

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

Open
cacraigucar wants to merge 6 commits into
base: cam_development
Choose a base branch
from
Open

Modifications for bringing in PUMAS round3 ccpp'ization #1600

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b8c1e01
Mod to update PUMAS round3 in CAM
cacraigucar Jun 25, 2026
bba10bd
Update atmos_phys hash
cacraigucar Jun 25, 2026
07fefb0
Fix indavertent commit and add pumas_tend snapshot
cacraigucar Jun 26, 2026
a201ea4
Address review comments
cacraigucar Jun 29, 2026
39fb638
Merge tag 'cam6_4_189' into pumas_round3
cacraigucar Jul 21, 2026
e773b9c
Update pumas calling list
cacraigucar Jul 21, 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
6 changes: 3 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@

[submodule "atmos_phys"]
path = src/atmos_phys
url = https://github.com/ESCOMP/atmospheric_physics
fxtag = atmos_phys0_21_002
url = https://github.com/nusbaume/atmospheric_physics
fxtag = 2b7ecfa3
fxrequired = AlwaysRequired
fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics
fxDONOTUSEurl = https://github.com/nusbaume/atmospheric_physics

[submodule "cam-sima"]
path = src/utils/cam-sima
Expand Down
2 changes: 0 additions & 2 deletions src/physics/cam/physpkg.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -932,8 +932,6 @@ subroutine phys_init( phys_state, phys_tend, pbuf2d, cam_in, cam_out )
if (.not. do_clubb_sgs) call macrop_driver_init(pbuf2d)
call microp_aero_init(phys_state,pbuf2d)
call microp_driver_init(pbuf2d)
call conv_water_init
end if
Comment thread
jimmielin marked this conversation as resolved.

! initiate CLUBB within CAM
if (do_clubb_sgs) call clubb_ini_cam(pbuf2d)
Expand Down
4 changes: 3 additions & 1 deletion src/physics/cam7/micro_pumas_cam.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2474,7 +2474,9 @@ subroutine micro_pumas_cam_tend(state, ptend, dtime, pbuf)
tnd_qsnow(:ncol,top_lev:), tnd_nsnow(:ncol,top_lev:), &
re_ice(:ncol,top_lev:), &
frzimm(:ncol,top_lev:), frzcnt(:ncol,top_lev:), &
frzdep(:ncol,top_lev:), rate1cld(:ncol,top_lev:), &
frzdep(:ncol,top_lev:), &
micro_mg_warm_rain, &
rate1cld(:ncol,top_lev:), &
tlat(:ncol,top_lev:), qvlat(:ncol,top_lev:), &
qcten(:ncol,top_lev:), qiten(:ncol,top_lev:), &
ncten(:ncol,top_lev:), niten(:ncol,top_lev:), &
Expand Down
10 changes: 5 additions & 5 deletions src/physics/cam7/physpkg.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1837,17 +1837,17 @@ subroutine tphysac (ztodt, cam_in, &
call check_energy_timestep_init(state_sc, tend_sc, pbuf, col_type_subcol)
end if

if (trim(cam_take_snapshot_before) == "microp_section") then
call cam_snapshot_all_outfld_tphysac(cam_snapshot_before_num, state, tend, cam_in, cam_out, pbuf, &
fh2o, surfric, obklen, flx_heat, cmfmc, dlf, det_s, det_ice, net_flx)
end if

call t_startf('microp_aero_run')
call microp_aero_run(state, ptend_aero, cld_macmic_ztodt, pbuf)
call t_stopf('microp_aero_run')

call t_startf('microp_tend')

if (trim(cam_take_snapshot_before) == "microp_section") then
call cam_snapshot_all_outfld_tphysac(cam_snapshot_before_num, state, tend, cam_in, cam_out, pbuf, &
fh2o, surfric, obklen, flx_heat, cmfmc, dlf, det_s, det_ice, net_flx)
end if

Comment thread
jimmielin marked this conversation as resolved.
Outdated
if (use_subcol_microp) then

if (trim(cam_take_snapshot_before) == "microp_driver_tend_subcol") then
Expand Down