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
E3SM-Project · Aug 24, 2017 · 293cfaf · 293cfaf
2 parents b0446d5 + 3c82243
commit 293cfaf
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 5 deletions.
diff --git a/cime/config/acme/config_grids.xml b/cime/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/cime/src/drivers/mct/cime_config/config_component_acme.xml b/cime/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>

diff --git a/components/cam/bld/config_files/horiz_grid.xml b/components/cam/bld/config_files/horiz_grid.xml
@@ -45,5 +45,6 @@
 <horiz_grid dyn="se"    hgrid="ne0np4_svalbard_x8v1_lowcon"   ncol="71912"   csne="0"    csnp="4"  />
 <horiz_grid dyn="se"    hgrid="ne0np4_sooberingoa_x4x8v1_lowcon"   ncol="105707"   csne="0"    csnp="4"  />
 <horiz_grid dyn="se"    hgrid="ne0np4_enax4v1"          ncol="78788"    csne="0"    csnp="4"  />
+<horiz_grid dyn="se"    hgrid="ne0np4_twpx4v1" ncol="81434" csne="0" csnp="4"  />
 
 </config_horiz_grid>
diff --git a/components/cam/bld/namelist_files/namelist_defaults_cam.xml b/components/cam/bld/namelist_files/namelist_defaults_cam.xml
@@ -27,6 +27,7 @@
 <dtime dyn="se"    hgrid="ne0np4_svalbard_x8v1_lowcon"  >600</dtime>
 <dtime dyn="se"    hgrid="ne0np4_sooberingoa_x4x8v1_lowcon"  >600</dtime>
 <dtime dyn="se"    hgrid="ne0np4_enax4v1">900</dtime>
+<dtime dyn="se"    hgrid="ne0np4_twpx4v1">900</dtime>
 
 <dtime dyn="sld"                   >3600</dtime>
 
@@ -182,6 +183,7 @@
 <ncdata dyn="se" hgrid="ne0np4_sooberingoa_x4x8v1_lowcon"  nlev="30"                     >atm/cam/inic/homme/cami-mam3_0000-01-01_sooberingoax4x8v1np4_L30_c141110.nc</ncdata>
 <ncdata dyn="se" hgrid="ne0np4_sooberingoa_x4x8v1_lowcon"  nlev="30" ocn="aquaplanet"    >atm/cam/inic/homme/cami_0003-01-01_sooberingoax4x8v1np4_L30_ape_c000000.nc</ncdata>
 
+<ncdata dyn="se" hgrid="ne0np4_twpx4v1" nlev="72" >atm/cam/inic/homme/cami-mam3_0002-01-01-twpx4v1_L72_c170723.nc</ncdata>
 <!-- Initial condition file for ENA RRM grid from 1 year spin-up -->
 <!-- (starting from initial file interpolated using interpic) -->
 <ncdata dyn="se" hgrid="ne0np4_enax4v1" nlev="72">atm/cam/inic/homme/cami_0002-01-01_enax4v1_L72_c170706.nc</ncdata>
@@ -226,6 +228,7 @@
 <bnd_topo hgrid="ne0np4_svalbard_x8v1_lowcon"  >atm/cam/topo/USGS_svalbardx8v1-tensor12x_c150612.nc</bnd_topo>
 <bnd_topo hgrid="ne0np4_sooberingoa_x4x8v1_lowcon"  >atm/cam/topo/USGS_sooberingoax4x8v1-tensor12x_c150612.nc</bnd_topo>
 <bnd_topo hgrid="ne0np4_enax4v1">atm/cam/topo/USGS_enax4v1_tensorx12_consistentSGH_170522.nc</bnd_topo>
+<bnd_topo hgrid="ne0np4_twpx4v1" >atm/cam/topo/USGS_twpx4v1_tensor12x_consistentSGH_170629.nc</bnd_topo>
 
 <!-- Bulk aerosol physical properties (includes optics) -->
 
