Merge branch 'pio2_fix2'

Fixes needed for PIO2

Fixes needed for CTSM to work with PIO2. There is an additional fix
needed in PIO2 itself; this is available in a later version of cime that
we will bring in soon.

Note that this PR also includes a change in config_files.xml that is
needed for a newer version of cime when running compsets with dlnd, slnd
or xlnd; this may be incompatible with the current version of the cime
external, but this does not impact compsets with CTSM.

.config_files.xml

@@ -18,9 +18,10 @@
     <default_value>unset</default_value>
     <values>
       <value component="clm"      >$SRCROOT</value>
-      <value component="dlnd"      >$CIMEROOT/src/components/data_comps/dlnd</value>
-      <value component="slnd"      >$CIMEROOT/src/components/stub_comps/slnd</value>
-      <value component="xlnd"      >$CIMEROOT/src/components/xcpl_comps/xlnd</value>
+      <value component="dlnd" comp_interface="mct">$CIMEROOT/src/components/data_comps_mct/dlnd</value>
+      <value component="dlnd" comp_interface="nuopc">$CIMEROOT/src/components/cdeps/dlnd</value>
+      <value component="slnd"      >$CIMEROOT/src/components/stub_comps_$COMP_INTERFACE/slnd</value>
+      <value component="xlnd"      >$CIMEROOT/src/components/xcpl_comps_$COMP_INTERFACE/xlnd</value>
     </values>
     <group>case_comps</group>
     <file>env_case.xml</file>

cime_config/testdefs/ExpectedTestFails.xml

@@ -30,13 +30,6 @@
 
   <!-- aux_clm test suite failures -->
 
-  <test name="ERS_Lm20_Mmpi-serial.1x1_smallvilleIA.I2000Clm50BgcCropQianGs.cheyenne_gnu.clm-monthly">
-    <phase name="RUN">
-      <status>FAIL</status>
-      <issue>#203</issue>
-    </phase>
-  </test>
-
   <test name="ERS_Ln9.ne0ARCTICne30x4_ne0ARCTICne30x4_mt12.IHistClm50SpGs.cheyenne_intel.clm-clm50cam6LndTuningMode_1979Start">
     <phase name="COMPARE_base_rest">
       <status>FAIL</status>

doc/ChangeLog

@@ -1,4 +1,119 @@
 ===============================================================
+Tag name:  ctsm1.0.dev110
+Originator(s): jedwards (Jim Edwards)
+Date:  Fri Aug 21 10:49:08 MDT 2020
+One-line Summary: Fixes needed for PIO2
+
+Purpose of changes
+------------------
+
+Fixes needed for CTSM to work with PIO2. There is an additional fix
+needed in PIO2 itself; this is available in a later version of cime that
+we will bring in soon.
+
+Note that this PR also includes a change in config_files.xml that is
+needed for a newer version of cime when running compsets with dlnd, slnd
+or xlnd; this may be incompatible with the current version of the cime
+external, but this does not impact compsets with CTSM.
+
+Bugs fixed or introduced
+------------------------
+
+Issues fixed (include CTSM Issue #):
+The changes in this tag, together with a cime update that will be coming
+in soon, resolve the following issues (I'm not sure off-hand which
+issues are resolved by the changes here alone and which ones require the
+cime update):
+- Resolves ESCOMP/CTSM#1029 (FATES tests fail with PIO2)
+- Resolves ESCOMP/CTSM#1030 (mpi-serial nag case fails with pio2 when
+  defining h1 history restart file)
+
+Significant changes to scientifically-supported configurations
+--------------------------------------------------------------
+
+Does this tag change answers significantly for any of the following physics configurations?
+(Details of any changes will be given in the "Answer changes" section below.)
+
+    [Put an [X] in the box for any configuration with significant answer changes.]
+
+[ ] clm5_0
+
+[ ] ctsm5_0-nwp
+
+[ ] clm4_5
+
+Notes of particular relevance for users
+---------------------------------------
+
+Caveats for users (e.g., need to interpolate initial conditions):
+- May not be able to run configurations with dlnd, slnd or xlnd from this tag
+
+Changes to CTSM's user interface (e.g., new/renamed XML or namelist variables): none
+
+Changes made to namelist defaults (e.g., changed parameter values): none
+
+Changes to the datasets (e.g., parameter, surface or initial files): none
+
+Substantial timing or memory changes: Not investigated, but almost definitely not
+
+Notes of particular relevance for developers: (including Code reviews and testing)
+---------------------------------------------
+NOTE: Be sure to review the steps in README.CHECKLIST.master_tags as well as the coding style in the Developers Guide
+
+Caveats for developers (e.g., code that is duplicated that requires double maintenance): none
+
+Changes to tests or testing: none
+
+Code reviewed by: Bill Sacks
+
+
+CTSM testing:
+
+ [PASS means all tests PASS and OK means tests PASS other than expected fails.]
+
+  build-namelist tests:
+
+    cheyenne - not run
+
+  tools-tests (test/tools):
+
+    cheyenne - not run
+
+  PTCLM testing (tools/shared/PTCLM/test):
+
+    cheyenne - not run
+
+  python testing (see instructions in python/README.md; document testing done):
+
+    (any machine) - not run
+
+  regular tests (aux_clm):
+
+    cheyenne ---- PASS
+    izumi ------- PASS
+
+    Note: Standard testing was done using PIO1 (as this is still the
+    default), but separate testing was also done using PIO2 (using an
+    updated cime) and tests were found to pass.
+
+If the tag used for baseline comparisons was NOT the previous tag, note that here:
+
+
+Answer changes
+--------------
+
+Changes answers relative to baseline: NO
+
+Detailed list of changes
+------------------------
+
+List any externals directories updated (cime, rtm, mosart, cism, fates, etc.): none
+
+Pull Requests that document the changes (include PR ids):
+https://github.com/ESCOMP/CTSM/pull/1095
+
+===============================================================
+===============================================================
 Tag name:  ctsm1.0.dev109
 Originator(s):  negins (Negin Sobhani,UCAR/TSS,303-497-1224)
 Date: Thu Aug 20 11:40:07 MDT 2020

doc/ChangeSum

@@ -1,5 +1,6 @@
 Tag                   Who      Date  Summary
 ============================================================================================================================
+  ctsm1.0.dev110 jedwards 08/21/2020 Fixes needed for PIO2
   ctsm1.0.dev109   negins 08/20/2020 Allow for resorbtion in transition from live to dead wood N
   ctsm1.0.dev108     erik 08/19/2020  Update default PE layouts for new SE/FV3 grids
   ctsm1.0.dev107     erik 08/10/2020 Answer changes needed for CESM2.2.0