Merge branch 'brhillman/atm/add-twp-rrm' (PR #1693)

Add configuration for new atmosphere and land grid with regionally refinement from ne30 to ne120 over the Tropical Western Pacific region. All needed input files to run the new configuration have been uploaded to the input data repository. Supported compsets include only FC5AV1C-04P2 (72 levels). Fixes #1357 [BFB] Conflicts: cime/src/drivers/mct/cime_config/config_component_acme.xml components/cam/bld/config_files/horiz_grid.xml components/cam/bld/namelist_files/namelist_defaults_cam.xml components/clm/bld/namelist_files/namelist_defaults_clm4_5.xml components/clm/bld/namelist_files/namelist_definition_clm4_5.xml
ESMCI · Aug 24, 2017 · f5ef9ea · f5ef9ea
2 parents 6be75b8 + b80b687
commit f5ef9ea
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/config/acme/config_grids.xml b/config/acme/config_grids.xml
@@ -790,6 +790,12 @@
       <alias>sooberingoax4x8v1_sooberingoax4x8v1</alias>
     </grid>
 
+    <grid compset="(DOCN|XOCN|SOCN|AQUAP)">
+      <sname>ne0np4_twpx4v1_ne0np4_twpx4v1</sname>
+      <lname>a%ne0np4_twpx4v1_l%ne0np4_twpx4v1_oi%ne0np4_twpx4v1_r%null_m%oRRS18to6v3_g%null_w%null</lname>
+      <alias>twpx4v1_twpx4v1</alias>
+    </grid>
+
     <grid compset="_CISM">
       <sname>T31_gx3v7_gland10</sname>
       <lname>a%T31_l%T31_oi%gx3v7_r%r05_m%gx3v7_g%gland10_w%null</lname>
@@ -1505,6 +1511,16 @@
       <file ocn_mask="tx0.1v2">domain.ocn.sooberingoax4x8v1_tx0.1v2.141022.nc</file>
     </domain>
 
+    <domain name="ne0np4_twpx4v1">
+      <nx>81434</nx>
+      <ny>1</ny>
+      <desc>1-deg with 1/4-deg over Tropical West Pacific (version 1):</desc>
+      <file atm_mask="oRRS18to6v3">domain.lnd.twpx4v1_oRRS18to6v3.170629.nc</file>
+      <file ice_mask="oRRS18to6v3">domain.ocn.twpx4v1_oRRS18to6v3.170629.nc</file>
+      <file lnd_mask="oRRS18to6v3">domain.lnd.twpx4v1_oRRS18to6v3.170629.nc</file>
+      <file ocn_mask="oRRS18to6v3">domain.ocn.twpx4v1_oRRS18to6v3.170629.nc</file>
+    </domain>
+
     <domain name="oQU240">
       <nx>7153</nx>
       <ny>1</ny>

diff --git a/src/drivers/mct/cime_config/config_component_acme.xml b/src/drivers/mct/cime_config/config_component_acme.xml
@@ -288,6 +288,7 @@
       <value compset=".+" grid="a%ne0np4_svalbard_x8v1" >144</value>
       <value compset=".+" grid="a%ne0np4_sooberingoa_x4x8v1" >144</value>
       <value compset=".+" grid="a%ne0np4_enax4v1" >96</value>
+      <value compset=".+" grid="a%ne0np4_twpx4v1">96</value>
       <value compset=".+" grid="a%T42">72</value>
       <value compset=".+" grid="a%T85">144</value>
       <value compset=".+" grid="a%T341">288</value>