Merge pull request #144 from ekluzek/SSP585n342300ext

Extensions to 2300 for SSP5-8.5 and SSP5-3.4
ESCOMP · Apr 2, 2020 · 543d249 · 543d249
2 parents e22f8cc + ced6a5e
commit 543d249
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 9 deletions.
diff --git a/Externals.cfg b/Externals.cfg
@@ -1,5 +1,5 @@
 [cam]
-tag = cam_cesm2_1_rel_41
+tag = cam_cesm2_1_rel_43
 protocol = git
 repo_url = https://github.com/ESCOMP/CAM
 local_path = components/cam
@@ -15,7 +15,7 @@ local_path = components/cice
 required = True
 
 [cime]
-tag = cime5.6.32
+tag = cime5.6.33
 protocol = git
 repo_url = https://github.com/ESMCI/cime
 local_path = cime
@@ -24,28 +24,28 @@ required = True
 [cism]
 tag = cism-release-cesm2.1.2_02
 protocol = git
-repo_url = https://github.com/ESCOMP/cism-wrapper
+repo_url = https://github.com/ESCOMP/CISM-wrapper
 local_path = components/cism
 externals = Externals_CISM.cfg
 required = True
 
 [clm]
-tag = release-clm5.0.30
+tag = release-clm5.0.32
 protocol = git
-repo_url = https://github.com/ESCOMP/ctsm/
+repo_url = https://github.com/ESCOMP/CTSM/
 local_path = components/clm
 externals = Externals_CLM.cfg
 required = True
 
 [mosart]
 tag = release-cesm2.0.04
 protocol = git
-repo_url = https://github.com/ESCOMP/mosart
+repo_url = https://github.com/ESCOMP/MOSART
 local_path = components/mosart
 required = True
 
 [pop]
-tag = pop2_cesm2_1_rel_n09
+tag = pop2_cesm2_1_rel_n10
 protocol = git
 repo_url = https://github.com/ESCOMP/POP2-CESM
 local_path = components/pop
@@ -55,7 +55,7 @@ required = True
 [rtm]
 tag = release-cesm2.0.04
 protocol = git
-repo_url = https://github.com/ESCOMP/rtm
+repo_url = https://github.com/ESCOMP/RTM
 local_path = components/rtm
 required = True
 

diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml
@@ -219,6 +219,22 @@
     <science_support grid="f09_g17"/>
   </compset>
 
+  <!-- Extensions to 2300 -->
+  <compset>
+    <alias>BWSSP585extcmip6</alias>
+    <lname>SSP585EXT_CAM60%WCTS_CLM50%BGC-CROP-CMIP6WACCMDECK_CICE%CMIP6_POP2%ECO%NDEP_MOSART_CISM2%NOEVOLVE_WW3</lname>
+  </compset>
+
+  <compset>
+    <alias>BWSSP534osextcmip6</alias>
+    <lname>SSP585EXT_CAM60%WCTS_CLM50%BGC-CROP-CMIP6WACCMDECK_CICE%CMIP6_POP2%ECO%NDEP_MOSART_CISM2%NOEVOLVE_WW3</lname>
+  </compset>
+
+  <compset>
+    <alias>BWSSP126extcmip6</alias>
+    <lname>SSP126EXT_CAM60%WCTS_CLM50%BGC-CROP-CMIP6WACCMDECK_CICE%CMIP6_POP2%ECO%NDEP_MOSART_CISM2%NOEVOLVE_WW3</lname>
+  </compset>
+
   <!-- Same as BWHIST, but with cmip6-related modifiers for some components -->
   <compset>
     <alias>BWHISTcmip6</alias>
@@ -427,10 +443,14 @@
         <value compset="2013_"              >2013-01-01</value>
         <value compset="SSP534_CAM60%WCTS"  >2040-01-01</value>
         <value compset="SSP[0-9]+_"         >2015-01-01</value>
+        <value compset="SSP[0-9]+EXT_"      >2101-01-01</value>
       </values>
     </entry>
     <entry id="RUN_REFDATE">
       <values match="first">
+        <value grid="a%0.9x1.25_l%0.9x1.25_oi%gx1v7_r%r05_g%gland4_w%ww3a_m%gx1v7"      compset="SSP534EXT_CAM60%WCTS_CLM50%BGC-CROP.*CICE.*POP2%ECO.*_MOSART_CISM2%NOEVOLVE_WW3">2101-01-01</value>
+        <value grid="a%0.9x1.25_l%0.9x1.25_oi%gx1v7_r%r05_g%gland4_w%ww3a_m%gx1v7"      compset="SSP126EXT_CAM60%WCTS_CLM50%BGC-CROP.*CICE.*POP2%ECO.*_MOSART_CISM2%NOEVOLVE_WW3">2101-01-01</value>
+        <value grid="a%0.9x1.25_l%0.9x1.25_oi%gx1v7_r%r05_g%gland4_w%ww3a_m%gx1v7"      compset="SSP585EXT_CAM60%WCTS_CLM50%BGC-CROP.*CICE.*POP2%ECO.*_MOSART_CISM2%NOEVOLVE_WW3">2101-01-01</value>
         <value grid="a%0.9x1.25_l%0.9x1.25_oi%gx1v7_r%r05_g%gland4_w%ww3a_m%gx1v7"      compset="1850_CAM60_CLM50%BGC-CROP.*_CICE.*_POP2%ECO.*_MOSART_CISM2%NOEVOLVE_WW3_BGC%BDRD">0134-01-01</value>
         <value grid="a%0.9x1.25_l%0.9x1.25_oi%gx1v7_r%r05_g%gland4_w%ww3a_m%gx1v7"      compset="HIST_CAM60_CLM50%BGC-CROP.*_CICE.*_POP2%ECO.*_MOSART_CISM2%NOEVOLVE_WW3_BGC%BDRD">0501-01-01</value>
         <value grid="a%0.9x1.25_l%0.9x1.25_oi%gx1v7_r%r05_g%gland4_w%ww3a_m%gx1v7"      compset="1850_CAM60%4xCO2.*_CLM50%BGC-CROP-CMIP6DECK_CICE.*_POP2%ECO.*_MOSART_CISM2%NOEVOLVE_WW3_BGC%BDRD">0501-01-01</value>
