Merge origin/tangq/atm/antarcticarrm (PR #3449)

Add Antarctica RRM support for F2010SC5-CMIP6 compset This PR adds Antarctica RRM grid and supporting files and enables the grid for the F2010SC5-CMIP6 compset. [BFB]
ESMCI · Jun 23, 2020 · 2b69480 · 2b69480
2 parents 8f7c928 + d1b0291
commit 2b69480
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 1 deletion.
diff --git a/config/e3sm/config_grids.xml b/config/e3sm/config_grids.xml
@@ -984,6 +984,16 @@
       <mask>oRRS15to5</mask>
     </model_grid>
 
+    <model_grid alias="antarcticax4v1_r0125_antarcticax4v1" compset="(DOCN|XOCN|SOCN|AQP1)">
+      <grid name="atm">ne0np4_antarcticax4v1</grid>
+      <grid name="lnd">r0125</grid>
+      <grid name="ocnice">ne0np4_antarcticax4v1</grid>
+      <grid name="rof">r0125</grid>
+      <grid name="glc">null</grid>
+      <grid name="wav">null</grid>
+      <mask>oRRS15to5</mask>
+    </model_grid>
+
     <model_grid alias="ne30pg1_ne30pg1" compset="(DOCN|XOCN|SOCN|AQP1)">
       <grid name="atm">ne30np4.pg1</grid>
       <grid name="lnd">ne30np4.pg1</grid>
@@ -2501,6 +2511,14 @@
       <desc>1-deg with 1/4-deg over North America (version 1) pg2:</desc>
     </domain>
 
+    <domain name="ne0np4_antarcticax4v1">
+      <nx>109883</nx>
+      <ny>1</ny>
+      <file grid="atm|lnd" mask="oRRS15to5">$DIN_LOC_ROOT/share/domains/domain.lnd.antarcticax4v1_oRRS15to5.191127.nc</file>
+      <file grid="ice|ocn" mask="oRRS15to5">$DIN_LOC_ROOT/share/domains/domain.ocn.antarcticax4v1_oRRS15to5.191127.nc</file>
+      <desc>1-deg with 1/4-deg over Antarctica (version 1):</desc>
+    </domain>
+
     <domain name="tx0.1v2">
       <nx>3600</nx>
       <ny>2400</ny>
@@ -3012,6 +3030,18 @@
       <map name="ATM2ROF_SMAPNAME">cpl/gridmaps/northamericax4v1np4/map_northamericax4v1pg2_to_r0125_mono.20200401.nc</map>
     </gridmap>
 
+    <gridmap atm_grid="ne0np4_antarcticax4v1" lnd_grid="r0125">
+      <map name="ATM2LND_FMAPNAME">cpl/gridmaps/antarcticax4v1np4/map_antarcticax4v1_to_r0125_mono.20191127.nc</map>
+      <map name="ATM2LND_SMAPNAME">cpl/gridmaps/antarcticax4v1np4/map_antarcticax4v1_to_r0125_mono.20191127.nc</map>
+      <map name="LND2ATM_FMAPNAME">cpl/gridmaps/r0125/map_r0125_to_antarcticax4v1_monotr.20191127.nc</map>
+      <map name="LND2ATM_SMAPNAME">cpl/gridmaps/r0125/map_r0125_to_antarcticax4v1_monotr.20191127.nc</map>
+    </gridmap>
+
+    <gridmap atm_grid="ne0np4_antarcticax4v1" rof_grid="r0125">
+      <map name="ATM2ROF_FMAPNAME">cpl/gridmaps/antarcticax4v1np4/map_antarcticax4v1_to_r0125_mono.20191127.nc</map>
+      <map name="ATM2ROF_SMAPNAME">cpl/gridmaps/antarcticax4v1np4/map_antarcticax4v1_to_r0125_mono.20191127.nc</map>
+    </gridmap>
+
     <gridmap atm_grid="T62" ocn_grid="gx3v7">
       <map name="ATM2OCN_FMAPNAME">cpl/gridmaps/T62/map_T62_TO_gx3v7_aave.130322.nc</map>
       <map name="ATM2OCN_SMAPNAME">cpl/gridmaps/T62/map_T62_TO_gx3v7_blin.130322.nc</map>

diff --git a/src/components/data_comps_mct/docn/cime_config/config_component.xml b/src/components/data_comps_mct/docn/cime_config/config_component.xml
@@ -185,7 +185,7 @@
       <value compset="1850_" grid="a%0.23x0.31.*_oi%0.23x0.31"					>$DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_0.23x0.31_clim_pi_c101028.nc</value>
       <value compset="1950_" grid=".+"								>$DIN_LOC_ROOT/ocn/docn7/SSTDATA/sst_ice_CMIP6_DECK_E3SM_1x1_1950_clim_c20180910.nc</value>
       <value compset="2010S_" grid="a%ne30np4.*_oi%oEC60to30v3"					>$DIN_LOC_ROOT/ocn/docn7/SSTDATA/sst_ice_CMIP6_DECK_E3SM_1x1_2010_clim_c20190821.nc</value>
-      <value compset="2010S_" grid="a%ne0np4_northamericax4v1.*"					>$DIN_LOC_ROOT/ocn/docn7/SSTDATA/sst_ice_CMIP6_DECK_E3SM_1x1_2010_clim_c20190821.nc</value>
+      <value compset="2010S_" grid="a%ne0np4_*.*"					>$DIN_LOC_ROOT/ocn/docn7/SSTDATA/sst_ice_CMIP6_DECK_E3SM_1x1_2010_clim_c20190821.nc</value>
       <value compset="20TR_CAM5%CMIP6" grid=".+"					>$DIN_LOC_ROOT/ocn/docn7/SSTDATA/sst_ice_CMIP6_DECK_E3SM_1x1_c20180213.nc</value>
       <value compset="DATM.*_DLND.*_DICE.*_DOCN.*_DROF" 				        >$DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_0.9x1.25_clim_c040926.nc</value>
       <value compset="DATM.*_SLND.*_DICE.*_DOCN.*_DROF" 				        >$DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_0.9x1.25_clim_c040926.nc</value>

diff --git a/src/drivers/mct/cime_config/config_component_e3sm.xml b/src/drivers/mct/cime_config/config_component_e3sm.xml
@@ -330,6 +330,7 @@
       <value compset=".+" grid="a%ne0np4_arm_x8v3" >144</value>
       <value compset=".+" grid="a%ne0np4_conus_x4v1" >96</value>
       <value compset=".+" grid="a%ne0np4_northamericax4v1" >96</value>
+      <value compset=".+" grid="a%ne0np4_antarcticax4v1" >96</value>
       <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>