@@ -714,6 +717,7 @@
 <drydep_srf_file hgrid="ne0np4_conus_x4v1_lowcon">atm/cam/chem/trop_mam/atmsrf_conusx4v1.nc</drydep_srf_file>
 <drydep_srf_file hgrid="ne0np4_svalbard_x8v1_lowcon">atm/cam/chem/trop_mam/atmsrf_svalbardx8v1.nc</drydep_srf_file>
 <drydep_srf_file hgrid="ne0np4_sooberingoa_x4x8v1_lowcon">atm/cam/chem/trop_mam/atmsrf_sooberingoax4x8v1.nc</drydep_srf_file>
+<drydep_srf_file hgrid="ne0np4_twpx4v1">atm/cam/chem/trop_mam/atmsrf_twpx4v1_170629.nc</drydep_srf_file>
 <!-- NOTE: ENA dry deposition file interpolated from existing rather than created new -->
 <drydep_srf_file hgrid="ne0np4_enax4v1">atm/cam/chem/trop_mam/atmsrf_enax4v1_170517.nc</drydep_srf_file>
 
@@ -1297,6 +1301,7 @@
 <mesh_file hgrid="ne0np4_svalbard_x8v1_lowcon"  >atm/cam/inic/homme/svalbardx8v1.g</mesh_file>
 <mesh_file hgrid="ne0np4_sooberingoa_x4x8v1_lowcon"  >atm/cam/inic/homme/sooberingoax4x8v1.g</mesh_file>
 <mesh_file hgrid="ne0np4_enax4v1">atm/cam/inic/homme/enax4v1.g</mesh_file>
+<mesh_file hgrid="ne0np4_twpx4v1" >atm/cam/inic/homme/twpx4v1.g</mesh_file>
 
 <nu_top> 2.5e5 </nu_top>
 <nu_top hgrid="ne240np4"> 1.0e5 </nu_top>
@@ -1320,6 +1325,7 @@
 <nu hgrid="ne0np4_conus_x4v1_lowcon"  > 8.0e-8</nu>
 <nu hgrid="ne0np4_svalbard_x8v1_lowcon"  > 8.0e-8</nu>
 <nu hgrid="ne0np4_sooberingoa_x4x8v1_lowcon"  > 8.0e-8</nu>
+<nu hgrid="ne0np4_twpx4v1" >8.0e-8</nu>
 
 <!-- This will set nu_q to nu internally. -->
 <nu_q> -1.0 </nu_q>
@@ -1337,6 +1343,8 @@
 <nu_p hgrid="ne0np4_svalbard_x8v1_lowcon"  > 8.0e-8</nu_p>
 <nu_p hgrid="ne0np4_sooberingoa_x4x8v1_lowcon"  > 8.0e-8</nu_p>
 <nu_p hgrid="ne0np4_enax4v1">8.0e-8</nu_p>
+<nu_p hgrid="ne0np4_twpx4v1" >8.0e-8</nu_p>
+
 
 <nu_div>                   2.5e15 </nu_div>
 <nu_div hgrid="ne4np4" >  1.25e18 </nu_div>
@@ -1351,6 +1359,7 @@
 <nu_div hgrid="ne0np4_svalbard_x8v1_lowcon"  > 20.0e-8</nu_div>
 <nu_div hgrid="ne0np4_sooberingoa_x4x8v1_lowcon"  > 20.0e-8</nu_div>
 <nu_div hgrid="ne0np4_enax4v1">20.0e-8</nu_div>
+<nu_div hgrid="ne0np4_twpx4v1" >20.0e-8</nu_div>
 
 <hypervis_order >     2 </hypervis_order>
 
@@ -1368,6 +1377,7 @@
 <hypervis_subcycle hgrid="ne0np4_svalbard_x8v1_lowcon"  > 8 </hypervis_subcycle>
 <hypervis_subcycle hgrid="ne0np4_sooberingoa_x4x8v1_lowcon"  > 8 </hypervis_subcycle>
 <hypervis_subcycle hgrid="ne0np4_enax4v1">7</hypervis_subcycle>
+<hypervis_subcycle hgrid="ne0np4_twpx4v1" > 7 </hypervis_subcycle>
 
 <hypervis_subcycle_q> 1 </hypervis_subcycle_q>
 
