Merge remote-tracking branch 'origin/master' into jgfouca/xml_cache_u…

…pgrade

* origin/master: (71 commits)
  remove debug print statement
  fix duplicated code
  remove duplicated code
  fix PFS generate issue
  more merge issues
  correct indentation
  make method static
  increase test time for CMOM
  fix pylint 3 issue
  fix merge issue
  fix merge issues
  fix pylint 2 error
  merge nuopc-cmeps to cime master
  reduce memleak
  reduce stdout
  another avgdt refinement
  update data model interface
  correct avgdt calculation
  more mpicom cleanup
  removing mpicom from nuopc code
  ...

config/cesm/config_grids.xml

@@ -973,6 +973,9 @@
       <desc>null is no grid: </desc>
     </domain>
 
+    <!-- LND domains for single column or regional -->
+
+
     <domain name="01col">
       <nx>1</nx> <ny>1</ny>
       <file>domain.ocn.01col.ArcticOcean.20150824.nc</file>
@@ -1034,6 +1037,8 @@
       <desc>5x5 Amazon regional case -- only valid for DATM/CLM compset</desc>
     </domain>
 
+    <!-- ATM/LND domains global -->
+
     <domain name="360x720cru">
       <nx>720</nx> <ny>360</ny>
       <file grid="atm|lnd">$DIN_LOC_ROOT/share/domains/domain.clm/domain.lnd.360x720_cruncep.100429.nc</file>
@@ -1053,6 +1058,7 @@
       <file grid="ocnice"  mask="gx1v6">domain.ocn.0.47x0.63_gx1v6_090408.nc</file>
       <file grid="atm|lnd" mask="gx1v7">domain.lnd.fv0.47x0.63_gx1v7.180521.nc</file>
       <file grid="ocnice"  mask="gx1v7">domain.ocn.fv0.47x0.63_gx1v7.180521.nc</file>
+      <mesh driver="nuopc">$DIN_LOC_ROOT/share/meshes/fv0.47x0.63_141008_ESMFmesh.nc</mesh>
       <desc>0.47x0.63 is FV 1/2-deg grid:</desc>
     </domain>
 
@@ -1062,25 +1068,27 @@
       <file grid="ocnice"  mask="gx1v6">domain.ocn.0.9x1.25_gx1v6_090403.nc</file>
       <file grid="atm|lnd" mask="gx1v7">domain.lnd.fv0.9x1.25_gx1v7.151020.nc</file>
       <file grid="ocnice"  mask="gx1v7">domain.ocn.fv0.9x1.25_gx1v7.151020.nc</file>
-      <file grid="atm|lnd" mask="null">/glade/u/home/benedict/ys/datain/domain.aqua.fv0.9x1.25.nc</file>
-      <file grid="ocnice"  mask="null">/glade/u/home/benedict/ys/datain/domain.aqua.fv0.9x1.25.nc</file>
+      <mesh driver="nuopc">$DIN_LOC_ROOT/share/meshes/fv0.9x1.25_141008_polemod_ESMFmesh.nc</mesh>
       <desc>0.9x1.25 is FV 1-deg grid:</desc>
     </domain>
 
+    <!-- TODO: the lats for the gx1v7 and gx1v6 mask are different at
+         the poles- the 141008 should be used for both but would change answers -->
     <domain name="1.9x2.5">
       <nx>144</nx>  <ny>96</ny>
       <file grid="atm|lnd" mask="gx1v6">domain.lnd.fv1.9x2.5_gx1v6.090206.nc</file>
       <file grid="ocnice"  mask="gx1v6">domain.ocn.1.9x2.5_gx1v6_090403.nc</file>
       <file grid="atm|lnd" mask="gx1v7">domain.lnd.fv1.9x2.5_gx1v7.170518.nc</file>
       <file grid="ocnice"  mask="gx1v7">domain.ocn.fv1.9x2.5_gx1v7.170518.nc</file>
