Merge branch 'wlin/v3_single_forcing_compsets' into next (PR #6563)

Add compsets and support files for v3 single forcing simulations

The following compsets (aliases) are added:

 . WCYCL20TR-GHG Greenhouse gases only (GHGs) configuration
 . WCYCL20TR-aer Anthropogenic aerosols and precursors (aer) only configuration
 . WCYCL20TR-xGHG-xaer All forcings except GHGs and aer
 . WCYCL20TR-xaer All forcings except aer
 . WCYCL20TR-nat Natural-only configuration
 . WCYCL20TR-ozone Stratospheric ozone only configuration
 . WCYCL20TR-lulc Land use land cover only configuration
 . WCYCL20TR-volc Stratospheric volcanic emissions only configuratio

[BFB] for existing tests. Remerged after fixing MMF1 tests.

Author: wlin7

cime_config/allactive/config_compsets.xml

@@ -133,18 +133,18 @@
 <!-- ************************************************ -->
 <compset>
   <alias>WCYCL1950-MMF1</alias>
-  <lname>1950SOI_EAM%CMIP6-MMF1_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
+  <lname>1950SOI_EAM%MMF1_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
 </compset>
 
 <compset>
   <alias>WCYCL20TR-MMF1</alias>
-  <lname>20TRSOI_EAM%CMIP6-MMF1_ELM%SP_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
+  <lname>20TRSOI_EAM%MMF1_ELM%SP_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
 </compset>
 
 <!-- separate compset for testing (NS = no spinup) -->
 <compset>
   <alias>WCYCL20TRNS-MMF1</alias>
-  <lname>20TR_EAM%CMIP6-MMF1_ELM%SP_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
+  <lname>20TR_EAM%MMF1_ELM%SP_MPASSI_MPASO_MOSART_SGLC_SWAV</lname>
 </compset>
 <!-- ************************************************** -->
 <!-- ************************************************** -->

components/eam/cime_config/config_component.xml

@@ -51,10 +51,7 @@
 
       <value compset=""                        >-mach $MACH</value>
       <value compset="_EAM"                    >-phys default</value>
-      <value compset="_EAM%CMIP6-1pctCO2"      >&eamv3_phys_defaults; &eamv3_chem_defaults;</value>
-      <value compset="_EAM%CMIP6-4xCO2"        >&eamv3_phys_defaults; &eamv3_chem_defaults;</value>
-      <value compset="20TR.*_EAM%CMIP6-.*_"    >&eamv3_phys_defaults; &eamv3_chem_defaults;</value>
-      <value compset="_EAM%CMIP6_"             >&eamv3_phys_defaults; &eamv3_chem_defaults;</value>
+      <value compset="_EAM%CMIP6.*"            >&eamv3_phys_defaults; &eamv3_chem_defaults;</value>
       <value compset="_ELM%[^_]*BC"            >-bc_dep_to_snow_updates</value>
       <value compset="_EAM.*_BGC%*"            >-co2_cycle</value>
 

components/eam/cime_config/config_compsets.xml

@@ -272,12 +272,12 @@
   <!-- F compsets with transient SST (AMIP) -->
   <compset>
     <alias>F20TR-MMF1</alias>
-    <lname>20TR_EAM%CMIP6-MMF1_ELM%SP_MPASSI%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
+    <lname>20TR_EAM%MMF1_ELM%SP_MPASSI%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
   </compset>
 
   <compset>
     <alias>F20TR-MMF1</alias>
-    <lname>20TR_EAM%CMIP6-MMF2_ELM%SP_MPASSI%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
+    <lname>20TR_EAM%MMF2_ELM%SP_MPASSI%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
   </compset>
 
   <!-- ******************************* -->

components/elm/cime_config/config_component.xml

@@ -81,6 +81,7 @@
       <value compset="20TR.*_EAM%.*CMIP6-xGHG-xAER_ELM">20thC_CMIP6_transient</value>
       <value compset="20TR.*_EAM%.*CMIP6-xAER_ELM">20thC_CMIP6_transient</value>
       <value compset="20TR.*_EAM%.*CMIP6-LULC_ELM">20thC_CMIP6_transient</value>
+      <value compset="20TR.*_EAM%MMF.*_ELM">20thC_CMIP6_transient</value>
       <value compset="20TR_EAM%CMIP6_ELM.*_BGC%LNDATM">20thC_CMIP6bgc_transient</value> 
       <value compset="20TR(?:SOI)?_EAM%CMIP6_ELM*_BGC%B">20thC_CMIP6bgc_transient</value> 
       <value compset="20TR.*_ELM%[^_]*BGC">20thC_bgc_transient</value>