From ca06f6827137e98209aed75381364617036dcbbb Mon Sep 17 00:00:00 2001 From: Cheryl Craig Date: Tue, 23 Dec 2025 15:56:50 -0700 Subject: [PATCH 1/7] Update LBC file for CAM7 use_cases --- bld/namelist_files/use_cases/1850_cam_lt.xml | 2 +- bld/namelist_files/use_cases/1850_cam_mt.xml | 2 +- bld/namelist_files/use_cases/hist_cam_lt.xml | 2 +- bld/namelist_files/use_cases/hist_cam_mt.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bld/namelist_files/use_cases/1850_cam_lt.xml b/bld/namelist_files/use_cases/1850_cam_lt.xml index 93d668dfd4..43fe83407c 100644 --- a/bld/namelist_files/use_cases/1850_cam_lt.xml +++ b/bld/namelist_files/use_cases/1850_cam_lt.xml @@ -7,7 +7,7 @@ FIXED -atm/waccm/lb/LBC_17500116-20150116_CMIP6_0p5degLat_c180905.nc +atm/waccm/lb/LBC_17500116-20221216_CMIP7_0p5degLat_c250326.nc 1850 'CYCLICAL' 'CO2','CH4','N2O','CFC11','CFC12','CFC11eq' diff --git a/bld/namelist_files/use_cases/1850_cam_mt.xml b/bld/namelist_files/use_cases/1850_cam_mt.xml index 530983c17e..b8e1bd4d88 100644 --- a/bld/namelist_files/use_cases/1850_cam_mt.xml +++ b/bld/namelist_files/use_cases/1850_cam_mt.xml @@ -7,7 +7,7 @@ FIXED -atm/waccm/lb/LBC_17500116-20150116_CMIP6_0p5degLat_c180905.nc +atm/waccm/lb/LBC_17500116-20221216_CMIP7_0p5degLat_c250326.nc 1850 'CYCLICAL' 'CO2','CH4','N2O','CFC11','CFC12','CFC11eq' diff --git a/bld/namelist_files/use_cases/hist_cam_lt.xml b/bld/namelist_files/use_cases/hist_cam_lt.xml index dca699285a..47325b8ab7 100644 --- a/bld/namelist_files/use_cases/hist_cam_lt.xml +++ b/bld/namelist_files/use_cases/hist_cam_lt.xml @@ -7,7 +7,7 @@ atm/cam/solar/SolarForcingCMIP7-4.6_18491230-20240101_sumEPP_c20250630.nc -atm/waccm/lb/LBC_17500116-20150116_CMIP6_0p5degLat_c180905.nc +atm/waccm/lb/LBC_17500116-20221216_CMIP7_0p5degLat_c250326.nc 'SERIAL' 'CO2','CH4','N2O','CFC11','CFC12','CFC11eq' diff --git a/bld/namelist_files/use_cases/hist_cam_mt.xml b/bld/namelist_files/use_cases/hist_cam_mt.xml index 95cefd2e90..e5ba8dadb2 100644 --- a/bld/namelist_files/use_cases/hist_cam_mt.xml +++ b/bld/namelist_files/use_cases/hist_cam_mt.xml @@ -7,7 +7,7 @@ atm/cam/solar/SolarForcingCMIP7-4.6_18491230-20240101_sumEPP_c20250630.nc -atm/waccm/lb/LBC_17500116-20150116_CMIP6_0p5degLat_c180905.nc +atm/waccm/lb/LBC_17500116-20221216_CMIP7_0p5degLat_c250326.nc 'SERIAL' 'CO2','CH4','N2O','CFC11','CFC12','CFC11eq' From df5aebc87856ca00df513d47f27eddb564c7edd4 Mon Sep 17 00:00:00 2001 From: Cheryl Craig Date: Tue, 23 Dec 2025 16:15:33 -0700 Subject: [PATCH 2/7] Update two more use_cases with new LBC file --- bld/namelist_files/use_cases/waccm_ma_hist_cam7.xml | 2 +- bld/namelist_files/use_cases/waccm_sc_hist_cam7.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bld/namelist_files/use_cases/waccm_ma_hist_cam7.xml b/bld/namelist_files/use_cases/waccm_ma_hist_cam7.xml index 9a6ae47352..caa00176ce 100644 --- a/bld/namelist_files/use_cases/waccm_ma_hist_cam7.xml +++ b/bld/namelist_files/use_cases/waccm_ma_hist_cam7.xml @@ -22,7 +22,7 @@ SERIAL -atm/waccm/lb/LBC_17500116-20150116_CMIP6_0p5degLat_c180905.nc +atm/waccm/lb/LBC_17500116-20221216_CMIP7_0p5degLat_c250326.nc 'CCL4', 'CF2CLBR', 'CF3BR', 'CFC11', 'CFC113', 'CFC12', 'CH3BR', 'CH3CCL3', 'CH3CL', 'CH4', 'CO2', 'H2', 'HCFC22', 'N2O', 'CFC114', 'CFC115', 'HCFC141B', 'HCFC142B', 'CH2BR2', 'CHBR3', 'H2402', 'OCS', 'CFC11eq' diff --git a/bld/namelist_files/use_cases/waccm_sc_hist_cam7.xml b/bld/namelist_files/use_cases/waccm_sc_hist_cam7.xml index 2be3c29239..81d66d4eb6 100644 --- a/bld/namelist_files/use_cases/waccm_sc_hist_cam7.xml +++ b/bld/namelist_files/use_cases/waccm_sc_hist_cam7.xml @@ -18,7 +18,7 @@ SERIAL -atm/waccm/lb/LBC_17500116-20150116_CMIP6_0p5degLat_c180905.nc +atm/waccm/lb/LBC_17500116-20221216_CMIP7_0p5degLat_c250326.nc 'CO2','CH4','N2O','CFC11','CFC12','CFC11eq' From 62e522483e0a96792cdefc1225f26dca4566288b Mon Sep 17 00:00:00 2001 From: Cheryl Craig Date: Wed, 24 Dec 2025 11:22:17 -0700 Subject: [PATCH 3/7] Preliminary ChangeLog --- doc/ChangeLog | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/doc/ChangeLog b/doc/ChangeLog index 9277fc5441..705baf622d 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,6 +1,79 @@ =============================================================== +Tag name: cam6_4_140 +Originator(s): cacraigucar, hannay +Date: Dec 24, 2025 +One-line Summary: Update LBC file for CAM7 use_cases +Github PR URL: https://github.com/ESCOMP/CAM/pull/1465 + +Purpose of changes (include the issue number and title text for each relevant GitHub issue): + - Add CMIP7 LBC file as default: https://github.com/ESCOMP/CAM/issues/1463 + +Describe any changes made to build system: N/A + +Describe any changes made to the namelist: N/A + +List any changes to the defaults for the boundary datasets: N/A + +Describe any substantial timing or memory changes: N/A + +Code reviewed by: fvitt + +List all files eliminated: N/A + +List all files added and what they do: N/A + +List all existing files that have been modified, and describe the changes: +M bld/namelist_files/use_cases/1850_cam_lt.xml +M bld/namelist_files/use_cases/1850_cam_mt.xml +M bld/namelist_files/use_cases/hist_cam_lt.xml +M bld/namelist_files/use_cases/hist_cam_mt.xml +M bld/namelist_files/use_cases/waccm_ma_hist_cam7.xml +M bld/namelist_files/use_cases/waccm_sc_hist_cam7.xml + - update the LBC file used in CAM7 runs + +If there were any failures reported from running test_driver.sh on any test +platform, and checkin with these failures has been OK'd by the gatekeeper, +then copy the lines from the td.*.status files for the failed tests to the +appropriate machine below. All failed tests must be justified. + +derecho/intel/aux_cam: + +derecho/nvhpc/aux_cam: + +izumi/nag/aux_cam: + +izumi/gnu/aux_cam: + +CAM tag used for the baseline comparison tests if different than previous +tag: + +Summarize any changes to answers, i.e., +- what code configurations: +- what platforms/compilers: +- nature of change (roundoff; larger than roundoff but same climate; new + climate): + +If bitwise differences were observed, how did you show they were no worse +than roundoff? + +If this tag changes climate describe the run(s) done to evaluate the new +climate in enough detail that it(they) could be reproduced, i.e., +- source tag (all code used must be in the repository): +- platform/compilers: +- configure commandline: +- build-namelist command (or complete namelist): +- MSS location of output: + +MSS location of control simulations used to validate new climate: + +URL for AMWG diagnostics output used to validate new climate: + +=============================================================== + +=============================================================== + Tag name: cam6_4_139 Originator(s): cacraigucar, kuanchihwang, gold2718, jedwards4b Date: Dec 24, 2025 From 1da4479a05bc6aed2572f9c629ed6c5222b16648 Mon Sep 17 00:00:00 2001 From: Cheryl Craig Date: Fri, 26 Dec 2025 14:13:17 -0700 Subject: [PATCH 4/7] Add missing subdirectory for LBC file --- bld/namelist_files/use_cases/1850_cam_lt.xml | 2 +- bld/namelist_files/use_cases/1850_cam_mt.xml | 2 +- bld/namelist_files/use_cases/hist_cam_lt.xml | 2 +- bld/namelist_files/use_cases/hist_cam_mt.xml | 2 +- bld/namelist_files/use_cases/waccm_ma_hist_cam7.xml | 2 +- bld/namelist_files/use_cases/waccm_sc_hist_cam7.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bld/namelist_files/use_cases/1850_cam_lt.xml b/bld/namelist_files/use_cases/1850_cam_lt.xml index 43fe83407c..67e38429cd 100644 --- a/bld/namelist_files/use_cases/1850_cam_lt.xml +++ b/bld/namelist_files/use_cases/1850_cam_lt.xml @@ -7,7 +7,7 @@ FIXED -atm/waccm/lb/LBC_17500116-20221216_CMIP7_0p5degLat_c250326.nc +atm/waccm/lb/CMIP7/LBC_17500116-20221216_CMIP7_0p5degLat_c250326.nc 1850 'CYCLICAL' 'CO2','CH4','N2O','CFC11','CFC12','CFC11eq' diff --git a/bld/namelist_files/use_cases/1850_cam_mt.xml b/bld/namelist_files/use_cases/1850_cam_mt.xml index b8e1bd4d88..219027725b 100644 --- a/bld/namelist_files/use_cases/1850_cam_mt.xml +++ b/bld/namelist_files/use_cases/1850_cam_mt.xml @@ -7,7 +7,7 @@ FIXED -atm/waccm/lb/LBC_17500116-20221216_CMIP7_0p5degLat_c250326.nc +atm/waccm/lb/CMIP7/LBC_17500116-20221216_CMIP7_0p5degLat_c250326.nc 1850 'CYCLICAL' 'CO2','CH4','N2O','CFC11','CFC12','CFC11eq' diff --git a/bld/namelist_files/use_cases/hist_cam_lt.xml b/bld/namelist_files/use_cases/hist_cam_lt.xml index 47325b8ab7..c5496281a9 100644 --- a/bld/namelist_files/use_cases/hist_cam_lt.xml +++ b/bld/namelist_files/use_cases/hist_cam_lt.xml @@ -7,7 +7,7 @@ atm/cam/solar/SolarForcingCMIP7-4.6_18491230-20240101_sumEPP_c20250630.nc -atm/waccm/lb/LBC_17500116-20221216_CMIP7_0p5degLat_c250326.nc +atm/waccm/lb/CMIP7/LBC_17500116-20221216_CMIP7_0p5degLat_c250326.nc 'SERIAL' 'CO2','CH4','N2O','CFC11','CFC12','CFC11eq' diff --git a/bld/namelist_files/use_cases/hist_cam_mt.xml b/bld/namelist_files/use_cases/hist_cam_mt.xml index e5ba8dadb2..5faa24d9f5 100644 --- a/bld/namelist_files/use_cases/hist_cam_mt.xml +++ b/bld/namelist_files/use_cases/hist_cam_mt.xml @@ -7,7 +7,7 @@ atm/cam/solar/SolarForcingCMIP7-4.6_18491230-20240101_sumEPP_c20250630.nc -atm/waccm/lb/LBC_17500116-20221216_CMIP7_0p5degLat_c250326.nc +atm/waccm/lb/CMIP7/LBC_17500116-20221216_CMIP7_0p5degLat_c250326.nc 'SERIAL' 'CO2','CH4','N2O','CFC11','CFC12','CFC11eq' diff --git a/bld/namelist_files/use_cases/waccm_ma_hist_cam7.xml b/bld/namelist_files/use_cases/waccm_ma_hist_cam7.xml index caa00176ce..915ccd5245 100644 --- a/bld/namelist_files/use_cases/waccm_ma_hist_cam7.xml +++ b/bld/namelist_files/use_cases/waccm_ma_hist_cam7.xml @@ -22,7 +22,7 @@ SERIAL -atm/waccm/lb/LBC_17500116-20221216_CMIP7_0p5degLat_c250326.nc +atm/waccm/lb/CMIP7/LBC_17500116-20221216_CMIP7_0p5degLat_c250326.nc 'CCL4', 'CF2CLBR', 'CF3BR', 'CFC11', 'CFC113', 'CFC12', 'CH3BR', 'CH3CCL3', 'CH3CL', 'CH4', 'CO2', 'H2', 'HCFC22', 'N2O', 'CFC114', 'CFC115', 'HCFC141B', 'HCFC142B', 'CH2BR2', 'CHBR3', 'H2402', 'OCS', 'CFC11eq' diff --git a/bld/namelist_files/use_cases/waccm_sc_hist_cam7.xml b/bld/namelist_files/use_cases/waccm_sc_hist_cam7.xml index 81d66d4eb6..32753d17ad 100644 --- a/bld/namelist_files/use_cases/waccm_sc_hist_cam7.xml +++ b/bld/namelist_files/use_cases/waccm_sc_hist_cam7.xml @@ -18,7 +18,7 @@ SERIAL -atm/waccm/lb/LBC_17500116-20221216_CMIP7_0p5degLat_c250326.nc +atm/waccm/lb/CMIP7/LBC_17500116-20221216_CMIP7_0p5degLat_c250326.nc 'CO2','CH4','N2O','CFC11','CFC12','CFC11eq' From 4eb7924c7cd57847c3e33073d60f568dabf99c47 Mon Sep 17 00:00:00 2001 From: Cheryl Craig Date: Mon, 29 Dec 2025 11:35:34 -0700 Subject: [PATCH 5/7] Update cime for an updated wget location for inputdata --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 794b3af75a..dd04a95b6f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -138,7 +138,7 @@ fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git [submodule "cime"] path = cime url = https://github.com/ESMCI/cime -fxtag = cime6.1.144 +fxtag = cime6.1.145 fxrequired = ToplevelRequired fxDONOTUSEurl = https://github.com/ESMCI/cime From 97c705494cbc6edf835dda5983c34e11e280e007 Mon Sep 17 00:00:00 2001 From: Cheryl Craig Date: Mon, 29 Dec 2025 11:48:21 -0700 Subject: [PATCH 6/7] Update cime submodule --- cime | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cime b/cime index e2cf67742b..0fc24bad91 160000 --- a/cime +++ b/cime @@ -1 +1 @@ -Subproject commit e2cf67742b1da605da1f782bb53e85915e375a3c +Subproject commit 0fc24bad917f692bce6438d56c573b4e9c7a6ef8 From 13987a82c462d97a66050360e3db6f36cbc21d8d Mon Sep 17 00:00:00 2001 From: Cheryl Craig Date: Mon, 29 Dec 2025 14:15:06 -0700 Subject: [PATCH 7/7] Update ChangeLog for cam6_4_140 --- doc/ChangeLog | 53 ++++++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 705baf622d..5bc197e67e 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -3,7 +3,7 @@ Tag name: cam6_4_140 Originator(s): cacraigucar, hannay -Date: Dec 24, 2025 +Date: Dec 29, 2025 One-line Summary: Update LBC file for CAM7 use_cases Github PR URL: https://github.com/ESCOMP/CAM/pull/1465 @@ -33,45 +33,46 @@ M bld/namelist_files/use_cases/waccm_ma_hist_cam7.xml M bld/namelist_files/use_cases/waccm_sc_hist_cam7.xml - update the LBC file used in CAM7 runs +M .gitmodules +M cime + - update cime to get the new inputdata location for wget + If there were any failures reported from running test_driver.sh on any test platform, and checkin with these failures has been OK'd by the gatekeeper, then copy the lines from the td.*.status files for the failed tests to the appropriate machine below. All failed tests must be justified. derecho/intel/aux_cam: + ERC_D_Ln9.mpasa120_mpasa120.FHISTC_LTso.derecho_intel.cam-outfrq9s_mpasa120 (Overall: DIFF) details: + ERC_D_Ln9.ne30pg3_ne30pg3_mt232.F1850C_LTso.derecho_intel.cam-outfrq9s (Overall: DIFF) details: + ERI_D_Ln18.ne30pg3_ne30pg3_mt232.FHISTC_LTso.derecho_intel.cam-outfrq3s_eri (Overall: DIFF) details: + ERP_D_Ln9.ne30pg3_ne30pg3_mt232.F1850C_MTso.derecho_intel.cam-outfrq9s (Overall: DIFF) details: + ERP_Ld3.ne16pg3_ne16pg3_mg17.FHISTC_WAt1ma.derecho_intel.cam-reduced_hist1d (Overall: DIFF) details: + ERP_Ln9.ne30pg3_ne30pg3_mg17.FHISTC_WAma.derecho_intel.cam-outfrq9s (Overall: DIFF) details: + ERR_Ln9.ne16pg3_ne16pg3_mt232.FHISTC_LTso.derecho_intel.cam-outfrq9s_bwic (Overall: DIFF) details: + ERS_Ln9.ne30pg3_ne30pg3_mg17.FHISTC_WXma.derecho_intel.cam-outfrq9s_ctem (Overall: DIFF) details: + SMS_C2_D_Ln9.ne16pg3_ne16pg3_mg17.FHISTC_WXma.derecho_intel.cam-outfrq9s (Overall: DIFF) details: + SMS_D_Ln9.ne30pg3_ne30pg3_mt232.FHISTC_MTso.derecho_intel.cam-outfrq9s (Overall: DIFF) details: + - Answer changes for CAM7 runs due to new LBC file -derecho/nvhpc/aux_cam: + SMS_D_Ln9_P1536x1.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.derecho_intel.cam-outfrq9s (Overall: PASS) details: + - This test appears to no longer fail after the last derecho downtime. Will no longer track this failure in the ChangeLog. + +derecho/nvhpc/aux_cam: (not run as nothing has changed with the file system) izumi/nag/aux_cam: + ERC_D_Ln9.ne3pg3_ne3pg3_mt232.FHISTC_LTso.izumi_nag.cam-cosp_rad_diags (Overall: DIFF) details: + ERC_D_Ln9.ne3pg3_ne3pg3_mt232.FHISTC_LTso.izumi_nag.cam-outfrq9s_nochem (Overall: DIFF) details: + - Answer changes for CAM7 runs due to new LBC file izumi/gnu/aux_cam: + ERC_D_Ln9.mpasa480_mpasa480_mt232.FHISTC_LTso.izumi_gnu.cam-outfrq9s_mpasa480 (Overall: DIFF) details: + ERC_D_Ln9.ne3pg3_ne3pg3_mt232.FHISTC_LTso.izumi_gnu.cam-sat_lcltod (Overall: DIFF) details: + SMS_D_Ln3.ne3pg3_ne3pg3_mt232.PC7.izumi_gnu.cam-pc7_ne3pg3 (Overall: DIFF) details: + - Answer changes for CAM7 runs due to new LBC file -CAM tag used for the baseline comparison tests if different than previous -tag: - -Summarize any changes to answers, i.e., -- what code configurations: -- what platforms/compilers: -- nature of change (roundoff; larger than roundoff but same climate; new - climate): - -If bitwise differences were observed, how did you show they were no worse -than roundoff? - -If this tag changes climate describe the run(s) done to evaluate the new -climate in enough detail that it(they) could be reproduced, i.e., -- source tag (all code used must be in the repository): -- platform/compilers: -- configure commandline: -- build-namelist command (or complete namelist): -- MSS location of output: - -MSS location of control simulations used to validate new climate: - -URL for AMWG diagnostics output used to validate new climate: =============================================================== - =============================================================== Tag name: cam6_4_139