-      <file grid="ocnice"  mask="null">domain.aqua.fv1.9x2.5.nc</file>
+      <mesh driver="nuopc">$DIN_LOC_ROOT/share/meshes/fv1.9x2.5_141008_ESMFmesh.nc</mesh>
       <desc>1.9x2.5 is FV 2-deg grid:</desc>
     </domain>
 
     <domain name="4x5">
       <nx>72</nx> <ny>46</ny>
-      <file grid="atm|lnd">domain.lnd.fv4x5_gx3v7.091218.nc</file>
+      <file grid="atm|lnd" mask="gx3v7">domain.lnd.fv4x5_gx3v7.091218.nc</file>
       <file grid="ocnice">domain.ocn.4x5_gx3v7_100120.nc</file>
+      <mesh driver="nuopc">$DIN_LOC_ROOT/share/meshes/fv4x5_050615_polemod_ESMFmesh.nc</mesh>
       <desc>4x5 is FV 4-deg grid:</desc>
     </domain>
 
@@ -1121,30 +1129,32 @@
 
     <domain name="T62">
       <nx>192</nx>  <ny>96</ny>
-      <file grid="atm|lnd" mask="gx1v7">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_gx1v7.151008.nc</file>
-      <file grid="atm|lnd" mask="gx1v6">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_gx1v6.090320.nc</file>
-      <file grid="atm|lnd" mask="gx3v7">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_gx3v7.090911.nc</file>
-      <file grid="atm|lnd" mask="tx1v1">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_tx1v1.090122.nc</file>
+      <file grid="atm|lnd" mask="gx1v7"  >$DIN_LOC_ROOT/share/domains/domain.lnd.T62_gx1v7.151008.nc</file>
+      <file grid="atm|lnd" mask="gx1v6"  >$DIN_LOC_ROOT/share/domains/domain.lnd.T62_gx1v6.090320.nc</file>
+      <file grid="atm|lnd" mask="gx3v7"  >$DIN_LOC_ROOT/share/domains/domain.lnd.T62_gx3v7.090911.nc</file>
+      <file grid="atm|lnd" mask="tx1v1"  >$DIN_LOC_ROOT/share/domains/domain.lnd.T62_tx1v1.090122.nc</file>
       <file grid="atm|lnd" mask="tx0.1v2">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_tx0.1v2_090623.nc</file>
       <file grid="atm|lnd" mask="tx0.1v3">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_tx0.1v3.170929.nc</file>
-      <file grid="atm|lnd" mask="oQU120">$DIN_LOC_ROOT/share/domains/domain.lnd.T62_oQU120.160325.nc</file>
-      <file grid="ocnice" mask="gx1v6">$DIN_LOC_ROOT/share/domains/domain.ocn.T62_gx1v6.130409.nc</file>
-      <file grid="ocnice" mask="gx1v7">$DIN_LOC_ROOT/share/domains/domain.ocn.T62_gx1v7.151008.nc</file>
-      <file grid="ocnice" mask="gx3v7">$DIN_LOC_ROOT/share/domains/domain.ocn.T62_gx3v7.130409.nc</file>
+      <file grid="atm|lnd" mask="oQU120" >$DIN_LOC_ROOT/share/domains/domain.lnd.T62_oQU120.160325.nc</file>
+      <file grid="ocnice"  mask="gx1v6"  >$DIN_LOC_ROOT/share/domains/domain.ocn.T62_gx1v6.130409.nc</file>
+      <file grid="ocnice"  mask="gx1v7"  >$DIN_LOC_ROOT/share/domains/domain.ocn.T62_gx1v7.151008.nc</file>
+      <file grid="ocnice"  mask="gx3v7"  >$DIN_LOC_ROOT/share/domains/domain.ocn.T62_gx3v7.130409.nc</file>
+      <mesh driver="nuopc">$DIN_LOC_ROOT/share/meshes/T62_040121_ESMFmesh.nc</mesh>
       <desc>T62 is Gaussian grid:</desc>
     </domain>
 
     <domain name="T31">
       <nx>96</nx> <ny>48</ny>
