diff --git a/bld/build-namelist b/bld/build-namelist
index 1d47f1dadc..612ecd6260 100755
--- a/bld/build-namelist
+++ b/bld/build-namelist
@@ -676,9 +676,6 @@ if ($analytic_ic) {
add_default($nl, 'analytic_ic_type');
}
-#
-# Simulated years: sim_year and sim_year_start
-#
# sim_year
# This is used to identify appropriate defaults for climatological or transient
# forcing datasets. If user hasn't specified then default to 2000 (present day climatology).
@@ -689,12 +686,14 @@ if (defined $nl->get_value('sim_year')) {
$sim_year =~ s/['"]//g; #"'
}
-# sim_year_start
-# If sim_year is input as a range of years, then select the first year
-# to use with some datasets
-my $sim_year_start = $sim_year;
+# If sim_year is input as a range of years, then extract the first and last years
+my $sim_year_first = $sim_year;
+my $sim_year_last = $sim_year;
+my $sim_year_align = '1';
if ($sim_year =~ /(\d+)-(\d+)/) {
- $sim_year_start = $1;
+ $sim_year_first = $1;
+ $sim_year_last = $2;
+ $sim_year_align = $1;
}
# Setup default ndep streams only if not simple_phys or aqua_mode and
@@ -704,9 +703,9 @@ if (!($simple_phys or $aqua_mode)) {
if ((!$chem_nitrodep) or ($chem =~ /geoschem/)) {
add_default($nl, 'stream_ndep_mesh_filename');
add_default($nl, 'stream_ndep_data_filename', 'sim_year'=>$sim_year);
- add_default($nl, 'stream_ndep_year_first', 'sim_year'=>$sim_year);
- add_default($nl, 'stream_ndep_year_last', 'sim_year'=>$sim_year);
- add_default($nl, 'stream_ndep_year_align', 'sim_year'=>$sim_year);
+ add_default($nl, 'stream_ndep_year_first', 'val'=>$sim_year_first);
+ add_default($nl, 'stream_ndep_year_last', 'val'=>$sim_year_last);
+ add_default($nl, 'stream_ndep_year_align', 'val'=>$sim_year_align);
}
}
diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml
index a2df7559f7..9b8758b424 100644
--- a/bld/namelist_files/namelist_defaults_cam.xml
+++ b/bld/namelist_files/namelist_defaults_cam.xml
@@ -2035,19 +2035,6 @@
lnd/clm2/ndepdata/fndep_clm_hist_b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensmean_1849-2015_monthly_0.9x1.25_c180926.nc
lnd/clm2/ndepdata/fndep_clm_WACCM6_CMIP6piControl001_y21-50avg_1850monthly_0.95x1.25_c180802.nc
-2000
-1850
-1850
-2010
-
-2000
-1850
-2015
-2010
-
-1
-1850
-
.false.
.true.
diff --git a/bld/namelist_files/use_cases/1850-2005_cam4.xml b/bld/namelist_files/use_cases/1850-2005_cam4.xml
new file mode 100644
index 0000000000..220757fd97
--- /dev/null
+++ b/bld/namelist_files/use_cases/1850-2005_cam4.xml
@@ -0,0 +1,35 @@
+
+
+
+
+
+atm/cam/solar/SOLAR_TSI_Lean_1610-2007_annual_c090324.nc
+
+
+RAMPED
+atm/cam/ggas/ghg_hist_1765-2005_c091218.nc
+
+
+atm/cam/chem/trop_mozart_aero/aero
+aero_1.9x2.5_L26_1850-2005_c091112.nc
+INTERP_MISSING_MONTHS
+
+
+atm/cam/chem/trop_mozart_aero/aero
+aerosoldep_monthly_1849-2006_1.9x2.5_c090803.nc
+INTERP_MISSING_MONTHS
+
+
+atm/cam/ozone
+ozone_1.9x2.5_L26_1850-2005_c091112.nc
+O3
+INTERP_MISSING_MONTHS
+
+
+atm/cam/volc
+CCSM4_volcanic_1850-2008_prototype1.nc
+
+
+1850-2015
+
+
diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml
index 0d7dc64e72..863e3a6285 100644
--- a/cime_config/config_compsets.xml
+++ b/cime_config/config_compsets.xml
@@ -298,6 +298,11 @@
+
+ FHIST_C4
+ HIST_CAM40_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV
+
+
F2010climo
2010_CAM60_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV
diff --git a/cime_config/config_pes.xml b/cime_config/config_pes.xml
index fe5db44ecf..972469abbc 100644
--- a/cime_config/config_pes.xml
+++ b/cime_config/config_pes.xml
@@ -150,7 +150,7 @@
-
+
none
@@ -261,28 +261,8 @@
-
-
-
- 360
- 360
- 360
- 360
- 360
- 360
-
-
- 1
- 1
- 1
- 1
- 1
- 1
-
-
-
-
+
-4
-4
@@ -303,41 +283,6 @@
-
-
- none
-
- 720
- 720
- 720
- 720
- 720
- 720
- 720
- 720
-
-
- 1
- 1
- 1
- 1
- 1
- 1
- 1
- 1
-
-
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
-
-
-
none
@@ -361,41 +306,6 @@
-
-
- none
-
- 1728
- 1728
- 1728
- 1728
- 1728
- 1728
- 1728
- 1728
-
-
- 1
- 1
- 1
- 1
- 1
- 1
- 1
- 1
-
-
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
-
-
-
none
@@ -456,127 +366,8 @@
-
-
-
- none
-
- -8
- -8
- -8
- -8
- -8
- -8
-
-
- 1
- 1
- 1
- 1
- 1
- 1
-
-
- 0
- 0
- 0
- 0
- 0
- 0
-
-
-
- none
-
- -12
- -12
- -12
- -12
- -12
- -12
-
-
- 1
- 1
- 1
- 1
- 1
- 1
-
-
- 0
- 0
- 0
- 0
- 0
- 0
-
-
-
- none
-
- -50
- -50
- -50
- -50
- -50
- -50
-
-
- 1
- 1
- 1
- 1
- 1
- 1
-
-
- 0
- 0
- 0
- 0
- 0
- 0
-
-
-
-
+
-
-
- none
-
- 1800
- 1800
- 1800
- 1800
- 1800
- 1800
- 1800
- 1800
-
-
- 1
- 1
- 1
- 1
- 1
- 1
- 1
- 1
-
-
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
-
-
-
none
@@ -1043,146 +834,7 @@
-
-
-
- 36
- none
-
- 360
- 360
- 360
- 360
- 360
- 360
- 360
- 360
-
-
- 3
- 3
- 3
- 3
- 3
- 3
- 3
- 3
-
-
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
-
-
-
-
-
-
- none
-
- 48
- 48
- 48
- 48
- 48
- 48
- 48
- 48
-
-
- 3
- 3
- 3
- 3
- 3
- 3
- 3
- 3
-
-
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
-
-
-
- none
-
- 144
- 144
- 144
- 144
- 144
- 144
- 144
- 144
-
-
- 3
- 3
- 3
- 3
- 3
- 3
- 3
- 3
-
-
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
-
-
-
- none
-
- 288
- 288
- 288
- 288
- 288
- 288
- 288
- 288
-
-
- 3
- 3
- 3
- 3
- 3
- 3
- 3
- 3
-
-
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
-
-
-
none
@@ -1218,78 +870,8 @@
-
-
- none
-
- 192
- 192
- 192
- 192
- 192
- 192
- 192
- 192
-
-
- 1
- 1
- 1
- 1
- 1
- 1
- 1
- 1
-
-
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
-
-
-
-
-
- none
-
- 864
- 864
- 864
- 864
- 864
- 864
- 864
- 864
-
-
- 1
- 1
- 1
- 1
- 1
- 1
- 1
- 1
-
-
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
-
-
-
none
@@ -1388,35 +970,6 @@
-
-
- none
-
- 384
- 384
- 384
- 384
- 384
- 384
-
-
- 3
- 3
- 3
- 3
- 3
- 3
-
-
- 0
- 0
- 0
- 0
- 0
- 0
-
-
-
none
@@ -1475,74 +1028,6 @@
-
-
- none
-
- 768
- 768
- 768
- 768
- 768
- 768
- 768
- 768
-
-
- 3
- 3
- 3
- 3
- 3
- 3
- 3
- 3
-
-
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
-
-
-
- none
-
- 1800
- 1800
- 1800
- 1800
- 1800
- 1800
- 1800
- 1800
-
-
- 1
- 1
- 1
- 1
- 1
- 1
- 1
- 1
-
-
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
-
-
-
diff --git a/cime_config/testdefs/testlist_cam.xml b/cime_config/testdefs/testlist_cam.xml
index 24d6bc3ec8..e471653e1d 100644
--- a/cime_config/testdefs/testlist_cam.xml
+++ b/cime_config/testdefs/testlist_cam.xml
@@ -77,20 +77,19 @@
-
-
-
+
-
+
-
+
+
@@ -199,7 +198,7 @@
-
+
@@ -440,16 +439,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -1205,7 +1194,7 @@
-
+
@@ -1583,6 +1572,15 @@
+
+
+
+
+
+
+
+
+
@@ -1592,7 +1590,7 @@
-
+
@@ -1601,6 +1599,15 @@
+
+
+
+
+
+
+
+
+
@@ -1814,6 +1821,15 @@
+
+
+
+
+
+
+
+
+
@@ -2393,7 +2409,7 @@
-
+
diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq3s_refined/shell_commands b/cime_config/testdefs/testmods_dirs/cam/outfrq3s_refined/shell_commands
deleted file mode 100644
index 712d59a3d4..0000000000
--- a/cime_config/testdefs/testmods_dirs/cam/outfrq3s_refined/shell_commands
+++ /dev/null
@@ -1,3 +0,0 @@
-./xmlchange ROF_NCPL=\$ATM_NCPL
-./xmlchange GLC_NCPL=\$ATM_NCPL
-./xmlchange --append CAM_CONFIG_OPTS="-analytic_ic -nlev 32"
diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq3s_refined/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/outfrq3s_refined/user_nl_cam
deleted file mode 100644
index 29096a62e9..0000000000
--- a/cime_config/testdefs/testmods_dirs/cam/outfrq3s_refined/user_nl_cam
+++ /dev/null
@@ -1,7 +0,0 @@
-mfilt=1,1,1,1,1,1
-ndens=1,1,1,1,1,1
-nhtfrq=3,3,3,3,3,3
-inithist='ENDOFRUN'
-pbuf_global_allocate=.false.
-se_refined_mesh=.true.
-analytic_ic_type = 'moist_baroclinic_wave_dcmip2016'
diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq3s_refined/user_nl_clm b/cime_config/testdefs/testmods_dirs/cam/outfrq3s_refined/user_nl_clm
deleted file mode 100644
index f3ac27f1e6..0000000000
--- a/cime_config/testdefs/testmods_dirs/cam/outfrq3s_refined/user_nl_clm
+++ /dev/null
@@ -1,27 +0,0 @@
-!----------------------------------------------------------------------------------
-! Users should add all user specific namelist changes below in the form of
-! namelist_var = new_namelist_value
-!
-! Include namelist variables for drv_flds_in ONLY if -megan and/or -drydep options
-! are set in the CLM_NAMELIST_OPTS env variable.
-!
-! EXCEPTIONS:
-! Set use_cndv by the compset you use and the CLM_BLDNML_OPTS -dynamic_vegetation setting
-! Set use_vichydro by the compset you use and the CLM_BLDNML_OPTS -vichydro setting
-! Set use_cn by the compset you use and CLM_BLDNML_OPTS -bgc setting
-! Set use_crop by the compset you use and CLM_BLDNML_OPTS -crop setting
-! Set spinup_state by the CLM_BLDNML_OPTS -bgc_spinup setting
-! Set irrigate by the CLM_BLDNML_OPTS -irrig setting
-! Set dtime with L_NCPL option
-! Set fatmlndfrc with LND_DOMAIN_PATH/LND_DOMAIN_FILE options
-! Set finidat with RUN_REFCASE/RUN_REFDATE/RUN_REFTOD options for hybrid or branch cases
-! (includes $inst_string for multi-ensemble cases)
-! Set glc_grid with CISM_GRID option
-! Set glc_smb with GLC_SMB option
-! Set maxpatch_glcmec with GLC_NEC option
-! Set glc_do_dynglacier with GLC_TWO_WAY_COUPLING env variable
-!----------------------------------------------------------------------------------
-hist_nhtfrq = 3
-hist_mfilt = 1
-hist_ndens = 1
-
diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq3s_refined/user_nl_cpl b/cime_config/testdefs/testmods_dirs/cam/outfrq3s_refined/user_nl_cpl
deleted file mode 100644
index 398535cf65..0000000000
--- a/cime_config/testdefs/testmods_dirs/cam/outfrq3s_refined/user_nl_cpl
+++ /dev/null
@@ -1,2 +0,0 @@
-reprosum_diffmax=1.0e-14
-reprosum_recompute=.true.
diff --git a/doc/ChangeLog b/doc/ChangeLog
index f5e1809e66..20b8ea8072 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,5 +1,109 @@
===============================================================
+Tag name:
+Originator(s): eaton
+Date:
+One-line Summary: New F compset for cam4; updates to CAM testing.
+Github PR URL:
+
+Purpose of changes (include the issue number and title text for each relevant GitHub issue):
+
+. Resolve #1329 - Create an F compset for CAM4
+ - Add compset FHIST_C4
+
+. Modify some MPAS tests.
+
+. Replace cam6 version of a "nochem" test by a cam7-lt version.
+
+
+Describe any changes made to build system: none
+
+Describe any changes made to the namelist: none
+
+List any changes to the defaults for the boundary datasets: none
+
+Describe any substantial timing or memory changes: none
+
+Code reviewed by:
+
+List all files eliminated:
+
+cime_config/testdefs/testmods_dirs/cam/outfrq3s_refined
+. remove unused testmods. se_refined_mesh is set by namelist defaults.
+
+List all files added and what they do:
+
+bld/namelist_files/use_cases/1850-2005_cam4.xml
+. This file copied from cam5_4_01. Then modify as follows:
+ - remove setting start_ymd (done in config_component.xml)
+ - remove default output for AR5 runs
+ - remove SST datasets (now handled by DOM)
+
+List all existing files that have been modified, and describe the changes:
+
+bld/build-namelist
+bld/namelist_files/namelist_defaults_cam.xml
+. refactor how stream_ndep_year_* values are set.
+
+cime_config/config_compsets.xml
+. add FHIST for CAM4:
+ FHIST_C4 = HIST_CAM40_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV
+
+cime_config/config_pes.xml
+. remove old settings for cheyenne
+. modify settings for mpasa120 on derecho to use 4 nodes for any compset
+. remove izumi setting that forces WACCM compsets on 1.9x2.5 grid to use
+ 192 tasks. The only 2 deg WACCM test in aux_cam runs fine with the
+ default 24 tasks.
+
+cime_config/testdefs/testlist_cam.xml
+. remove P512 from test specifications for mpasa120 grid. It's now the
+ default config on derecho.
+. move the '-chem none' test from cam6 to cam7-lt. This test uses cam7
+ physics with prescribed GHGs and bulk aerosols.
+ Replace
+ SMS_Ln9.f19_f19_mg17.FHIST.derecho_intel.cam-outfrq9s_nochem
+ by
+ ERC_D_Ln9.ne3pg3_ne3pg3_mt232.FHISTC_LTso.izumi_nag.cam-outfrq9s_nochem
+. move F1850 test to low res on izumi. change to SMS since cam6 restarts
+ throughoutly tested elsewhere.
+ Replace
+ ERP_Ln9.f09_f09_mg17.F1850.derecho_intel.cam-outfrq9s
+ by
+ SMS_D_Ln9.f10_f10_mt232.F1850.izumi_nag.cam-outfrq9s
+. add new FHIST test for cam4
+ ERC_D_Ln9.ne3pg3_ne3pg3_mt232.FHIST_C4.izumi_gnu.cam-outfrq9s
+. Change test to run on single izumi node
+ Replace
+ SMS_P48x1_D_Ln9.f19_f19_mg17.FW4madSD.izumi_gnu.cam-outfrq9s
+ by
+ SMS_D_Ln9.f19_f19_mt232.FW4madSD.izumi_gnu.cam-outfrq9s
+. add new test
+ ERC_D_Ln9.mpasa480_mpasa480_mt232.FHISTC_LTso.izumi_gnu.cam-outfrq9s_mpasa480
+. remove - unicon is being removed.
+ ERC_D_Ln9.f10_f10_mg37.QPC5.izumi_gnu.cam-outfrq3s_unicon
+
+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:
+
+===============================================================
+===============================================================
+
Tag name: cam6_4_097
Originator(s): fvitt
Date: 13 Jun 2025