Skip to content

Commit 628aba8

Browse files
authored
Merge pull request #1465 from cacraigucar/cam_lbc_file_update
cam6_4_140: Update LBC file for CAM7 use_cases
2 parents d9fcdbb + 13987a8 commit 628aba8

File tree

9 files changed

+82
-8
lines changed

9 files changed

+82
-8
lines changed

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git
138138
[submodule "cime"]
139139
path = cime
140140
url = https://github.com/ESMCI/cime
141-
fxtag = cime6.1.144
141+
fxtag = cime6.1.145
142142
fxrequired = ToplevelRequired
143143
fxDONOTUSEurl = https://github.com/ESMCI/cime
144144

bld/namelist_files/use_cases/1850_cam_lt.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<solar_data_type> FIXED </solar_data_type>
88

99
<!-- LBC Files : -->
10-
<flbc_file>atm/waccm/lb/LBC_17500116-20150116_CMIP6_0p5degLat_c180905.nc</flbc_file>
10+
<flbc_file>atm/waccm/lb/CMIP7/LBC_17500116-20221216_CMIP7_0p5degLat_c250326.nc</flbc_file>
1111
<flbc_cycle_yr>1850</flbc_cycle_yr>
1212
<flbc_type>'CYCLICAL'</flbc_type>
1313
<flbc_list>'CO2','CH4','N2O','CFC11','CFC12','CFC11eq'</flbc_list>

bld/namelist_files/use_cases/1850_cam_mt.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<solar_data_type> FIXED </solar_data_type>
88

99
<!-- LBC Files : -->
10-
<flbc_file>atm/waccm/lb/LBC_17500116-20150116_CMIP6_0p5degLat_c180905.nc</flbc_file>
10+
<flbc_file>atm/waccm/lb/CMIP7/LBC_17500116-20221216_CMIP7_0p5degLat_c250326.nc</flbc_file>
1111
<flbc_cycle_yr>1850</flbc_cycle_yr>
1212
<flbc_type>'CYCLICAL'</flbc_type>
1313
<flbc_list>'CO2','CH4','N2O','CFC11','CFC12','CFC11eq'</flbc_list>

bld/namelist_files/use_cases/hist_cam_lt.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<solar_irrad_data_file>atm/cam/solar/SolarForcingCMIP7-4.6_18491230-20240101_sumEPP_c20250630.nc</solar_irrad_data_file>
88

99
<!-- LBC Files -->
10-
<flbc_file>atm/waccm/lb/LBC_17500116-20150116_CMIP6_0p5degLat_c180905.nc</flbc_file>
10+
<flbc_file>atm/waccm/lb/CMIP7/LBC_17500116-20221216_CMIP7_0p5degLat_c250326.nc</flbc_file>
1111
<flbc_type>'SERIAL'</flbc_type>
1212
<flbc_list>'CO2','CH4','N2O','CFC11','CFC12','CFC11eq'</flbc_list>
1313

bld/namelist_files/use_cases/hist_cam_mt.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<solar_irrad_data_file>atm/cam/solar/SolarForcingCMIP7-4.6_18491230-20240101_sumEPP_c20250630.nc</solar_irrad_data_file>
88

99
<!-- LBC Files -->
10-
<flbc_file>atm/waccm/lb/LBC_17500116-20150116_CMIP6_0p5degLat_c180905.nc</flbc_file>
10+
<flbc_file>atm/waccm/lb/CMIP7/LBC_17500116-20221216_CMIP7_0p5degLat_c250326.nc</flbc_file>
1111
<flbc_type>'SERIAL'</flbc_type>
1212
<flbc_list>'CO2','CH4','N2O','CFC11','CFC12','CFC11eq'</flbc_list>
1313

bld/namelist_files/use_cases/waccm_ma_hist_cam7.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
<!-- LBC, UBC Files -->
2424
<flbc_type>SERIAL</flbc_type>
25-
<flbc_file>atm/waccm/lb/LBC_17500116-20150116_CMIP6_0p5degLat_c180905.nc</flbc_file>
25+
<flbc_file>atm/waccm/lb/CMIP7/LBC_17500116-20221216_CMIP7_0p5degLat_c250326.nc</flbc_file>
2626
<flbc_list>
2727
'CCL4', 'CF2CLBR', 'CF3BR', 'CFC11', 'CFC113', 'CFC12', 'CH3BR', 'CH3CCL3', 'CH3CL', 'CH4', 'CO2', 'H2',
2828
'HCFC22', 'N2O', 'CFC114', 'CFC115', 'HCFC141B', 'HCFC142B', 'CH2BR2', 'CHBR3', 'H2402', 'OCS', 'CFC11eq'

bld/namelist_files/use_cases/waccm_sc_hist_cam7.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
<!-- LBC, UBC Files -->
2020
<flbc_type>SERIAL</flbc_type>
21-
<flbc_file>atm/waccm/lb/LBC_17500116-20150116_CMIP6_0p5degLat_c180905.nc</flbc_file>
21+
<flbc_file>atm/waccm/lb/CMIP7/LBC_17500116-20221216_CMIP7_0p5degLat_c250326.nc</flbc_file>
2222
<flbc_list>'CO2','CH4','N2O','CFC11','CFC12','CFC11eq'</flbc_list>
2323