@@ -1397,6 +1407,7 @@
 <se_nsplit hgrid="ne0np4_svalbard_x8v1_lowcon"  > 5 </se_nsplit>
 <se_nsplit hgrid="ne0np4_sooberingoa_x4x8v1_lowcon"  > 5 </se_nsplit>
 <se_nsplit hgrid="ne0np4_enax4v1">4</se_nsplit>
+<se_nsplit hgrid="ne0np4_twpx4v1" > 4 </se_nsplit>
 
 <se_nsplit hgrid="ne11np4"  waccm_phys="1">  5 </se_nsplit>
 <se_nsplit hgrid="ne16np4"  waccm_phys="1">  5 </se_nsplit>
@@ -1411,12 +1422,15 @@
 <hypervis_scaling  hgrid="ne0np4_svalbard_x8v1_lowcon"  > 3.2 </hypervis_scaling>
 <hypervis_scaling  hgrid="ne0np4_sooberingoa_x4x8v1_lowcon"  > 3.2 </hypervis_scaling>
 <hypervis_scaling  hgrid="ne0np4_enax4v1">3.2</hypervis_scaling>
+<hypervis_scaling  hgrid="ne0np4_twpx4v1" > 3.2 </hypervis_scaling>
 
 <se_ne hgrid="ne0np4_arm_x8v3_lowcon"  > 0 </se_ne>
 <se_ne hgrid="ne0np4_conus_x4v1_lowcon"  > 0 </se_ne>
 <se_ne hgrid="ne0np4_svalbard_x8v1_lowcon"  > 0 </se_ne>
 <se_ne hgrid="ne0np4_sooberingoa_x4x8v1_lowcon"  > 0 </se_ne>
 <se_ne hgrid="ne0np4_enax4v1">0</se_ne>
+<se_ne hgrid="ne0np4_twpx4v1" > 0 </se_ne>
+
 
 <se_ftype> 0 </se_ftype>
 

diff --git a/components/clm/bld/namelist_files/namelist_defaults_clm4_5.xml b/components/clm/bld/namelist_files/namelist_defaults_clm4_5.xml
@@ -306,7 +306,7 @@ ic_tod="0" sim_year="2000" glc_nec="0" use_crop=".true." irrigate=".true." nu_co
 <finidat hgrid="ne0np4_conus_x4v1_lowcon" ic_ymd="101" sim_year="1850">lnd/clm2/initdata_map/clmi.I1850CLM45.conusx4v1.74e105b.clm2.r.0021-01-01-00000.nc</finidat>
 <finidat hgrid="ne0np4_conus_x4v1_lowcon" ic_ymd="101" sim_year="2000">lnd/clm2/initdata_map/clmi.ICRUCLM45.conusx4v1.74e105b.clm2.r.0021-01-01-00000.nc</finidat>
 <finidat hgrid="ne0np4_enax4v1" sim_year="2000">lnd/clm2/initdata_map/clmi.ICRUCLM45SP.2000-01-01.enax4v1_oRRS18to6_simyr2000_c170621.nc</finidat>
-
+<finidat hgrid="ne0np4_twpx4v1" ic_ymd="101" sim_year="2000">lnd/clm2/initdata_map/clmi.ICRUCLM45SP.2000-01-01.twpx4v1_oRRS18to6v3_simyr2000_c170712.nc</finidat>
 
 <!-- for present day simulations - year 2000 -->
 <fsurdat hgrid="360x720cru"   sim_year="2000" use_crop=".false." >
@@ -397,11 +397,12 @@ lnd/clm2/surfdata_map/surfdata_ne4np4_simyr1850_c160614.nc</fsurdat>
 lnd/clm2/surfdata_map/surfdata_conusx4v1_simyr1850_c160503.nc</fsurdat>
 <fsurdat hgrid="ne0np4_conus_x4v1_lowcon" sim_year="2000" use_crop=".false." >
 lnd/clm2/surfdata_map/surfdata_conusx4v1_simyr2000_c160503.nc</fsurdat>