-      <file grid="atm|lnd">$DIN_LOC_ROOT/share/domains/domain.lnd.T31_gx3v7.090928.nc</file>
-      <file grid="ocnice">$DIN_LOC_ROOT/share/domains/domain.ocn.48x96_gx3v7_100114.nc</file>
+      <file grid="atm|lnd" mask="gx3v7">$DIN_LOC_ROOT/share/domains/domain.lnd.T31_gx3v7.130409.nc</file>
+      <file grid="ocnice"  mask="gx3v7">$DIN_LOC_ROOT/share/domains/domain.ocn.T31_gx3v7.130409.nc</file>
+      <mesh driver="nuopc">$DIN_LOC_ROOT/share/meshes/T31_040122_ESMFmesh.nc</mesh>
       <desc>T31 is Gaussian grid:</desc>
     </domain>
 
     <domain name="T42">
       <nx>128</nx> <ny>64</ny>
-      <file grid="atm|lnd" mask="usgs">$DIN_LOC_ROOT/share/domains/domain.clm/domain.lnd.T42_USGS.111004.nc</file>
-      <file grid="ocnice"  mask="usgs">$DIN_LOC_ROOT/atm/cam/ocnfrac/domain.camocn.64x128_USGS_070807.nc</file>
+      <file grid="atm|lnd" mask="usgs" >$DIN_LOC_ROOT/share/domains/domain.clm/domain.lnd.T42_USGS.111004.nc</file>
+      <file grid="ocnice"  mask="usgs" >$DIN_LOC_ROOT/atm/cam/ocnfrac/domain.camocn.64x128_USGS_070807.nc</file>
       <file grid="atm|lnd" mask="gx1v7">$DIN_LOC_ROOT/share/domains/domain.lnd.T42_gx1v7.180727.nc</file>
       <file grid="ocnice"  mask="gx1v7">$DIN_LOC_ROOT/share/domains/domain.ocn.T42_gx1v7.180727.nc</file>
       <desc>T42 is Gaussian grid:</desc>
@@ -1153,23 +1163,24 @@
     <domain name="ne5np4">
       <nx>1352</nx> <ny>1</ny>
       <file grid="atm|lnd" mask="gx3v7">$DIN_LOC_ROOT/share/domains/domain.lnd.ne5np4_gx3v7.140810.nc</file>
-      <file grid="ocnice" mask="gx3v7">$DIN_LOC_ROOT/share/domains/domain.ocn.ne5np4_gx3v7.140810.nc</file>
+      <file grid="ocnice"  mask="gx3v7">$DIN_LOC_ROOT/share/domains/domain.ocn.ne5np4_gx3v7.140810.nc</file>
       <desc>ne5np4 is Spectral Elem 6-deg grid:</desc>
       <support>For ultra-low resolution spectral element grid testing</support>
     </domain>
 
     <domain name="ne5np4.pg3">
       <nx>1350</nx> <ny>1</ny>
       <file grid="atm|lnd" mask="gx3v7">$DIN_LOC_ROOT/share/domains/domain.lnd.ne5np4.pg3_gx3v7.170605.nc</file>
-      <file grid="ocnice" mask="gx3v7">$DIN_LOC_ROOT/share/domains/domain.ocn.ne5np4.pg3_gx3v7.170605.nc</file>
+      <file grid="ocnice"  mask="gx3v7">$DIN_LOC_ROOT/share/domains/domain.ocn.ne5np4.pg3_gx3v7.170605.nc</file>
       <desc>ne5np4 is Spectral Elem 6-deg grid with a 3x3 FVM physics grid:</desc>
       <support>EXPERIMENTAL FVM physics grid</support>
     </domain>
 
     <domain name="ne16np4">
       <nx>13826</nx> <ny>1</ny>
       <file grid="atm|lnd" mask="gx1v7">$DIN_LOC_ROOT/share/domains/domain.lnd.ne16np4_gx1v7.171018.nc</file>
