From 1dc11faff6a7e6e99a96d95afe2a57930d1160cd Mon Sep 17 00:00:00 2001
From: Bill Sacks <sacks@ucar.edu>
Date: Tue, 9 Jun 2026 13:38:18 -0600
Subject: [PATCH 1/3] Change long name specifier for CO2 forcings

We have decided to use the CESM2 scheme for this.

See https://github.com/ESCOMP/CMEPS/pull/658 for some relevant
discussion.
---
 cime_config/config_compsets.xml | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml
index 176e745c3..4659c98e0 100644
--- a/cime_config/config_compsets.xml
+++ b/cime_config/config_compsets.xml
@@ -40,83 +40,83 @@
 
   <compset>
     <alias>B1850C_MTt4s</alias>
-    <lname>1850C_CAM70%MT%CT4S2_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
+    <lname>1850_CAM70%MT%CT4S2_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3_BGC%BDRD</lname>
   </compset>
   <compset>
     <alias>B1850CM</alias>
-    <lname>1850C_CAM70%MT%CT4S2_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
+    <lname>1850_CAM70%MT%CT4S2_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3_BGC%BDRD</lname>
   </compset>
 
   <compset>
     <alias>B1850C_MTso</alias>
-    <lname>1850C_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
+    <lname>1850_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3_BGC%BDRD</lname>
   </compset>
 
   <compset>
     <alias>BHISTC_MTso</alias>
-    <lname>HISTC_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
+    <lname>HIST_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3_BGC%BDRD</lname>
   </compset>
 
   <compset>
     <alias>BHISTC_MTt4s</alias>
-    <lname>HISTC_CAM70%MT%CT4S2_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
+    <lname>HIST_CAM70%MT%CT4S2_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3_BGC%BDRD</lname>
   </compset>
 
   <compset>
     <alias>BHISTCM</alias>
-    <lname>HISTC_CAM70%MT%CT4S2_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
+    <lname>HIST_CAM70%MT%CT4S2_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3_BGC%BDRD</lname>
   </compset>
 
   <compset>
     <alias>BHISTC_MTso</alias>
-    <lname>HISTC_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
+    <lname>HIST_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3_BGC%BDRD</lname>
   </compset>
 <!--  Not yet available in cam component
   <compset>
     <alias>B1850C_WAt4ma</alias>
-    <lname>1850C_CAM70%HT%CT4MA_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
+    <lname>1850_CAM70%HT%CT4MA_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3_BGC%BDRD</lname>
   </compset>
 
   <compset>
     <alias>BHISTC_WAt4ma</alias>
-    <lname>1850_CAM70%HT%CT4MA_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV</lname>
+    <lname>1850_CAM70%HT%CT4MA_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV_BGC%BDRD</lname>
   </compset>
 -->
   <compset>
     <alias>B1850C_LTso</alias>
-    <lname>1850C_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
+    <lname>1850_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3_BGC%BDRD</lname>
   </compset>
 
   <compset>
     <alias>BHISTC_LTso</alias>
-    <lname>HISTC_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
+    <lname>HIST_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3_BGC%BDRD</lname>
   </compset>
 
   <!-- BHIST_LTso, except: WW3 can't handle multi-instance (2026-3), 
        CROP doesn't work in this context. -->
   <compset>
     <alias>BHISTC_LT_DART</alias>
-    <lname>HISTC_CAM70%LT_CLM60%BGC_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV</lname>
+    <lname>HIST_CAM70%LT_CLM60%BGC_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV_BGC%BDRD</lname>
   </compset>
 
   <!-- Emissions driven compsets for CESM3 -->
 
   <compset>
     <alias>B1850E_MTt4s</alias>
-    <lname>1850E_CAM70%MT%CT4S2_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
+    <lname>1850_CAM70%MT%CT4S2_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3_BGC%BPRP</lname>
   </compset>
   <compset>
     <alias>B1850EM</alias>
-    <lname>1850E_CAM70%MT%CT4S2_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
+    <lname>1850_CAM70%MT%CT4S2_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3_BGC%BPRP</lname>
   </compset>
   
   <compset>
     <alias>BHISTE_MTt4s</alias>
-    <lname>HISTE_CAM70%MT%CT4S2_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
+    <lname>HIST_CAM70%MT%CT4S2_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3_BGC%BPRP</lname>
   </compset>
   <compset>
     <alias>BHISTEM</alias>
-    <lname>HISTE_CAM70%MT%CT4S2_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
+    <lname>HIST_CAM70%MT%CT4S2_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3_BGC%BPRP</lname>
   </compset>
 
   <!-- SOM compsets -->

From 9ef8c91ae62300d489e32e04309421f8367cec83 Mon Sep 17 00:00:00 2001
From: Bill Sacks <sacks@ucar.edu>
Date: Tue, 9 Jun 2026 13:54:43 -0600
Subject: [PATCH 2/3] No longer need to allow for C/E at end of time period

---
 cime_config/config_compsets.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml
index 4659c98e0..7ef827bd3 100644
--- a/cime_config/config_compsets.xml
+++ b/cime_config/config_compsets.xml
@@ -134,12 +134,12 @@
   <entries>
     <entry id="RUN_STARTDATE">
       <values>
