Skip to content

Commit fd5d35c

Browse files
committed
update to cam6_4_107
2 parents d7ad452 + 01c89fc commit fd5d35c

9 files changed

Lines changed: 387 additions & 2631 deletions

File tree

.gitmodules

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

bld/build-namelist

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -738,6 +738,9 @@ elsif ($rad_pkg =~ m/rrtmgp/) {
738738
$rel_path = $nl->get_value('rrtmgp_coefs_sw_file');
739739
my $abs_path = quote_string(set_abs_filepath($rel_path, $cam_dir));
740740
$nl->set_variable_value('radiation_nl', 'rrtmgp_coefs_sw_file', $abs_path);
741+
742+
add_default($nl, 'p_top_for_rrtmgp');
743+
741744
}
742745

743746
# Solar irradiance

bld/namelist_files/namelist_defaults_cam.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -575,6 +575,10 @@
575575
<rrtmgp_coefs_lw_file>src/physics/rrtmgp/data/rrtmgp-gas-lw-g128.nc</rrtmgp_coefs_lw_file>
576576
<rrtmgp_coefs_sw_file>src/physics/rrtmgp/data/rrtmgp-gas-sw-g112.nc</rrtmgp_coefs_sw_file>
577577

578+
<p_top_for_rrtmgp> 10.D0 </p_top_for_rrtmgp>
579+
<p_top_for_rrtmgp waccmx="1" > 1.D0 </p_top_for_rrtmgp>
580+
<p_top_for_rrtmgp waccm_phys="1" > 1.D0 </p_top_for_rrtmgp>
581+
578582
<!-- CAM-RT absorptivity/emissivity lookup table -->
579583
<absems_data rad="camrt">atm/cam/rad/abs_ems_factors_fastvx.c030508.nc</absems_data>
580584

bld/namelist_files/namelist_definition.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5771,6 +5771,13 @@ Calculate radiative effect of graupel/hail (using snow optics)
57715771
Default: FALSE
57725772
</entry>
57735773

5774+
<entry id="p_top_for_rrtmgp" type="real" category="radiation"
5775+
group="radiation_nl" valid_values="" >
5776+
Top pressure level for RRTMGP
5777+
Default: 1.0 for WACCM/WACCMX
5778+
10. for all other CAM runs
5779+
</entry>
5780+
57745781
<entry id="use_rad_dt_cosz" type="logical" category="radiation"
57755782
group="radiation_nl" valid_values="" >
57765783
If true, then average the zenith angle over the radiation timestep rather

doc/ChangeLog

Lines changed: 92 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ cime_config/config_component.xml
7676
. remove unused (and untested) modifiers %CLB, %RCO2
7777
. remove modifier %MAM7
7878

79-
8079
cime_config/testdefs/testlist_cam.xml
8180
. add ERI tests for cam5, cam6, and cam7 F compsets:
8281
replace
@@ -177,6 +176,97 @@ Summarize any changes to answers:
177176
===============================================================
178177
===============================================================
179178