-      <file grid="ocnice" mask="gx1v7">$DIN_LOC_ROOT/share/domains/domain.ocn.ne16np4_gx1v7.171018.nc</file>
+      <file grid="ocnice"  mask="gx1v7">$DIN_LOC_ROOT/share/domains/domain.ocn.ne16np4_gx1v7.171018.nc</file>
+      <mesh driver="nuopc">$DIN_LOC_ROOT/share/meshes/ne16np4_scrip_171002_ESMFmesh.nc</mesh>
       <desc>ne16np4 is Spectral Elem 2-deg grid:</desc>
       <support>For low resolution spectral element grid testing</support>
     </domain>
@@ -1188,6 +1199,7 @@
       <file grid="ocnice"  mask="gx1v6">$DIN_LOC_ROOT/share/domains/domain.ocn.ne30np4_gx1v6_110217.nc</file>
       <file grid="atm|lnd" mask="gx1v7">$DIN_LOC_ROOT/share/domains/domain.lnd.ne30_gx1v7.171003.nc</file>
       <file grid="ocnice"  mask="gx1v7">$DIN_LOC_ROOT/share/domains/domain.ocn.ne30_gx1v7.171003.nc</file>
+      <mesh driver="nuopc">$DIN_LOC_ROOT/share/meshes/ne30np4_091226_pentagons_ESMFmesh.nc</mesh>
       <desc>ne30np4 is Spectral Elem 1-deg grid:</desc>
     </domain>
 
@@ -1219,6 +1231,7 @@
       <nx>194402</nx> <ny>1</ny>
       <file grid="atm|lnd" mask="gx1v6">$DIN_LOC_ROOT/share/domains/domain.lnd.ne60np4_gx1v6.120406.nc</file>
       <file grid="ocnice"  mask="gx1v6">$DIN_LOC_ROOT/share/domains/domain.ocn.ne60np4_gx1v6.121113.nc</file>
+      <mesh driver="nuopc">$DIN_LOC_ROOT/share/meshes/ne60np4_pentagons_100408_ESMFmesh.nc</mesh>
       <desc>ne60np4 is Spectral Elem 1/2-deg grid:</desc>
     </domain>
 
@@ -1257,6 +1270,7 @@
       <nx>345600</nx> <ny>1</ny>
       <file grid="atm|lnd" mask="gx1v7">$DIN_LOC_ROOT/share/domains/domain.lnd.ne120np4.pg2_gx1v7.170629.nc</file>
       <file grid="ocnice"  mask="gx1v7">$DIN_LOC_ROOT/share/domains/domain.ocn.ne120np4.pg2_gx1v7.170629.nc</file>
+      <mesh driver="nuopc">$DIN_LOC_ROOT/share/meshes/ne120np4_pentagons_100310_ESMFmesh.nc</mesh>
       <desc>ne120np4.pg2 is a Spectral Elem 0.25-deg grid with a 2x2 FVM physics grid:</desc>
       <support>EXPERIMENTAL FVM physics grid</support>
     </domain>
@@ -1324,29 +1338,34 @@
       <support>EXPERIMENTAL FVM physics grid</support>
     </domain>
 
+    <!-- OCN/ICE domains -->
+
     <domain name="gx1v6">
       <nx>320</nx>  <ny>384</ny>
       <file grid="atm|lnd">$DIN_LOC_ROOT/share/domains/domain.ocn.gx1v6.090206.nc</file>
       <file grid="ocnice">$DIN_LOC_ROOT/share/domains/domain.ocn.gx1v6.090206.nc</file>
