Merge origin/brhillman/atm/fix-conus-set_horiz (PR # 2163)

Fix CONUS RRM configuration

Fix two issues with the CONUS RRM configuration that prevented configuring a case with CONUS. First, the domain files were not specified for the CONUS grid in config_grids.xml, so hgrid ended up remaining UNSET, causing set_horiz_grid to fail with all components having grid values UNSET. This PR puts the domain file specification back into config_grids.xml for CONUS, and fixes #2147. Second, an older land initial condition (finidat) file was being used for sim year 2000 runs, which was incompatible with recent changes, causing runs to fail. This PR replaces finidat for sim year 2000 with the updated version.  Fixes #1899

This PR also adds a test suite for RRM grids.

[BFB]

config/e3sm/allactive/config_pesall.xml

@@ -8117,4 +8117,41 @@
       </pes>
     </mach>
   </grid>
+  <grid name="a%ne0np4.*">
+    <mach name="any">
+      <pes compset="any" pesize="any">
+        <comment>none</comment>
+        <ntasks>
+          <ntasks_atm>128</ntasks_atm>
+          <ntasks_lnd>128</ntasks_lnd>
+          <ntasks_rof>128</ntasks_rof>
+          <ntasks_ice>128</ntasks_ice>
+          <ntasks_ocn>128</ntasks_ocn>
+          <ntasks_glc>128</ntasks_glc>
+          <ntasks_wav>128</ntasks_wav>
+          <ntasks_cpl>128</ntasks_cpl>
+        </ntasks>
+        <nthrds>
+          <nthrds_atm>1</nthrds_atm>
+          <nthrds_lnd>1</nthrds_lnd>
+          <nthrds_rof>1</nthrds_rof>
+          <nthrds_ice>1</nthrds_ice>
+          <nthrds_ocn>1</nthrds_ocn>
+          <nthrds_glc>1</nthrds_glc>
+          <nthrds_wav>1</nthrds_wav>
+          <nthrds_cpl>1</nthrds_cpl>
+        </nthrds>
+        <rootpe>
+          <rootpe_atm>0</rootpe_atm>
+          <rootpe_lnd>0</rootpe_lnd>
+          <rootpe_rof>0</rootpe_rof>
+          <rootpe_ice>0</rootpe_ice>
+          <rootpe_ocn>0</rootpe_ocn>
+          <rootpe_glc>0</rootpe_glc>
+          <rootpe_wav>0</rootpe_wav>
+          <rootpe_cpl>0</rootpe_cpl>
+        </rootpe>
+      </pes>
+    </mach>
+  </grid>
 </config_pes>

config/e3sm/config_grids.xml

@@ -1309,6 +1309,7 @@
       <support>For testing of the WAV model</support>
     </domain>
 
+    <!-- RRM grids -->
     <domain name="ne0np4_arm_x8v3_lowcon">
       <nx>92558</nx>
       <ny>1</ny>
@@ -1343,6 +1344,27 @@
       <file ocn_mask="oRRS18to6v3">domain.ocn.twpx4v1_oRRS18to6v3.170629.nc</file>
     </domain>
 
+    <domain name="ne0np4_conus_x4v1_lowcon">
+      <nx>89147</nx>
+      <ny>1</ny>
+      <desc>1-deg with 1/4-deg over CONUS (version 1):</desc>
+      <file atm_mask="tx0.1v2">domain.lnd.conusx4v1_tx0.1v2.161129.nc</file>
+      <file ice_mask="tx0.1v2">domain.ocn.conusx4v1_tx0.1v2.161129.nc</file>
+      <file lnd_mask="tx0.1v2">domain.lnd.conusx4v1_tx0.1v2.161129.nc</file>
+      <file ocn_mask="tx0.1v2">domain.ocn.conusx4v1_tx0.1v2.161129.nc</file>
+    </domain>
+
+    <!-- Old mask for CONUS grid -->
+    <domain name="tx0.1v2">
+      <nx>3600</nx>  <ny>2400</ny>
+      <file atm_mask="tx0.1v2">domain.ocn.tx0.1v2.090218.nc</file>
+      <file ice_mask="tx0.1v2">domain.ocn.tx0.1v2.090218.nc</file>
+      <file lnd_mask="tx0.1v2">domain.ocn.tx0.1v2.090218.nc</file>
+      <file ocn_mask="tx0.1v2">domain.ocn.tx0.1v2.090218.nc</file>
+      <desc>tx0.1v2 is an old mask used for CONUS:</desc>
+    </domain>
+
+
     <domain name="oQU240">
       <nx>7153</nx>
       <ny>1</ny>

scripts/lib/update_e3sm_tests.py

@@ -141,7 +141,7 @@
                         ,("SMS_P12x2.ne4_oQU240.A_WCYCL1850","mach_mods")
                         )),
 
-    "e3sm_integration" : (("e3sm_developer", "e3sm_atm_integration"),"03:00:00",
+    "e3sm_integration" : (("e3sm_developer", "e3sm_atm_integration", "e3sm_rrm"),"03:00:00",
                           ("ERS.ne11_oQU240.A_WCYCL1850",
                            "ERS_Ln9.ne4_ne4.FC5AV1C-L",
                           #"ERT_Ld31.ne16_g37.B1850C5",#add this line back in with the new correct compset
@@ -167,6 +167,13 @@
                        "SMS.T62_oRRS30to10v3wLI.GMPAS-IAF",
                      )),
 
+    #e3sm tests for RRM grids
+    "e3sm_rrm" : (None, None, 
+                  ("SMS_D_Ln5.conusx4v1_conusx4v1.FC5AV1C-L",
+                   "SMS_D_Ln5.enax4v1_enax4v1.FC5AV1C-L",
+                   "SMS_D_Ln5.twpx4v1_twpx4v1.FC5AV1C-L")
+                 ),
+
     #e3sm tests to mimic production runs
     "e3sm_prod" : (("e3sm_atm_prod",),None,
                      () ),