Skip to content

Commit 03a0e9e

Browse files
authored
Merge pull request #1339 from peverwhee/rrtmgp-fileio
cam6_4_108: Bring in file i/o object and update interfaces for CCPPized RRTMGP
2 parents 01c89fc + e619153 commit 03a0e9e

File tree

11 files changed

+233
-788
lines changed

11 files changed

+233
-788
lines changed

.gitmodules

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,18 @@
3636
[submodule "atmos_phys"]
3737
path = src/atmos_phys
3838
url = https://github.com/ESCOMP/atmospheric_physics
39-
fxtag = dev_atmos_phys0_15_000
39+
fxtag = atmos_phys0_15_000
4040
fxrequired = AlwaysRequired
4141
fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics
4242

43+
[submodule "cam-sima"]
44+
path = src/utils/cam-sima
45+
url = https://github.com/ESCOMP/CAM-SIMA.git
46+
fxrequired = AlwaysRequired
47+
fxsparse = ../.sima_phys_utils_sparse_checkout
48+
fxtag = sima0_07_000
49+
fxDONOTUSEurl = https://github.com/ESCOMP/CAM-SIMA.git
50+
4351
[submodule "fv3"]
4452
path = src/dynamics/fv3
4553
url = https://github.com/ESCOMP/CAM_FV3_interface.git

bld/configure

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2172,6 +2172,7 @@ sub write_filepath
21722172
# in the list of filepaths.
21732173
print $fh "$camsrcdir/src/physics/cam\n";
21742174
print $fh "$camsrcdir/src/atmos_phys/to_be_ccppized\n";
2175+
print $fh "$camsrcdir/src/atmos_phys/to_be_ccppized/radiation_utils\n";
21752176
print $fh "$camsrcdir/src/atmos_phys/phys_utils\n";
21762177

21772178
# Add the CCPP'ized subdirectories
@@ -2208,6 +2209,9 @@ sub write_filepath
22082209
print $fh "$camsrcdir/src/utils\n";
22092210
print $fh "$camsrcdir/src/utils/cam_ccpp\n";
22102211

2212+
# Routines from CAM-SIMA
2213+
print $fh "$camsrcdir/src/utils/cam-sima/src/physics/utils\n";
2214+
22112215
$fh->close;
22122216
}
22132217

doc/ChangeLog

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,110 @@
11
===============================================================
22

3+
Tag name: cam6_4_108
4+
Originator(s): peverwhee
5+
Date: August 19, 2025
6+
One-line Summary: Bring in file i/o object and update interfaces for CCPPized RRTMGP
7+
Github PR URL: https://github.com/ESCOMP/CAM/pull/1339
8+
9+
Purpose of changes (include the issue number and title text for each relevant GitHub issue):
10+
- Bring in sparsely-checked-out CAM-SIMA as submodule to grab file i/o object
11+
- Bring in new atmospheric physics tag that incorporates the file i/o object
12+
into RRTMGP
13+
- Update calling lists to match new interfaces (in `rrtmgp/radiation.F90` and
14+
`src/physics/cam/cloud_rad_props.F90`
15+
- Removes file reading from cloud_rad_props.F90 and instead calls new CCPP
16+
interface
17+
18+
Describe any changes made to build system:
19+
M bld/configure
20+
- Add new to_be_ccppized subdirectory
21+
22+
Describe any changes made to the namelist: N/A
23+
24+
List any changes to the defaults for the boundary datasets: N/A
25+
26+
Describe any substantial timing or memory changes: N/A
27+
28+
Code reviewed by: cacraigucar
29+
30+
List all files eliminated: N/A
31+
32+
List all files added and what they do:
33+
A src/utils/.sima_phys_utils_sparse_checkout
34+
A src/utils/cam-sima
35+
- bring in new CAM-SIMA submodule (sparse check out)
36+
37+
List all existing files that have been modified, and describe the changes:
38+
M .gitmodules
39+
- Update atmos_phys external tag
40+
- Add new CAM-SIMA external
41+
42+
M src/atmos_phys
43+
- updated atmospheric_physics submodule
44+
45+
M src/physics/cam/cloud_rad_props.F90
46+
- call CCPPized scheme to read ice and liquid optics files
47+
48+
M src/physics/cam/radheat.F90
49+
- add missing "_r8"s
50+
51+
M src/physics/rrtmg/radiation.F90
52+
- update interface to cloud_rad_props_init
53+
54+
M src/physics/rrtmgp/radiation.F90
55+
- update interfaces to CCPPized schemes
56+
- delete coefs_init subroutine (ccppized)
57+
58+
M src/utils/cam_pio_utils.F90
59+
- add "errcode" variable to cam_pio_openfile to be used by ccpp i/o
60+
reader
61+
62+
If there were any failures reported from running test_driver.sh on any test
63+
platform, and checkin with these failures has been OK'd by the gatekeeper,
64+
then copy the lines from the td.*.status files for the failed tests to the
65+
appropriate machine below. All failed tests must be justified.
66+
67+
derecho/intel/aux_cam:
68+
ERP_Ld3.ne30pg3_ne30pg3_mt232.FHISTC_MTt4s.derecho_intel.cam-outfrq1d_aoa (Overall: DIFF) details:
69+
SMS_D_Ln9.ne30pg3_ne30pg3_mt232.FHISTC_MTso.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
70+
SMS_D_Ln9_P1280x1.ne30pg3_ne30pg3_mt232.FHISTC_MTt1s.derecho_intel.cam-outfrq9s_Leung_dust (Overall: DIFF) details:
71+
- MT answer changes are expected (added "_r8"s)
72+
73+
SMS_D_Ln9_P1280x1.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.derecho_intel.cam-outfrq9s (Overall: FAIL) details:
74+
- pre-existing failure due to build-namelist error requiring CLM/CTSM external update.
75+
76+
derecho/nvhpc/aux_cam: BFB
77+
78+
izumi/nag/aux_cam: all BFB
79+
80+
izumi/gnu/aux_cam: all BFB
81+
82+
CAM tag used for the baseline comparison tests if different than previous
83+
tag:
84+
85+
Summarize any changes to answers, i.e.,
86+
- what code configurations:
87+
- what platforms/compilers:
88+
- nature of change (roundoff; larger than roundoff but same climate; new
89+
climate):
90+
91+
If bitwise differences were observed, how did you show they were no worse
92+
than roundoff?
93+
94+
If this tag changes climate describe the run(s) done to evaluate the new
95+
climate in enough detail that it(they) could be reproduced, i.e.,
96+
- source tag (all code used must be in the repository):
97+
- platform/compilers:
98+
- configure commandline:
99+
- build-namelist command (or complete namelist):
100+
- MSS location of output:
101+
102+
MSS location of control simulations used to validate new climate:
103+
104+
URL for AMWG diagnostics output used to validate new climate:
105+
106+
===============================================================
107+
3108
Tag name: cam6_4_107
4109
Originator(s): JulioTBacmeister, perverwhee, cacraigucar
5110
Date: August 13, 2025

0 commit comments

Comments
 (0)