+      <mesh driver="nuopc">$DIN_LOC_ROOT/share/meshes/gx1v6_090205_ESMFmesh.nc</mesh>
       <desc>gx1v6 is displaced Greenland pole v6 1-deg grid:</desc>
     </domain>
 
     <domain name="gx1v7">
       <nx>320</nx>  <ny>384</ny>
       <file grid="atm|lnd">$DIN_LOC_ROOT/share/domains/domain.ocn.gx1v7.151008.nc</file>
       <file grid="ocnice">$DIN_LOC_ROOT/share/domains/domain.ocn.gx1v7.151008.nc</file>
+      <mesh driver="nuopc">$DIN_LOC_ROOT/share/meshes/gx1v7_151008_ESMFmesh.nc</mesh>
       <desc>gx1v7 is displaced Greenland pole 1-deg grid with Caspian as a land feature:</desc>
     </domain>
 
     <domain name="gx3v7">
       <nx>100</nx> <ny>116</ny>
       <file grid="ocnice">$DIN_LOC_ROOT/share/domains/domain.ocn.gx3v7.120323.nc</file>
+      <mesh driver="nuopc">$DIN_LOC_ROOT/share/meshes/gx3v7_120309_ESMFmesh.nc</mesh>
       <desc>gx3v7 is displaced Greenland pole v7 3-deg grid:</desc>
     </domain>
 
     <domain name="tx0.1v2">
       <nx>3600</nx> <ny>2400</ny>
-      <file grid="ocnice">$DIN_LOC_ROOT/share/domains/domain.ocn.tx0.1v2_161014.nc</file>
+      <file grid="ocnice">$DIN_LOC_ROOT/share/domains/domain.ocn.tx0.1v2.161014.nc</file>
       <desc>tx0.1v2 is tripole v2 1/10-deg grid:</desc>
       <support>Experimental for high resolution experiments</support>
     </domain>
@@ -1365,16 +1384,25 @@
       <support>Experimental tripole ocean grid</support>
     </domain>
 
+    <domain name="oQU120">
+      <nx>28574</nx>  <ny>1</ny>
+      <file mask="oQU120">$DIN_LOC_ROOT/share/domains/domain.ocn.oQU120.160325.nc</file>
+      <desc>oQU120 is a MPAS ocean grid that is roughly 1 degree resolution:</desc>
+      <support>Experimental, under development</support>
+    </domain>
+
+    <!-- ROF domains -->
+
     <domain name="rx1">
       <nx>360</nx> <ny>180</ny>
-      <!-- TODO: create a domain file for rx1 -->
+      <mesh driver="nuopc">$DIN_LOC_ROOT/share/meshes/rx1_nomask_181022_ESMFmesh.nc</mesh>
       <desc>rx1 is 1 degree river routing grid (only valid for DROF):</desc>
       <support>Can only be used by DROF</support>
     </domain>
 
     <domain name="r05">
       <nx>720</nx> <ny>360</ny>
-      <!-- TODO: create a domain file for r05 -->
+      <mesh driver="nuopc">$DIN_LOC_ROOT/share/meshes/r05_nomask_c110308_ESMFmesh.nc</mesh>
       <desc>r05 is 1/2 degree river routing grid:</desc>
     </domain>
 
@@ -1387,17 +1415,10 @@
 
     <domain name="JRA025">
       <nx>1440</nx> <ny>720</ny>
-      <desc>JRA 0.25 degree runoff grid for use with JRA-55 runoff data</desc>
-    </domain>
-
-    <domain name="oQU120">
-      <nx>28574</nx>  <ny>1</ny>
-      <file mask="oQU120">$DIN_LOC_ROOT/share/domains/domain.ocn.oQU120.160325.nc</file>
-      <desc>oQU120 is a MPAS ocean grid that is roughly 1 degree resolution:</desc>
-      <support>Experimental, under development</support>
+      <desc>JRA is 0.25 degree runoff grid for use with JRA-55 runoff data</desc>
     </domain>
 
