Skip to content

Commit 8119de4

Browse files
committed
update to cam6_4_108
2 parents fd5d35c + 03a0e9e commit 8119de4

11 files changed

Lines changed: 237 additions & 792 deletions

File tree

.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: 109 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
===============================================================
22

3-
Tag name:
3+
Tag name: cam6_4_109
44
Originator(s): eaton
5-
Date:
5+
Date: 20 August 2025
66
One-line Summary: testing updates
7-
Github PR URL:
7+
Github PR URL: https://github.com/ESCOMP/CAM/pull/1359
88

99
Purpose of changes (include the issue number and title text for each relevant GitHub issue):
1010

@@ -30,7 +30,7 @@ List any changes to the defaults for the boundary datasets: none
3030

3131
Describe any substantial timing or memory changes: none
3232

33-
Code reviewed by:
33+
Code reviewed by: cacraig
3434

3535
List all files eliminated:
3636

@@ -176,6 +176,111 @@ Summarize any changes to answers:
176176
===============================================================
177177
===============================================================
178178

179+
Tag name: cam6_4_108
180+
Originator(s): peverwhee
181+
Date: August 19, 2025
182+
One-line Summary: Bring in file i/o object and update interfaces for CCPPized RRTMGP
183+
Github PR URL: https://github.com/ESCOMP/CAM/pull/1339
184+
185+
Purpose of changes (include the issue number and title text for each relevant GitHub issue):
186+
- Bring in sparsely-checked-out CAM-SIMA as submodule to grab file i/o object
187+
- Bring in new atmospheric physics tag that incorporates the file i/o object
188+
into RRTMGP
189+
- Update calling lists to match new interfaces (in `rrtmgp/radiation.F90` and
190+
`src/physics/cam/cloud_rad_props.F90`
191+
- Removes file reading from cloud_rad_props.F90 and instead calls new CCPP
192+
interface
193+
194+
Describe any changes made to build system:
195+
M bld/configure
196+
- Add new to_be_ccppized subdirectory
197+
198+
Describe any changes made to the namelist: N/A
199+
200+
List any changes to the defaults for the boundary datasets: N/A
201+
202+
Describe any substantial timing or memory changes: N/A
203+
204+
Code reviewed by: cacraigucar
205+
206+
List all files eliminated: N/A
207+
208+
List all files added and what they do:
209+
A src/utils/.sima_phys_utils_sparse_checkout
210+
A src/utils/cam-sima
211+
- bring in new CAM-SIMA submodule (sparse check out)
212+
213+
List all existing files that have been modified, and describe the changes:
214+
M .gitmodules
215+
- Update atmos_phys external tag
216+
- Add new CAM-SIMA external
217+
218+
M src/atmos_phys
219+
- updated atmospheric_physics submodule
220+
221+
M src/physics/cam/cloud_rad_props.F90
222+
- call CCPPized scheme to read ice and liquid optics files
223+
224+
M src/physics/cam/radheat.F90
225+
- add missing "_r8"s
226+
227+
M src/physics/rrtmg/radiation.F90
228+
- update interface to cloud_rad_props_init
229+
230+
M src/physics/rrtmgp/radiation.F90
231+
- update interfaces to CCPPized schemes
232+
- delete coefs_init subroutine (ccppized)
233+
234+
M src/utils/cam_pio_utils.F90
235+
- add "errcode" variable to cam_pio_openfile to be used by ccpp i/o
236+
reader
237+
238+
If there were any failures reported from running test_driver.sh on any test
239+
platform, and checkin with these failures has been OK'd by the gatekeeper,
240+
then copy the lines from the td.*.status files for the failed tests to the
241+
appropriate machine below. All failed tests must be justified.
242+
243+
derecho/intel/aux_cam:
244+
ERP_Ld3.ne30pg3_ne30pg3_mt232.FHISTC_MTt4s.derecho_intel.cam-outfrq1d_aoa (Overall: DIFF) details:
245+
SMS_D_Ln9.ne30pg3_ne30pg3_mt232.FHISTC_MTso.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
246+
SMS_D_Ln9_P1280x1.ne30pg3_ne30pg3_mt232.FHISTC_MTt1s.derecho_intel.cam-outfrq9s_Leung_dust (Overall: DIFF) details:
247+
- MT answer changes are expected (added "_r8"s)
248+
249+
SMS_D_Ln9_P1280x1.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.derecho_intel.cam-outfrq9s (Overall: FAIL) details:
250+
- pre-existing failure due to build-namelist error requiring CLM/CTSM external update.
251+
252+
derecho/nvhpc/aux_cam: BFB
253+
254+
izumi/nag/aux_cam: all BFB
255+
256+
izumi/gnu/aux_cam: all BFB
257+
258+
CAM tag used for the baseline comparison tests if different than previous
259+
tag:
260+
261+
Summarize any changes to answers, i.e.,
262+
- what code configurations:
263+
- what platforms/compilers:
264+
- nature of change (roundoff; larger than roundoff but same climate; new
265+
climate):
266+
267+
If bitwise differences were observed, how did you show they were no worse
268+
than roundoff?
269+
270+
If this tag changes climate describe the run(s) done to evaluate the new
271+
climate in enough detail that it(they) could be reproduced, i.e.,
272+
- source tag (all code used must be in the repository):
273+
- platform/compilers:
274+
- configure commandline:
275+
- build-namelist command (or complete namelist):
276+
- MSS location of output:
277+
278+
MSS location of control simulations used to validate new climate:
279+
280+
URL for AMWG diagnostics output used to validate new climate:
281+
282+
===============================================================
283+
179284
Tag name: cam6_4_107
180285
Originator(s): JulioTBacmeister, perverwhee, cacraigucar
181286
Date: August 13, 2025

0 commit comments

Comments
 (0)