179+
Tag name: cam6_4_107
180+
Originator(s): JulioTBacmeister, perverwhee, cacraigucar
181+
Date: August 13, 2025
182+
One-line Summary: RRTMGP mods to support MT configurations
183+
Github PR URL: https://github.com/ESCOMP/CAM/pull/1353
184+
185+
Purpose of changes (include the issue number and title text for each relevant GitHub issue):
186+
- RRTMGP error with mpas and L93 mid-top configuration: https://github.com/ESCOMP/AM/issues/1279
187+
- Removes extra logic needed to use RRTMGP in the MT configuration where minimum pressures may fall below 1 Pa - the lower
188+
limit of validity for RRTMGP
189+
- MT will now use cooling rates from Fomichev radiation above 10 Pa.
190+
191+
Describe any changes made to build system: N/A
192+
193+
Describe any changes made to the namelist:
194+
- introduce p_top_for_rrtmgp: Top pressure level for RRTMGP
195+
196+
List any changes to the defaults for the boundary datasets: N/A
197+
198+
Describe any substantial timing or memory changes: N/A
199+
200+
Code reviewed by: peverwhee, cacraigucar
201+
202+
List all files eliminated:
203+
D src/physics/waccm/nlte_fomichev.F90
204+
- Moved to ESCOMP/atmospheric_physics
205+
206+
List all files added and what they do:
207+
208+
List all existing files that have been modified, and describe the changes:
209+
M .gitmodules
210+
- Update atmos_phys external tag
211+
212+
M bld/build-namelist
213+
M bld/namelist_files/namelist_defaults_cam.xml
214+
M bld/namelist_files/namelist_definition.xml
215+
- introduce p_top_for_rrtmgp
216+
217+
M src/physics/cam/radheat.F90
218+
M src/physics/rrtmgp/radiation.F90
219+
- Julio's modifications as described above
220+
221+
If there were any failures reported from running test_driver.sh on any test
222+
platform, and checkin with these failures has been OK'd by the gatekeeper,
223+
then copy the lines from the td.*.status files for the failed tests to the
224+
appropriate machine below. All failed tests must be justified.
225+
226+
- Numerous NLFAIL due to the new p_top_for_rrtmgp namelist
227+
228+
derecho/intel/aux_cam:
229+
ERP_Ld3.ne30pg3_ne30pg3_mt232.FHISTC_MTt4s.derecho_intel.cam-outfrq1d_aoa (Overall: DIFF) details:
230+
SMS_D_Ln9.ne30pg3_ne30pg3_mt232.FHISTC_MTso.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
231+
SMS_D_Ln9_P1280x1.ne30pg3_ne30pg3_mt232.FHISTC_MTt1s.derecho_intel.cam-outfrq9s_Leung_dust (Overall: DIFF) details:
232+
- MT answer changes are expected
233+
234+
SMS_D_Ln9_P1280x1.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.derecho_intel.cam-outfrq9s (Overall: FAIL) details:
235+
- pre-existing failure due to build-namelist error requiring CLM/CTSM external update.
236+
237+
derecho/nvhpc/aux_cam: BFB
238+
239+
izumi/nag/aux_cam: all BFB
240+
241+
izumi/gnu/aux_cam: all BFB
242+
243+
CAM tag used for the baseline comparison tests if different than previous
244+
tag:
245+
246+
Summarize any changes to answers, i.e.,
247+
- what code configurations:
248+
- what platforms/compilers:
249+
- nature of change (roundoff; larger than roundoff but same climate; new
250+
climate):
251+
252+
If bitwise differences were observed, how did you show they were no worse
253+
than roundoff?
254+
255+
If this tag changes climate describe the run(s) done to evaluate the new
256+
climate in enough detail that it(they) could be reproduced, i.e.,
257+
- source tag (all code used must be in the repository):
258+
- platform/compilers:
259+
- configure commandline:
260+
- build-namelist command (or complete namelist):
261+
- MSS location of output:
262+
263+
MSS location of control simulations used to validate new climate:
264+
265+
URL for AMWG diagnostics output used to validate new climate:
266+
267+
===============================================================
268+
===============================================================
269+
180270
Tag name: cam6_4_106
181271
Originator(s): kuanchihwang
182272
Date: July 23, 2025
@@ -362,7 +452,7 @@ ERI_D_Ln18.f10_f10_mg37.QPC5.izumi_nag.cam-outfrq3s_eoyttrac (Overall: NLFAIL)
362452
PLB_D_Ln9.f10_f10_mg37.QPC5.izumi_nag.cam-ttrac_loadbal0 (Overall: NLFAIL)
363453
PLB_D_Ln9.f10_f10_mg37.QPC5.izumi_nag.cam-ttrac_loadbal1 (Overall: NLFAIL)
364454
PLB_D_Ln9.f10_f10_mg37.QPC5.izumi_nag.cam-ttrac_loadbal3 (Overall: NLFAIL)
365-
SMS_D_Ld2.f45_f45_mg37.PC5.izumi_nag.cam-outfrq24h_port (Overall: NLFAIL)
455+
SMS_D_Ld2.f45_f45_mg37.PC5.izumi_nag.cam-outfrq24h_port (Overall: NLFAIL)
366456
SMS_D_Ln3.ne5pg3_ne5pg3_mg37.QPX2000.izumi_nag.cam-outfrq3s (Overall: NLFAIL)
367457
SMS_D_Ln6.ne5_ne5_mg37.QPWmaC4.izumi_nag.cam-outfrq3s_physgrid_tem (Overall: NLFAIL)
368458
SMS_D_Ln9.f10_f10_mg37.QPC5.izumi_nag.cam-rad_diag_mam (Overall: NLFAIL)

0 commit comments

Comments
 (0)