-	<value compset="1850[CE]?_"     >0001-01-01</value>
-	<value compset="2000[CE]?_"     >0001-01-01</value>
-	<value compset="HIST[CE]?_"     >1850-01-01</value>
-	<value compset="5505[CE]?_"     >1955-01-01</value>
-	<value compset="RCP[2468][CE]?_">2005-01-01</value>
-	<value compset="2013[CE]?_"     >2013-01-01</value>
+	<value compset="1850_"     >0001-01-01</value>
+	<value compset="2000_"     >0001-01-01</value>
+	<value compset="HIST_"     >1850-01-01</value>
+	<value compset="5505_"     >1955-01-01</value>
+	<value compset="RCP[2468]_">2005-01-01</value>
+	<value compset="2013_"     >2013-01-01</value>
       </values>
     </entry>
     <entry id="LND_SETS_DUST_EMIS_DRV_FLDS">

From d241756c50d016a5f205e06699b55eac361bee19 Mon Sep 17 00:00:00 2001
From: Bill Sacks <sacks@ucar.edu>
Date: Sun, 14 Jun 2026 08:41:05 -0600
Subject: [PATCH 3/3] Concentration-driven compsets should have no _BGC
 specifier

Based on discussions with Keith Lindsay: In CESM1 and CESM2, the
addition of _BGC%BDRD just added some extra diagnostic fields that could
be useful for understanding the carbon cycle. However, with the proposed
changes in https://github.com/ESCOMP/CAM/pull/1581 to get co2_cycle
working with recent versions of CAM, _BGC%BDRD would change answers, and
so wouldn't strictly be a concentration-driven configuration (if I
understand correctly).

Therefore, at least for now, we have decided to have no _BGC specifier
on the concentration-driven compsets. We may revisit this choice later.
---
 cime_config/config_compsets.xml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml
index 7ef827bd3..9b258c8ae 100644
--- a/cime_config/config_compsets.xml
+++ b/cime_config/config_compsets.xml
@@ -40,63 +40,63 @@
 
   <compset>
     <alias>B1850C_MTt4s</alias>
-    <lname>1850_CAM70%MT%CT4S2_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3_BGC%BDRD</lname>
+    <lname>1850_CAM70%MT%CT4S2_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
   </compset>
   <compset>
     <alias>B1850CM</alias>
-    <lname>1850_CAM70%MT%CT4S2_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3_BGC%BDRD</lname>
+    <lname>1850_CAM70%MT%CT4S2_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
   </compset>
 
   <compset>
     <alias>B1850C_MTso</alias>
-    <lname>1850_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3_BGC%BDRD</lname>
+    <lname>1850_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
   </compset>
 
   <compset>
     <alias>BHISTC_MTso</alias>
-    <lname>HIST_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3_BGC%BDRD</lname>
+    <lname>HIST_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
   </compset>
 
   <compset>
     <alias>BHISTC_MTt4s</alias>
-    <lname>HIST_CAM70%MT%CT4S2_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3_BGC%BDRD</lname>
+    <lname>HIST_CAM70%MT%CT4S2_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
   </compset>
 
   <compset>
     <alias>BHISTCM</alias>
-    <lname>HIST_CAM70%MT%CT4S2_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3_BGC%BDRD</lname>
+    <lname>HIST_CAM70%MT%CT4S2_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
   </compset>
 
   <compset>
     <alias>BHISTC_MTso</alias>
-    <lname>HIST_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3_BGC%BDRD</lname>
+    <lname>HIST_CAM70%MT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
   </compset>
 <!--  Not yet available in cam component
   <compset>
     <alias>B1850C_WAt4ma</alias>
-    <lname>1850_CAM70%HT%CT4MA_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3_BGC%BDRD</lname>
+    <lname>1850_CAM70%HT%CT4MA_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
   </compset>
 
   <compset>
     <alias>BHISTC_WAt4ma</alias>
-    <lname>1850_CAM70%HT%CT4MA_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV_BGC%BDRD</lname>
+    <lname>1850_CAM70%HT%CT4MA_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV</lname>
   </compset>
 -->
   <compset>
     <alias>B1850C_LTso</alias>
-    <lname>1850_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3_BGC%BDRD</lname>
+    <lname>1850_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
   </compset>
 
   <compset>
     <alias>BHISTC_LTso</alias>
-    <lname>HIST_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3_BGC%BDRD</lname>
+    <lname>HIST_CAM70%LT_CLM60%BGC-CROP_CICE_MOM6_MOSART_DGLC%NOEVOLVE_WW3</lname>
   </compset>
 
   <!-- BHIST_LTso, except: WW3 can't handle multi-instance (2026-3), 
        CROP doesn't work in this context. -->
   <compset>
     <alias>BHISTC_LT_DART</alias>
-    <lname>HIST_CAM70%LT_CLM60%BGC_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV_BGC%BDRD</lname>
+    <lname>HIST_CAM70%LT_CLM60%BGC_CICE_MOM6_MOSART_DGLC%NOEVOLVE_SWAV</lname>
   </compset>
 
   <!-- Emissions driven compsets for CESM3 -->