-    <!-- GLC domain -->
+    <!-- GLC domains -->
 
     <domain name="gland20">
       <nx>76</nx> <ny>141</ny>
@@ -1420,6 +1441,7 @@
       <nx>90</nx>  <ny>50</ny>
       <file mask="ww3a">$DIN_LOC_ROOT/share/domains/domain.lnd.ww3a_ww3a.120222.nc</file>
       <file mask="ww3a">$DIN_LOC_ROOT/share/domains/domain.ocn.ww3a_ww3a.120222.nc</file>
+      <mesh driver="nuopc">$DIN_LOC_ROOT/share/meshes/ww3a_120222_ESMFmesh.nc</mesh>
       <desc>WW3 90 x 50 global grid</desc>
       <support>For testing of the WAV model</support>
     </domain>

config/cesm/machines/config_compilers.xml

@@ -69,6 +69,8 @@ using a fortran linker.
      compilers -->
 <compiler>
   <CPPDEFS>
+    <!-- This should be removed AFTER MOM6 cap is fully unified -->
+    <append> -DCESMCOUPLED </append>
     <append MODEL="pop"> -D_USE_FLOW_CONTROL </append>
   </CPPDEFS>
   <SUPPORTS_CXX>FALSE</SUPPORTS_CXX>

config/cesm/machines/config_machines.xml

@@ -332,7 +332,9 @@ This allows using a different mpirun command to launch unit tests
       <env name="MPI_USE_ARRAY"/>
     </environment_variables>
     <environment_variables comp_interface="nuopc">
-      <env name="ESMFMKFILE">/glade/u/home/dunlap/ESMF-INSTALL/8.0.0bs16/lib/libg/Linux.intel.64.mpich2.default/esmf.mk</env>
+      <env name="ESMFMKFILE">/glade/u/home/dunlap/ESMF-INSTALL/8.0.0bs24/lib/libg/Linux.intel.64.mpt.default/esmf.mk</env>
+      <env name="ESMF_RUNTIME_PROFILE">ON</env>
+      <env name="ESMF_RUNTIME_PROFILE_OUTPUT">SUMMARY</env>
     </environment_variables>
     <environment_variables unit_testing="true">
       <env name="MPI_USE_ARRAY">false</env>

config/xml_schemas/config_grids_v2.xsd

@@ -1,23 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
   <!-- attributes -->
-  <xs:attribute name="version" type="xs:decimal"/>
-  <xs:attribute name="alias" type="xs:NMTOKEN"/>
-  <xs:attribute name="compset" type="xs:token"/>
+  <xs:attribute name="version"	   type="xs:decimal"/>
+  <xs:attribute name="alias"	   type="xs:NMTOKEN"/>
+  <xs:attribute name="compset"	   type="xs:token"/>
   <xs:attribute name="not_compset" type="xs:token"/>
-  <xs:attribute name="name" type="xs:NMTOKEN"/>
-  <xs:attribute name="grid" type="xs:token"/>
-  <xs:attribute name="lnd_mask" type="xs:NMTOKEN"/>
-  <xs:attribute name="mask" type="xs:NCName"/>
-  <xs:attribute name="ocn_mask" type="xs:NMTOKEN"/>
-  <xs:attribute name="grid1" type="xs:NCName"/>
-  <xs:attribute name="grid2" type="xs:NCName"/>
-  <xs:attribute name="atm_grid" type="xs:NMTOKEN"/>
-  <xs:attribute name="glc_grid" type="xs:NCName"/>
-  <xs:attribute name="lnd_grid" type="xs:NMTOKEN"/>
-  <xs:attribute name="ocn_grid" type="xs:NCName"/>
-  <xs:attribute name="rof_grid" type="xs:NCName"/>
-  <xs:attribute name="wav_grid" type="xs:NCName"/>
+  <xs:attribute name="name"	   type="xs:NMTOKEN"/>
+  <xs:attribute name="grid"	   type="xs:token"/>
+  <xs:attribute name="lnd_mask"	   type="xs:NMTOKEN"/>
+  <xs:attribute name="mask"	   type="xs:NCName"/>
+  <xs:attribute name="ocn_mask"	   type="xs:NMTOKEN"/>
+  <xs:attribute name="grid1"	   type="xs:NCName"/>
+  <xs:attribute name="grid2"	   type="xs:NCName"/>
+  <xs:attribute name="atm_grid"	   type="xs:NMTOKEN"/>
+  <xs:attribute name="glc_grid"	   type="xs:NCName"/>
+  <xs:attribute name="lnd_grid"	   type="xs:NMTOKEN"/>
+  <xs:attribute name="ocn_grid"	   type="xs:NCName"/>
+  <xs:attribute name="rof_grid"	   type="xs:NCName"/>
+  <xs:attribute name="wav_grid"	   type="xs:NCName"/>
+  <xs:attribute name="driver"	   type="xs:NCName"/>
 
   <!-- simple elements -->
   <xs:element name="support" type="xs:string"/>