-
 <fsurdat hgrid="ne0np4_enax4v1" sim_year="1850" use_crop=".false." >
     lnd/clm2/surfdata/surfdata_enax4v1_mp24_simyr1850_c170518.nc</fsurdat>
 <fsurdat hgrid="ne0np4_enax4v1" sim_year="2000" use_crop=".false." >
     lnd/clm2/surfdata/surfdata_enax4v1_mp24_simyr2000_c170518.nc</fsurdat>
+<fsurdat hgrid="ne0np4_twpx4v1" sim_year="2000" use_crop=".false.">
+lnd/clm2/surfdata_map/surfdata_twpx4v1_simyr2000_c170706.nc</fsurdat>
 
 <!-- Regional Refinement Variable Resolution RRM 1850 and 2000-->
 <!--Not ready for clm4.5 fsurdat hgrid="ne0np4_arm_x8v3_lowcon"    sim_year="1850" irrig=".false." >
@@ -416,8 +417,8 @@ lnd/clm2/surfdata_map/surfdata_conusx4v1_simyr2000_c160503.nc</fsurdat>
     lnd/clm2/surfdata/surfdata_enax4v1_mp24_simyr1850_c170518.nc</fsurdat>
 <fsurdat hgrid="ne0np4_enax4v1" sim_year="2000" irrig=".false." >
     lnd/clm2/surfdata/surfdata_enax4v1_mp24_simyr2000_c170518.nc</fsurdat>
-
-
+<fsurdat hgrid="ne0np4_twpx4v1" sim_year="2000" irrig=".false.">
+lnd/clm2/surfdata_map/surfdata_twpx4v1_simyr2000_c170706.nc</fsurdat>
 
 <!-- Dynamic PFT surface datasets (relative to {csmdata}) -->
 

diff --git a/components/clm/bld/namelist_files/namelist_definition_clm4_5.xml b/components/clm/bld/namelist_files/namelist_definition_clm4_5.xml
@@ -1122,7 +1122,7 @@ CLM run type.
 <entry id="res" type="char*30" category="default_settings"
        group="default_settings"  
        valid_values=
-"512x1024,360x720cru,128x256,64x128,48x96,32x64,8x16,94x192,0.23x0.31,0.9x1.25,1.9x2.5,2.5x3.33,4x5,10x15,5x5_amazon,1x1_tropicAtl,1x1_camdenNJ,1x1_vancouverCAN,1x1_mexicocityMEX,1x1_asphaltjungleNJ,1x1_brazil,1x1_urbanc_alpha,1x1_numaIA,1x1_smallvilleIA,0.1x0.1,0.5x0.5,3x3min,5x5min,10x10min,0.33x0.33,0.125x0.125,ne4np4,ne11np4,ne16np4,ne30np4,ne60np4,ne120np4,ne240np4,1km-merge-10min,ne0np4_arm_x8v3_lowcon,ne0np4_conus_x4v1_lowcon,ne0np4_enax4v1">
+"512x1024,360x720cru,128x256,64x128,48x96,32x64,8x16,94x192,0.23x0.31,0.9x1.25,1.9x2.5,2.5x3.33,4x5,10x15,5x5_amazon,1x1_tropicAtl,1x1_camdenNJ,1x1_vancouverCAN,1x1_mexicocityMEX,1x1_asphaltjungleNJ,1x1_brazil,1x1_urbanc_alpha,1x1_numaIA,1x1_smallvilleIA,0.1x0.1,0.5x0.5,3x3min,5x5min,10x10min,0.33x0.33,0.125x0.125,ne4np4,ne11np4,ne16np4,ne30np4,ne60np4,ne120np4,ne240np4,1km-merge-10min,ne0np4_arm_x8v3_lowcon,ne0np4_conus_x4v1_lowcon,ne0np4_enax4v1,ne0np4_conus_x4v1_lowcon,ne0np4_twpx4v1">
 Horizontal resolutions
 Note: 0.1x0.1, 0.5x0.5, 5x5min, 10x10min, 3x3min and 0.33x0.33 are only used for CLM tools
 </entry>