diff --git a/bld/namelist_files/mozart_master_gas_drydep_list.xml b/bld/namelist_files/mozart_master_gas_drydep_list.xml
index 7343d3f341..2d5264216c 100644
--- a/bld/namelist_files/mozart_master_gas_drydep_list.xml
+++ b/bld/namelist_files/mozart_master_gas_drydep_list.xml
@@ -77,7 +77,6 @@
ISOPNOOHB
ISOPNOOHD
ISOPOH
- ISOPNO3
ISOPOOH
LIMON
MACR
diff --git a/bld/namelist_files/mozart_master_gas_wetdep_list.xml b/bld/namelist_files/mozart_master_gas_wetdep_list.xml
index c82ed1fcfa..c937493abe 100644
--- a/bld/namelist_files/mozart_master_gas_wetdep_list.xml
+++ b/bld/namelist_files/mozart_master_gas_wetdep_list.xml
@@ -127,7 +127,6 @@
HOCL
HYAC
HYDRALD
- ISOPNO3
ISOPOOH
MACR
MACRN
@@ -172,7 +171,6 @@
XHO2NO2
XONIT
XONITR
- XISOPNO3
diff --git a/bld/namelist_files/use_cases/1850_trop_strat_t4s_cam7.xml b/bld/namelist_files/use_cases/1850_trop_strat_t4s_cam7.xml
new file mode 100644
index 0000000000..dfd6d55003
--- /dev/null
+++ b/bld/namelist_files/use_cases/1850_trop_strat_t4s_cam7.xml
@@ -0,0 +1,48 @@
+
+
+
+
+
+atm/cam/inic/se/1850C_T4S_ne30pg3_spinup01.cam.i.0002-01-01_c241114.nc
+
+
+atm/cam/solar/SolarForcingCMIP6_18491230-23000102_c20200615.nc
+FIXED
+18500701
+
+
+CYCLICAL
+1850
+
+
+CYCLICAL
+1850
+
+ 'num_a1 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_num_so4_a1_anthro-ene_vertical_mol_175001-201412_ne30pg3_c20200103.nc',
+ 'num_a1 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_num_a1_so4_contvolcano_vertical_850-5000_ne30pg3_c20200125.nc',
+ 'num_a2 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_num_a2_so4_contvolcano_vertical_850-5000_ne30pg3_c20200125.nc',
+ 'SO2 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_SO2_contvolcano_vertical_850-5000_ne30pg3_c20200125.nc',
+ 'so4_a1 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_so4_a1_anthro-ene_vertical_mol_175001-201412_ne30pg3_c20200103.nc',
+ 'so4_a1 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_so4_a1_contvolcano_vertical_850-5000_ne30pg3_c20200125.nc',
+ 'so4_a2 -> $INPUTDATA_ROOT/atm/cam/chem/emis/historical_ne30pg3/emissions-cmip6_so4_a2_contvolcano_vertical_850-5000_ne30pg3_c20200125.nc'
+
+
+
+CYCLICAL
+1850
+
+
+CYCLICAL
+1850
+atm/waccm/lb/LBC_17500116-25001216_CMIP6_SSP585_0p5degLat_c20200824.nc
+
+ 'CCL4', 'CF2CLBR', 'CF3BR', 'CFC11', 'CFC113', 'CFC12', 'CH3BR', 'CH3CCL3', 'CH3CL', 'CH4', 'CO2', 'H2',
+ 'HCFC22', 'N2O', 'CFC114', 'CFC115', 'HCFC141B', 'HCFC142B', 'H2402', 'OCS', 'SF6', 'CFC11eq'
+
+
+
+.true.
+.false.
+.false.
+
+
diff --git a/bld/namelist_files/use_cases/2000_trop_strat_vbs_cam6.xml b/bld/namelist_files/use_cases/2000_trop_strat_vbs_cam6.xml
index 2ba0c53847..47d97d6249 100644
--- a/bld/namelist_files/use_cases/2000_trop_strat_vbs_cam6.xml
+++ b/bld/namelist_files/use_cases/2000_trop_strat_vbs_cam6.xml
@@ -190,7 +190,7 @@
'WD_CH3CN', 'WD_CH3COCHO', 'WD_CH3COOH', 'WD_CH3COOOH', 'WD_CH3COCH3', 'WD_CH3OH', 'WD_CH3OOH', 'WD_CLONO2', 'WD_COF2', 'WD_COFCL',
'WD_EOOH', 'WD_GLYALD', 'WD_H2O2', 'WD_H2SO4', 'WD_HBR', 'WD_HCL', 'WD_HCN', 'WD_HCOOH', 'WD_HF',
'WD_HNO3', 'WD_HO2NO2', 'WD_HOBR', 'WD_HOCL', 'WD_HONITR', 'WD_HPALD', 'WD_HYAC', 'WD_HYDRALD', 'WD_IEPOX',
- 'WD_ISOPNITA', 'WD_ISOPNITB', 'WD_ISOPNO3', 'WD_ISOPNOOH', 'WD_ISOPOOH', 'WD_IVOC', 'WD_MACR', 'WD_MACROOH', 'WD_MEKOOH',
+ 'WD_ISOPNITA', 'WD_ISOPNITB', 'WD_ISOPNOOH', 'WD_ISOPOOH', 'WD_IVOC', 'WD_MACR', 'WD_MACROOH', 'WD_MEKOOH',
'WD_MVK', 'WD_NC4CH2OH', 'WD_NC4CHO', 'WD_NDEP', 'WD_NH3', 'WD_NH4', 'WD_NHDEP', 'WD_NOA',
'WD_NTERPOOH', 'WD_ONITR', 'WD_PHENOOH', 'WD_POOH', 'WD_ROOH', 'WD_SO2', 'WD_SOAG0', 'WD_SOAG1', 'WD_SOAG2',
'WD_SOAG3', 'WD_SOAG4', 'WD_SVOC', 'WD_TERP2OOH', 'WD_TERPNIT', 'WD_TERPOOH', 'WD_TERPROD1', 'WD_TERPROD2', 'WD_TOLOOH',
@@ -198,7 +198,7 @@
'DF_C3H7OOH', 'DF_C6H5OOH', 'DF_CH2O', 'DF_CH3CHO', 'DF_CH3CN', 'DF_CH3COCH3', 'DF_CH3COCHO', 'DF_CH3COOH', 'DF_CH3COOOH',
'DF_CH3OH', 'DF_CH3OOH', 'DF_CO', 'DF_EOOH', 'DF_GLYALD', 'DF_H2O2', 'DF_H2SO4', 'DF_HCN', 'DF_HCOOH',
'DF_HNO3', 'DF_HO2NO2', 'DF_HONITR', 'DF_HPALD', 'DF_HYAC', 'DF_HYDRALD', 'DF_IEPOX', 'DF_ISOPNITA', 'DF_ISOPNITB',
- 'DF_ISOPNO3', 'DF_ISOPNOOH', 'DF_ISOPOOH', 'DF_IVOC', 'DF_MACROOH', 'DF_MEKOOH', 'DF_MPAN', 'DF_NC4CH2OH', 'DF_NC4CHO',
+ 'DF_ISOPNOOH', 'DF_ISOPOOH', 'DF_IVOC', 'DF_MACROOH', 'DF_MEKOOH', 'DF_MPAN', 'DF_NC4CH2OH', 'DF_NC4CHO',
'dry_deposition_NHx_as_N', 'DF_NH3', 'DF_NH4', 'DF_NO', 'DF_NO2', 'DF_NOA', 'DF_NTERPOOH', 'DF_O3', 'DF_ONITR',
'DF_PAN', 'DF_PHENOOH', 'DF_POOH', 'DF_ROOH', 'DF_SO2', 'DF_SOAG0', 'DF_SOAG1', 'DF_SOAG2', 'DF_SOAG3',
'DF_SOAG4', 'DF_SVOC', 'DF_TERP2OOH', 'DF_TERPNIT', 'DF_TERPOOH', 'DF_TERPROD1', 'DF_TERPROD2', 'DF_TOLOOH', 'DF_XOOH',
diff --git a/bld/namelist_files/use_cases/2010_trop_strat_vbs_cam6.xml b/bld/namelist_files/use_cases/2010_trop_strat_vbs_cam6.xml
index 1000976390..a0b07f3248 100644
--- a/bld/namelist_files/use_cases/2010_trop_strat_vbs_cam6.xml
+++ b/bld/namelist_files/use_cases/2010_trop_strat_vbs_cam6.xml
@@ -381,7 +381,7 @@
'WD_CH3CN', 'WD_CH3COCHO', 'WD_CH3COOH', 'WD_CH3COOOH', 'WD_CH3COCH3', 'WD_CH3OH', 'WD_CH3OOH', 'WD_CLONO2', 'WD_COF2', 'WD_COFCL',
'WD_EOOH', 'WD_GLYALD', 'WD_H2O2', 'WD_H2SO4', 'WD_HBR', 'WD_HCL', 'WD_HCN', 'WD_HCOOH', 'WD_HF',
'WD_HNO3', 'WD_HO2NO2', 'WD_HOBR', 'WD_HOCL', 'WD_HONITR', 'WD_HPALD', 'WD_HYAC', 'WD_HYDRALD', 'WD_IEPOX',
- 'WD_ISOPNITA', 'WD_ISOPNITB', 'WD_ISOPNO3', 'WD_ISOPNOOH', 'WD_ISOPOOH', 'WD_IVOC', 'WD_MACR', 'WD_MACROOH', 'WD_MEKOOH',
+ 'WD_ISOPNITA', 'WD_ISOPNITB', 'WD_ISOPNOOH', 'WD_ISOPOOH', 'WD_IVOC', 'WD_MACR', 'WD_MACROOH', 'WD_MEKOOH',
'WD_MVK', 'WD_NC4CH2OH', 'WD_NC4CHO', 'WD_NDEP', 'WD_NH3', 'WD_NH4', 'WD_NHDEP', 'WD_NOA',
'WD_NTERPOOH', 'WD_ONITR', 'WD_PHENOOH', 'WD_POOH', 'WD_ROOH', 'WD_SO2', 'WD_SOAG0', 'WD_SOAG1', 'WD_SOAG2',
'WD_SOAG3', 'WD_SOAG4', 'WD_SVOC', 'WD_TERP2OOH', 'WD_TERPNIT', 'WD_TERPOOH', 'WD_TERPROD1', 'WD_TERPROD2', 'WD_TOLOOH',
@@ -389,7 +389,7 @@
'DF_C3H7OOH', 'DF_C6H5OOH', 'DF_CH2O', 'DF_CH3CHO', 'DF_CH3CN', 'DF_CH3COCH3', 'DF_CH3COCHO', 'DF_CH3COOH', 'DF_CH3COOOH',
'DF_CH3OH', 'DF_CH3OOH', 'DF_CO', 'DF_EOOH', 'DF_GLYALD', 'DF_H2O2', 'DF_H2SO4', 'DF_HCN', 'DF_HCOOH',
'DF_HNO3', 'DF_HO2NO2', 'DF_HONITR', 'DF_HPALD', 'DF_HYAC', 'DF_HYDRALD', 'DF_IEPOX', 'DF_ISOPNITA', 'DF_ISOPNITB',
- 'DF_ISOPNO3', 'DF_ISOPNOOH', 'DF_ISOPOOH', 'DF_IVOC', 'DF_MACROOH', 'DF_MEKOOH', 'DF_MPAN', 'DF_NC4CH2OH', 'DF_NC4CHO',
+ 'DF_ISOPNOOH', 'DF_ISOPOOH', 'DF_IVOC', 'DF_MACROOH', 'DF_MEKOOH', 'DF_MPAN', 'DF_NC4CH2OH', 'DF_NC4CHO',
'dry_deposition_NHx_as_N', 'DF_NH3', 'DF_NH4', 'DF_NO', 'DF_NO2', 'DF_NOA', 'DF_NTERPOOH', 'DF_O3', 'DF_ONITR',
'DF_PAN', 'DF_PHENOOH', 'DF_POOH', 'DF_ROOH', 'DF_SO2', 'DF_SOAG0', 'DF_SOAG1', 'DF_SOAG2', 'DF_SOAG3',
'DF_SOAG4', 'DF_SVOC', 'DF_TERP2OOH', 'DF_TERPNIT', 'DF_TERPOOH', 'DF_TERPROD1', 'DF_TERPROD2', 'DF_TOLOOH', 'DF_XOOH',
diff --git a/bld/namelist_files/use_cases/hist_trop_strat_ts4_cam7.xml b/bld/namelist_files/use_cases/hist_trop_strat_t4s_cam7.xml
similarity index 100%
rename from bld/namelist_files/use_cases/hist_trop_strat_ts4_cam7.xml
rename to bld/namelist_files/use_cases/hist_trop_strat_t4s_cam7.xml
diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml
index 17bb9cf5a9..45b2506bbf 100644
--- a/cime_config/config_component.xml
+++ b/cime_config/config_component.xml
@@ -233,14 +233,14 @@
waccm_tsmlt_1850_cam6
waccm_ma_1850_cam6
waccm_sc_1850_cam6
- 1850_cam_lt
- 1850_cam_mt
+ 1850_cam_lt
+ 1850_cam_mt
2000_cam4_trop_chem
waccmxie_ma_2000_cam4
waccmx_ma_2000_cam4
- 2000_cam6
+ 2000_cam6
2000_cam6
waccm_tsmlt_2000_cam6
waccm_ma_2000_cam6
@@ -281,7 +281,8 @@
waccm_ma_hist_cam6
waccm_ma_hist_cam4
hist_trop_strat_vbs_cam6
- hist_trop_strat_ts4_cam7
+ hist_trop_strat_t4s_cam7
+ 1850_trop_strat_t4s_cam7
hist_trop_strat_nudged_cam6
hist_trop_strat_vbsext_cam6
hist_trop_strat_vbsfire_cam6
@@ -394,9 +395,9 @@
char
2000
- 1850
+ 1850
2010
- 1850
+ 1850
2015
run_component_cam
@@ -409,8 +410,8 @@
2000
2010
- 1850
- 2015
+ 1850
+ 2015
2101
run_component_cam
@@ -422,7 +423,7 @@
char
1
- 1850
+ 1850
2015
run_component_cam
@@ -439,10 +440,10 @@
$DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_f09_g17.CMIP6-SSP1-2.6-WACCM_1849-2101_monthly_c191007.nc
$DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_f09_g17.CMIP6-SSP2-4.5-WACCM_1849-2101_monthly_c191007.nc
$DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_SSP370_b.e21.BWSSP370cmip6.f09_g17.CMIP6-SSP3-7.0-WACCM.002_1849-2101_monthly_0.9x1.25_c211216.nc
- $DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_hist_b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensmean_1849-2015_monthly_0.9x1.25_c180926.nc
+ $DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_hist_b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensmean_1849-2015_monthly_0.9x1.25_c180926.nc
$DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_hist_b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensmean_1849-2015_monthly_0.9x1.25_c180926.nc
$DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_hist_b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensmean_1849-2015_monthly_0.9x1.25_c180926.nc
- $DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_WACCM6_CMIP6piControl001_y21-50avg_1850monthly_0.95x1.25_c180802.nc
+ $DIN_LOC_ROOT/lnd/clm2/ndepdata/fndep_clm_WACCM6_CMIP6piControl001_y21-50avg_1850monthly_0.95x1.25_c180802.nc
run_component_cam
env_run.xml
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 0b5e219e2f..6bb0bcedf7 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -120,6 +120,116 @@ Summarize any changes to answers:
===============================================================
===============================================================
+Tag name: cam6_4_047
+Originator(s): jedwards4b, fvitt
+Date: 19 November 2024
+One-line Summary: update config component to handle new compset names
+Github PR URL: https://github.com/ESCOMP/CAM/pull/1078
+
+Purpose of changes (include the issue number and title text for each relevant GitHub issue):
+#1077 - config_component.xml updates needed
+- Adds "C" designation for concentration-driven experiments
+#1189 - O3 is not invariant
+- Updates chemistry use cases for prescribed vs prognosed oxidants
+- Removes ISOPNO3 from wet/dry dep lists as it is a short-lived radical
+#1191 - remove mct submodule
+- Removes MCT submodule
+
+Describe any changes made to build system:
+M cime_config/config_component.xml
+- Add new "C" or "E" designation
+
+Describe any changes made to the namelist:
+A bld/namelist_files/use_cases/1850_trop_strat_t4s_cam7.xml
+- add new use case
+
+M bld/namelist_files/use_cases/2000_trop_strat_vbs_cam6.xml
+M bld/namelist_files/use_cases/2010_trop_strat_vbs_cam6.xml
+- remove ISOPNO3
+
+M bld/namelist_files/use_cases/hist_trop_strat_t4s_cam7.xml
+- renamed from bld/namelist_files/use_cases/hist_trop_strat_ts4_cam7.xml
+
+M bld/namelist_files/mozart_master_gas_drydep_list.xml
+M bld/namelist_files/mozart_master_gas_wetdep_list.xml
+- remove ISOPNO3
+
+List any changes to the defaults for the boundary datasets: none
+
+Describe any substantial timing or memory changes: none
+
+Code reviewed by: peverwhee
+
+List all files eliminated:
+D libraries/mct
+- remove mct submodule
+
+List all files added and what they do:
+A bld/namelist_files/use_cases/1850_trop_strat_t4s_cam7.xml
+- add new use case
+
+List all existing files that have been modified, and describe the changes:
+M bld/namelist_files/use_cases/2000_trop_strat_vbs_cam6.xml
+M bld/namelist_files/use_cases/2010_trop_strat_vbs_cam6.xml
+- remove ISOPNO3
+
+M bld/namelist_files/use_cases/hist_trop_strat_t4s_cam7.xml
+- renamed from bld/namelist_files/use_cases/hist_trop_strat_ts4_cam7.xml
+
+M cime_config/config_component.xml
+- Add new "C" or "E" designation
+
+M bld/namelist_files/mozart_master_gas_drydep_list.xml
+M bld/namelist_files/mozart_master_gas_wetdep_list.xml
+- remove ISOPNO3
+
+M src/cpl/nuopc/atm_stream_ndep.F90
+- set use_ndep_stream=.false. when stream_ndep_data_filename='UNSET'
+
+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.f19_f19_mg17.QPMOZ.derecho_intel.cam-outfrq3s (Overall: DIFF) details:
+ERP_Ld3.ne30pg3_ne30pg3_mg17.FHISTC_MTt4s.derecho_intel.cam-outfrq1d_aoa (Overall: DIFF) details:
+ERP_Ln9.ne30pg3_ne30pg3_mg17.FCnudged.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
+SMS_D_Ln9.f09_f09_mg17.FCvbsxHIST.derecho_intel.cam-outfrq9s (Overall: DIFF) details:
+SMS_D_Ln9.f19_f19_mg17.QPC2000climo.derecho_intel.cam-outfrq3s_usecase (Overall: DIFF) details:
+SMS_D_Ln9_P1280x1.ne30pg3_ne30pg3_mg17.FHISTC_MTt1s.derecho_intel.cam-outfrq9s_Leung_dust (Overall: DIFF) details:
+SMS_Ld1.ne30pg3_ne30pg3_mg17.FC2010climo.derecho_intel.cam-outfrq1d (Overall: DIFF) details:
+SMS_Lh12.f09_f09_mg17.FCSD_HCO.derecho_intel.cam-outfrq3h (Overall: DIFF) details:
+ - DIFFS and NLCOMP failures because of removal of ISOPNO3 and new "C/E" compset designations
+
+SMS_D_Ln9.f19_f19_mg17.FXHIST.derecho_intel.cam-outfrq9s_amie (Overall: FAIL)
+SMS_D_Ln9_P1280x1.ne0CONUSne30x8_ne0CONUSne30x8_mt12.FCHIST.derecho_intel.cam-outfrq9s (Overall: FAIL)
+ - pre-existing failures due to build-namelist error requiring CLM/CTSM external update.
+
+ERP_Ln9.f09_f09_mg17.FCSD_HCO.derecho_intel.cam-outfrq9s (Overall: FAIL)
+SMS_Ld1.f09_f09_mg17.FCHIST_GC.derecho_intel.cam-outfrq1d (Overall: DIFF)
+ - pre-existing failure due to HEMCO not having reproducible results issues #1018 and #856
+
+derecho/nvhpc/aux_cam: PASS
+
+izumi/nag/aux_cam:
+
+DAE.f45_f45_mg37.FHS94.izumi_nag.cam-dae (Overall: FAIL)
+ - pre-existing failure -- issue #670
+
+izumi/gnu/aux_cam:
+
+SMS_D_Ln3.f10_f10_mg37.QPMOZ.izumi_gnu.cam-outfrq3s_chemproc (Overall: DIFF) details:
+ - DIFFS and NLCOMP failures because of removal of ISOPNO3 and new "C/E" compset designations
+
+CAM tag used for the baseline comparison tests if different than previous
+tag:
+
+Summarize any changes to answers: BFB except NL changes
+
+===============================================================
+
Tag name: cam6_4_046
Originator(s): sjsprecious
Date: 06 November 2024
diff --git a/libraries/mct b/libraries/mct
deleted file mode 160000
index 82b0071e69..0000000000
--- a/libraries/mct
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 82b0071e69d14330b75d23b0bc68543ebea9aadc
diff --git a/src/cpl/nuopc/atm_stream_ndep.F90 b/src/cpl/nuopc/atm_stream_ndep.F90
index a1d4530722..a393b27f05 100644
--- a/src/cpl/nuopc/atm_stream_ndep.F90
+++ b/src/cpl/nuopc/atm_stream_ndep.F90
@@ -118,7 +118,7 @@ subroutine stream_ndep_init(model_mesh, model_clock, rc)
if (ierr /= 0) call endrun(trim(subname)//": FATAL: mpi_bcast: stream_ndep_year_align")
! Check whether the stream is being used.
- if (stream_ndep_data_filename == ' ') then
+ if (stream_ndep_data_filename == ' '.or.stream_ndep_data_filename == 'UNSET') then
use_ndep_stream = .false.
if (masterproc) then
write(iulog,'(a)') ' '