@@ -86,13 +87,21 @@
         <xs:element ref="nx"/>
         <xs:element ref="ny"/>
         <xs:element ref="file" minOccurs="0" maxOccurs="unbounded"/>
+        <xs:element ref="mesh" minOccurs="0" maxOccurs="1"/>
         <xs:element ref="desc"/>
         <xs:element ref="support" minOccurs="0"/>
       </xs:sequence>
       <xs:attribute ref="name" use="required"/>
     </xs:complexType>
   </xs:element>
 
+  <xs:element name="mesh">
+    <xs:complexType mixed="true">
+      <xs:attribute ref="driver"/>
+      <xs:attribute ref="mask"/>
+    </xs:complexType>
+  </xs:element>
+
   <xs:element name="file">
     <xs:complexType mixed="true">
       <xs:attribute ref="grid"/>
@@ -102,7 +111,6 @@
     </xs:complexType>
   </xs:element>
 
-
   <xs:element name="required_gridmaps">
     <xs:complexType>
       <xs:sequence>

scripts/Tools/Makefile

@@ -145,7 +145,7 @@ ifeq ($(strip $(PIO_VERSION)),1)
 endif
 
 ifeq (,$(SHAREDPATH))
-  SHAREDPATH = $(COMPILER)/$(MPILIB)/$(DEBUGDIR)/$(THREADDIR)
+  SHAREDPATH = $(COMPILER)/$(MPILIB)/$(DEBUGDIR)/$(THREADDIR)/$(COMP_INTERFACE)
   INSTALL_SHAREDPATH = $(EXEROOT)/$(SHAREDPATH)
 endif
 

scripts/Tools/simple_compare

@@ -57,7 +57,10 @@ def _main_func(description):
     else:
         logging.info("Using case: '{}'".format(case))
 
-    success, comments = CIME.simple_compare.compare_files(gold_file, compare_file, case)
+    if gold_file.endswith('runconfig'):
+        success, comments = CIME.simple_compare.compare_runconfigfiles(gold_file, compare_file, case)
+    else:
+        success, comments = CIME.simple_compare.compare_files(gold_file, compare_file, case)
     expect(success,
            "Diff between files {} and {}:\n{}".format(gold_file, compare_file, comments))
 

scripts/lib/CIME/XML/env_batch.py

@@ -555,7 +555,7 @@ def _build_run_args_str(self, job, no_batch, **run_args):
             return run_args_str
         elif len(run_args_str) > 0:
             batch_system = self.get_value("BATCH_SYSTEM", subgroup=None)
-            logger.info("batch_system: {}: ".format(batch_system))
+            logger.debug("batch_system: {}: ".format(batch_system))
             if batch_system == "lsf":
                 return "{} \"all, ARGS_FOR_SCRIPT={}\"".format(batch_env_flag, run_args_str)
             else: