Skip to content

Complete CCPPization of Holtslag-Boville PBL scheme and vertical diffusion solver #270

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
merged 56 commits into from
Sep 26, 2025
Merged

Complete CCPPization of Holtslag-Boville PBL scheme and vertical diffusion solver #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
8d6d697
Initial attempt to move hb_diff code into atmos_phys.
jimmielin May 8, 2025
95a3f9f
Add molecdiff-less diffusion solver to atmos_phys
jimmielin May 22, 2025
151e922
Merge branch 'development' into hplin/hb_diff
jimmielin May 23, 2025
ee5932d
Further separate out vertical_diffusion_compute
jimmielin May 28, 2025
8a09063
Remove unused code
jimmielin May 28, 2025
1596da9
Update metadata; add diffusion stubs; HB interstitials
jimmielin Jun 13, 2025
0b18d11
Merge branch 'development' into hplin/hb_diff
jimmielin Jun 13, 2025
abf34f9
Fill in more metadata for solver
jimmielin Jun 16, 2025
9c9e55f
Populate metadata; updated interstitial code; draft HB SDF
jimmielin Jun 17, 2025
cfdb4e5
Merge branch 'development' into hplin/hb_diff
jimmielin Jun 17, 2025
b2c4f45
Fix metadata definitions
jimmielin Jun 17, 2025
321488f
Merge branch 'development' into hplin/hb_diff
jimmielin Jun 18, 2025
3db5130
Fix metadata definitions
jimmielin Jun 20, 2025
3c8f85d
Move namelist options to separate schemes
jimmielin Jun 23, 2025
974efe3
Fix metadata for options scheme
jimmielin Jun 23, 2025
0c12952
Add interstitial for rairv use false in non-WACCMX mode
jimmielin Jun 23, 2025
8cc3c3d
Fix metadata; add interstitial for t_toai (initial default)
jimmielin Jun 23, 2025
6d65753
Fix metadata; move vdiff_lu_solver.F90 to to_be_ccppized
jimmielin Jun 23, 2025
59f1095
Fix subroutine interfaces
jimmielin Jun 25, 2025
709d43c
Merge branch 'development' into hplin/hb_diff
jimmielin Jun 25, 2025
efa57c6
Merge branch 'development' into hplin/hb_diff
jimmielin Jun 25, 2025
12328a0
Fix coords1d ddt handling; horizontal_dimension due to framework update
jimmielin Jun 25, 2025
a69ad09
Workaround fw - change u/v/q prov to u1/v1/q1; shorten local var name
jimmielin Jun 25, 2025
5ceb2ca
Make Coords1D lowercase
jimmielin Jun 25, 2025
5e9fad0
Fix suite name -- only crashes at runtime, not at build time
jimmielin Jun 25, 2025
5e79ed3
Add missing initialization
jimmielin Jun 26, 2025
043b7ab
Update missing dse suite call
jimmielin Jun 26, 2025
157a952
Remove unused arguments and local vars in horizontal momentum diffusion.
jimmielin Jun 30, 2025
00d0dab
branch out for sima_diagnostics.
jimmielin Jul 14, 2025
52174f8
Fix diagnostics - remove duplicate hb
jimmielin Jul 14, 2025
df433d4
Merge branch 'development' into hplin/hb_diff
jimmielin Jul 15, 2025
b819272
Sync to answer changes introduced in cam6_4_104 for refactoring
jimmielin Jul 15, 2025
67509ce
Update standard names to accepted
jimmielin Jul 31, 2025
d9ac7ed
Merge branch 'development' into hplin/hb_diff
jimmielin Aug 4, 2025
45ee427
Merge branch 'hplin/hb_diff_diags' into hplin/hb_diff_part1
jimmielin Aug 15, 2025
348de73
Merge branch 'development' into hplin/hb_diff_part1
jimmielin Aug 15, 2025
14bd061
Update standard names to accepted in spreadsheet.
jimmielin Aug 15, 2025
a81245b
Merge branch 'development' into hplin/hb_diff_part1
jimmielin Aug 19, 2025
435f343
Update with CAM4 SDF for vdiff.
jimmielin Aug 22, 2025
e327c85
Update free atm diff HB to zero out below CLUBB.
jimmielin Aug 25, 2025
202c309
Update schemes/holtslag_boville/holtslag_boville_diff.F90
jimmielin Sep 2, 2025
6fff1e3
Address review comments.
jimmielin Sep 2, 2025
a458ea2
Merge branch 'development' into hplin/hb_diff_part1
jimmielin Sep 2, 2025
de30901
Fixes for building in CAM
jimmielin Sep 2, 2025
cf2e87d
Fixes for building in SIMA
jimmielin Sep 2, 2025
f2071fc
Merge in WACCM-X eddy_top handling into the regular version.
jimmielin Sep 3, 2025
47d4c32
Fix dependencies in wrong meta section
jimmielin Sep 3, 2025
3098cbb
Print out top and bottom of turb in HB PBL.
jimmielin Sep 3, 2025
e742ab5
Remove kvm_sponge dim (push missing change)
jimmielin Sep 4, 2025
2f796fe
Change to apply_nonwv_cflx for free atm hb diff interstitial.
jimmielin Sep 4, 2025
8959786
Update schemes/vertical_diffusion/diffusion_solver.F90
jimmielin Sep 5, 2025
677300b
Address review comments
jimmielin Sep 5, 2025
28fd911
Merge branch 'development' into hplin/hb_diff_part1
jimmielin Sep 21, 2025
88555d6
Address review comments
jimmielin Sep 24, 2025
d87ba71
Merge branch 'development' into hplin/hb_diff_part1
jimmielin Sep 26, 2025
b325f36
Fix upper_boundary_condition_of_ccpp_constituents units
jimmielin Sep 26, 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 schemes/hack_shallow/hack_convect_shallow.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@
dimensions = (horizontal_loop_extent, vertical_layer_dimension)
intent = in
[ qpert_in ]
standard_name = convective_water_vapor_wrt_moist_air_and_condensed_water_perturbation_due_to_pbl_eddies
standard_name = convective_water_vapor_mixing_ratio_wrt_moist_air_and_condensed_water_perturbation_due_to_pbl_eddies
units = kg kg-1
type = real | kind = kind_phys
dimensions = (horizontal_loop_extent)
Expand Down
718 changes: 718 additions & 0 deletions schemes/holtslag_boville/holtslag_boville_diff.F90
View file
Open in desktop

Large diffs are not rendered by default.

Loading
Loading