From efbfd448180782ecf2e7930deb144dd64e5bd903 Mon Sep 17 00:00:00 2001
From: Michael Levy <mike.levy.work@gmail.com>
Date: Wed, 13 Mar 2024 15:18:15 -0600
Subject: [PATCH 1/2] set CCSM_BGC and CCSM_CO2_PPMV in MOM6+MARBL cases

Copied POP2%ECO values to use as MOM6%MARBL values (want them for abio as well
as base bio runs)
---
 cime_config/config_component_cesm.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cime_config/config_component_cesm.xml b/cime_config/config_component_cesm.xml
index dbf3b11e3..7a7db4521 100644
--- a/cime_config/config_component_cesm.xml
+++ b/cime_config/config_component_cesm.xml
@@ -109,6 +109,8 @@
       <value compset="_DATM">none</value>
       <value compset="_DATM%CPLHIST.+POP\d">CO2A</value>
       <value compset="_DATM%CPLHIST.+BLOM%ECO">CO2A</value>
+      <value compset="^OMIP_DATM%IAF.*_MOM6%[^_]*MARBL">CO2A</value>
+      <value compset="^OMIP_DATM%JRA.*_MOM6%[^_]*MARBL">CO2A</value>
       <value compset="^OMIP_DATM%IAF.*_POP2%[^_]*ECO">CO2A</value>
       <value compset="^OMIP_DATM%JRA.*_POP2%[^_]*ECO">CO2A</value>
       <value compset="HIST.*_DATM.*_CLM">CO2A</value>
@@ -496,6 +498,7 @@
     <default_value>284.7</default_value>
     <values match="last">
       <value compset="^2000">367.0</value>
+      <value compset="DATM.*_MOM6%[^_]*MARBL">284.317</value>
       <value compset="DATM.*_POP2%[^_]*ECO">284.317</value>
       <value compset="DATM.*_POP2%[^_]*ECOCESM20">284.7</value>
     </values>

From a02f2ef333676a832702df4751bf25f62c7e737f Mon Sep 17 00:00:00 2001
From: Michael Levy <mike.levy.work@gmail.com>
Date: Mon, 5 Aug 2024 09:08:49 -0600
Subject: [PATCH 2/2] Remove POP2 references from config_component_cesm

---
 cime_config/config_component_cesm.xml | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/cime_config/config_component_cesm.xml b/cime_config/config_component_cesm.xml
index ca9b9a7f9..a45383f8b 100644
--- a/cime_config/config_component_cesm.xml
+++ b/cime_config/config_component_cesm.xml
@@ -111,8 +111,6 @@
       <value compset="_DATM%CPLHIST.+BLOM%ECO">CO2A</value>
       <value compset="^OMIP_DATM%IAF.*_MOM6%[^_]*MARBL">CO2A</value>
       <value compset="^OMIP_DATM%JRA.*_MOM6%[^_]*MARBL">CO2A</value>
-      <value compset="^OMIP_DATM%IAF.*_POP2%[^_]*ECO">CO2A</value>
-      <value compset="^OMIP_DATM%JRA.*_POP2%[^_]*ECO">CO2A</value>
       <value compset="HIST.*_DATM.*_CLM">CO2A</value>
       <value compset="SSP.*_DATM.*_CLM">CO2A</value>
       <value compset="_BGC%BPRP">CO2C</value>
@@ -238,15 +236,12 @@
       <!-- =================================================== -->
       <!-- C compsets -->
       <!-- =================================================== -->
-      <value compset="_DATM.*_DICE.*_POP2">24</value>
       <value compset="_DATM.*_DICE.*_MOM6">24</value>
       <value compset="_DATM.*_DICE.*_BLOM">24</value>
       <!-- NOTE: currently a NUOPC runseqence cannot be generated with the ATM_NCPL < OCN_NCPL -->
       <!-- =================================================== -->
       <!-- G compsets -->
       <!-- =================================================== -->
-      <value compset="_DATM.*_SLND.*_CICE.*_POP2">24</value>
-      <value compset="_DATM.*_SLND.*_CICE.*_POP2" grid="oi%tx0.1v3">144</value>
       <value compset="_DATM.*_SLND.*_CICE.*_MOM6">24</value>
       <value compset="_DATM.*_SLND.*_CICE.*_BLOM">24</value>
       <value compset="_DATM.*_CICE.*_DOCN">24</value>
@@ -332,11 +327,6 @@
     <values match="last">
       <value compset="_MOM6">24</value>
       <value compset="_BLOM">24</value>
-      <value compset="_POP2" grid="oi%gx3v7">1</value>
-      <value compset="_POP2" grid="oi%gx1v6">24</value>
-      <value compset="_POP2" grid="oi%gx1v7">24</value>
-      <value compset="_POP2" grid="oi%tx0.1v2">48</value>
-      <value compset="_POP2" grid="oi%tx0.1v3">48</value>
       <value compset="_DLND.*_CISM\d">1</value>
       <value compset="_NEMO">24</value>
     </values>
@@ -388,7 +378,6 @@
     <type>integer</type>
     <default_value>8</default_value>
     <values match="last">
-      <value compset="_DATM.*_POP2.*_DROF" grid="oi%gx3v7">1</value>
       <value compset="_DATM.*_MOM6.*_DROF"        >$ATM_NCPL</value>
       <value compset="_DATM.*_BLOM.*_DROF"        >$ATM_NCPL</value>
       <value compset="_DATM.*_DOCN%SOM"           >$ATM_NCPL</value>
@@ -477,11 +466,8 @@
     <default_value>TIGHT</default_value>
     <values match="last">
       <value compset="_DATM.*_DOCN%SOM"               >OPTION2</value>
-      <value compset="_POP2"                          >OPTION2</value>
       <value compset="_MOM6"                          >OPTION1</value>
       <value compset="_BLOM"                          >OPTION1</value>
-      <value compset="_POP2" grid="oi%gx1v6"          >OPTION1</value>
-      <value compset="_POP2" grid="oi%gx1v7"          >OPTION1</value>
       <value compset="_DATM%NYF.*_SLND.*_DICE.*_DOCN"	>OPTION2</value>
       <value compset="_XATM.*_XLND.*_XICE.*_XOCN"     >OPTION2</value>
       <value compset="_SOCN"                          >OPTION2</value>
@@ -558,8 +544,6 @@
     <values match="last">
       <value compset="^2000">367.0</value>
       <value compset="DATM.*_MOM6%[^_]*MARBL">284.317</value>
-      <value compset="DATM.*_POP2%[^_]*ECO">284.317</value>
-      <value compset="DATM.*_POP2%[^_]*ECOCESM20">284.7</value>
     </values>
     <group>run_co2</group>
     <file>env_run.xml</file>