@@ -448,6 +468,7 @@
         <value grid="a%1.9x2.5_l%1.9x2.5_oi%gx1v7_r%r05_g%gland4_w%ww3a_m%gx1v7" compset="1850_CAM60%(4xCO2|1PCT)_CLM50%BGC-CROP-CMIP6DECK_CICE%CMIP6_POP2%ECO%ABIO-DIC_MOSART_CISM2%NOEVOLVE_WW3_BGC%BDRD">0321-01-01</value>
         <value grid="a%1.9x2.5_l%1.9x2.5_oi%gx1v7_r%r05_g%gland4_w%ww3a_m%gx1v7" compset="_CAM60_CLM50%BGC-CROP_CICE_POP2%ECO%ABIO-DIC_MOSART_CISM2%NOEVOLVE_WW3_BGC%BDRD">0301-01-01</value>
         <value grid="a%1.9x2.5_l%1.9x2.5_oi%gx1v7_r%r05_g%gland4_w%ww3a_m%gx1v7" compset="_CAM60%WCCM.*_CLM50%BGC-CROP.*_CICE.*_POP2%ECO.*_MOSART_CISM2%NOEVOLVE_WW3">0301-01-01</value>
+        <value compset="SSP534_CAM60%WCTS"  >2040-01-01</value>
 
       </values>
     </entry>
@@ -474,10 +495,13 @@
     </entry>
 
     <entry id="RUN_REFCASE">
+      <values match="first">
+        <value grid="a%0.9x1.25_l%0.9x1.25_oi%gx1v7_r%r05_g%gland4_w%ww3a_m%gx1v7" compset="SSP534EXT_CAM60%WCTS_CLM50%BGC-CROP.*CICE.*POP2%ECO.*_MOSART_CISM2%NOEVOLVE_WW3">b.e21.BWSSP534oscmip6.f09_g17.CMIP6-SSP5-3.4OS-WACCM.001</value>
+        <value grid="a%0.9x1.25_l%0.9x1.25_oi%gx1v7_r%r05_g%gland4_w%ww3a_m%gx1v7" compset="SSP126EXT_CAM60%WCTS_CLM50%BGC-CROP.*CICE.*POP2%ECO.*_MOSART_CISM2%NOEVOLVE_WW3">b.e21.BWSSP126cmip6.f09_g17.CMIP6-SSP1-2.6-WACCM.001</value>
+        <value grid="a%0.9x1.25_l%0.9x1.25_oi%gx1v7_r%r05_g%gland4_w%ww3a_m%gx1v7" compset="SSP585EXT_CAM60%WCTS_CLM50%BGC-CROP.*CICE.*POP2%ECO.*_MOSART_CISM2%NOEVOLVE_WW3">b.e21.BWSSP585cmip6.f09_g17.CMIP6-SSP5-8.5-WACCM.001</value>
         <!-- All of the refcase are compatible with
              CLM option CMIP6DECK. We use it even without that option, but need to set
              CLM's use_init_interp (below) when using it without CMIP6DECK (so answers qill bw identical). -->
-      <values match="first">
         <value grid="a%0.9x1.25_l%0.9x1.25_oi%gx1v7_r%r05_g%gland4_w%ww3a_m%gx1v7" compset="1850_CAM60_CLM50%BGC-CROP.*_CICE.*_POP2%ECO.*_MOSART_CISM2%NOEVOLVE_WW3_BGC%BPRP">b.e21.B1850_BPRP.f09_g17.CMIP6-piControl.tst.004</value>
         <value grid="a%0.9x1.25_l%0.9x1.25_oi%gx1v7_r%r05_g%gland4_w%ww3a_m%gx1v7" compset="HIST_CAM60_CLM50%BGC-CROP.*_CICE.*_POP2%ECO.*_MOSART_CISM2%NOEVOLVE_WW3_BGC%BPRP">b.e21.B1850.f09_g17.CMIP6-esm-piControl.001</value>
         <value grid="a%0.9x1.25_l%0.9x1.25_oi%gx1v7_r%r05_g%gland4_w%ww3a_m%gx1v7" compset="1850_CAM60_CLM50%BGC-CROP.*_CICE.*_POP2%ECO.*_MOSART_CISM2%NOEVOLVE_WW3">b.e20.B1850.f09_g17.pi_control.all.299_merge_v3</value>