2424
<!-- upper atmos forcings -->

cime

doc/ChangeLog

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,80 @@
11

22
===============================================================
33

4+
Tag name: cam6_4_140
5+
Originator(s): cacraigucar, hannay
6+
Date: Dec 29, 2025
7+
One-line Summary: Update LBC file for CAM7 use_cases
8+
Github PR URL: https://github.com/ESCOMP/CAM/pull/1465
9+
10+
Purpose of changes (include the issue number and title text for each relevant GitHub issue):
11+
- Add CMIP7 LBC file as default: https://github.com/ESCOMP/CAM/issues/1463
12+
13+
Describe any changes made to build system: N/A
14+
15+
Describe any changes made to the namelist: N/A
16+
17+
List any changes to the defaults for the boundary datasets: N/A
18+
19+
Describe any substantial timing or memory changes: N/A
20+
21+
Code reviewed by: fvitt
22+
23+
List all files eliminated: N/A
24+
25+
List all files added and what they do: N/A
26+
27+
List all existing files that have been modified, and describe the changes:
28+
M bld/namelist_files/use_cases/1850_cam_lt.xml
29+
M bld/namelist_files/use_cases/1850_cam_mt.xml
30+
M bld/namelist_files/use_cases/hist_cam_lt.xml
31+
M bld/namelist_files/use_cases/hist_cam_mt.xml
32+
M bld/namelist_files/use_cases/waccm_ma_hist_cam7.xml
33+
M bld/namelist_files/use_cases/waccm_sc_hist_cam7.xml
34+
- update the LBC file used in CAM7 runs
35+
36+
M .gitmodules
37+
M cime
38+
- update cime to get the new inputdata location for wget
39+
40+
If there were any failures reported from running test_driver.sh on any test
41+
platform, and checkin with these failures has been OK'd by the gatekeeper,
42+
then copy the lines from the td.*.status files for the failed tests to the
43+
appropriate machine below. All failed tests must be justified.
44+
45+
derecho/intel/aux_cam:
46+
ERC_D_Ln9.mpasa120_mpasa120.FHISTC_LTso.derecho_intel.cam-outfrq9s_mpasa120 (Overall: DIFF) details:
47+
ERC_D_Ln9.ne30pg3_ne30pg3_mt232.F1850C_LTso.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
48+
ERI_D_Ln18.ne30pg3_ne30pg3_mt232.FHISTC_LTso.derecho_intel.cam-outfrq3s_eri (Overall: DIFF) details:
49+
ERP_D_Ln9.ne30pg3_ne30pg3_mt232.F1850C_MTso.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
50+
ERP_Ld3.ne16pg3_ne16pg3_mg17.FHISTC_WAt1ma.derecho_intel.cam-reduced_hist1d (Overall: DIFF) details:
51+
ERP_Ln9.ne30pg3_ne30pg3_mg17.FHISTC_WAma.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
52+
ERR_Ln9.ne16pg3_ne16pg3_mt232.FHISTC_LTso.derecho_intel.cam-outfrq9s_bwic (Overall: DIFF) details:
53+
ERS_Ln9.ne30pg3_ne30pg3_mg17.FHISTC_WXma.derecho_intel.cam-outfrq9s_ctem (Overall: DIFF) details:
54+
SMS_C2_D_Ln9.ne16pg3_ne16pg3_mg17.FHISTC_WXma.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
55+
SMS_D_Ln9.ne30pg3_ne30pg3_mt232.FHISTC_MTso.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
56+
- Answer changes for CAM7 runs due to new LBC file
57+
58+
SMS_D_Ln9_P1536x1.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.derecho_intel.cam-outfrq9s (Overall: PASS) details:
59+
- This test appears to no longer fail after the last derecho downtime. Will no longer track this failure in the ChangeLog.
60+
61+
derecho/nvhpc/aux_cam: (not run as nothing has changed with the file system)
62+
63+
izumi/nag/aux_cam:
64+
ERC_D_Ln9.ne3pg3_ne3pg3_mt232.FHISTC_LTso.izumi_nag.cam-cosp_rad_diags (Overall: DIFF) details:
65+
ERC_D_Ln9.ne3pg3_ne3pg3_mt232.FHISTC_LTso.izumi_nag.cam-outfrq9s_nochem (Overall: DIFF) details:
66+
- Answer changes for CAM7 runs due to new LBC file
67+
68+
izumi/gnu/aux_cam:
69+
ERC_D_Ln9.mpasa480_mpasa480_mt232.FHISTC_LTso.izumi_gnu.cam-outfrq9s_mpasa480 (Overall: DIFF) details:
70+
ERC_D_Ln9.ne3pg3_ne3pg3_mt232.FHISTC_LTso.izumi_gnu.cam-sat_lcltod (Overall: DIFF) details:
71+
SMS_D_Ln3.ne3pg3_ne3pg3_mt232.PC7.izumi_gnu.cam-pc7_ne3pg3 (Overall: DIFF) details:
72+
- Answer changes for CAM7 runs due to new LBC file
73+
74+
75+
===============================================================
76+
===============================================================
77+
478
Tag name: cam6_4_139
579
Originator(s): cacraigucar, kuanchihwang, gold2718, jedwards4b
680
Date: Dec 24, 2025

0 commit comments

Comments
 (0)