Merge esmci_remote_for_split/master

* esmci_remote_for_split/master: (1573 commits) fix for unit test Fix handling of BGC and TEST compset elements. Also fix CESM config_files.xml bcast iac namelist settings Updates the assignment of oneletterid for components make oneletterid z generalize for BGC and TEST changes for TEST dataset and undefined lookups Adds CONFIG_IAC_FILE for CESM Adds missing XML entries in MCT Adds coupling interval and config file for IAC Fixes to grid and PIO need to USE_FMS to build mom Removes SIAC from compset definition Fix minor bugs Introduces a new stub IAC runtime fix removed med_connectors_mod.F90 and med_infodata_mod.F90 fixed issues in PR Refactor code to make testable code a separate method Update for cime5.6.14 ...
ESMCI · Apr 15, 2019 · 9945456 · 9945456
2 parents ae96090 + 74730fe
commit 9945456
Show file tree

Hide file tree

Showing 143 changed files with 7,650 additions and 18,359 deletions.
diff --git a/config/cesm/config_files.xml b/config/cesm/config_files.xml
@@ -212,6 +212,19 @@
     <schema>$CIMEROOT/config/xml_schemas/config_compsets.xsd</schema>
   </entry>
 
+  <entry id="COMP_ROOT_DIR_IAC">
+    <type>char</type>
+    <default_value>unset</default_value>
+    <values>
+      <value component="siac"      >$CIMEROOT/src/components/stub_comps/siac</value>
+      <value component="xiac"      >$CIMEROOT/src/components/xcpl_comps/xiac</value>
+    </values>
+    <group>case_comps</group>
+    <file>env_case.xml</file>
+    <desc>Root directory of the case integrated assessment component  </desc>
+    <schema>$CIMEROOT/config/xml_schemas/config_compsets.xsd</schema>
+  </entry>
+
   <entry id="COMP_ROOT_DIR_ESP">
     <type>char</type>
     <default_value>unset</default_value>
@@ -502,6 +515,19 @@
     <schema version="3.0">$CIMEROOT/config/xml_schemas/entry_id_version3.xsd</schema>
   </entry>
 
+  <entry id="CONFIG_IAC_FILE">
+    <type>char</type>
+    <default_value>unset</default_value>
+    <values>
+      <value>$COMP_ROOT_DIR_IAC/cime_config/config_component.xml</value>
+    </values>
+    <group>case_last</group>
+    <file>env_case.xml</file>
+    <desc>file containing specification of component specific definitions and values(for documentation only - DO NOT EDIT)</desc>
+    <schema version="2.0">$CIMEROOT/config/xml_schemas/entry_id.xsd</schema>
+    <schema version="3.0">$CIMEROOT/config/xml_schemas/entry_id_version3.xsd</schema>
+  </entry>
+
   <entry id="CONFIG_WAV_FILE">
     <type>char</type>
     <values>

diff --git a/config/cesm/config_grids.xml b/config/cesm/config_grids.xml
@@ -44,6 +44,7 @@
       <grid name="wav"	  compset="DWAV"  >ww3a</grid>
       <grid name="wav"	  compset="WW3"	  >ww3a</grid>
       <grid name="wav"    compset="XWAV"  >ww3a</grid>
+      <grid name="iac"    compset="SIAC"  >null</grid>
     </model_grid_defaults>
 
     <model_grid alias="g16_g16" compset="DATM.+DROF">
@@ -277,6 +278,12 @@
       <grid name="ocnice">tx0.66v1</grid>
     </model_grid>
 
+    <model_grid alias="T62_t025" not_compset="_CAM">
+      <grid name="atm">T62</grid>
+      <grid name="lnd">T62</grid>
+      <grid name="ocnice">tx0.25v1</grid>
+    </model_grid>
+
     <model_grid alias="T62_g16" not_compset="_CAM">
       <grid name="atm">T62</grid>
       <grid name="lnd">T62</grid>
@@ -1002,11 +1009,11 @@
       <mask>tx0.66v1</mask>
     </model_grid>
 
-    <model_grid alias="C96_t061" not_compset="_POP" >
+    <model_grid alias="C96_t025" not_compset="_POP" >
       <grid name="atm">C96</grid>
       <grid name="lnd">C96</grid>
-      <grid name="ocnice">tx0.66v1</grid>
-      <mask>tx0.66v1</mask>
+      <grid name="ocnice">tx0.25v1</grid>
+      <mask>tx0.25v1</mask>
     </model_grid>
 
     <!-- The following grid is only used for ADWAV testing -->
@@ -1400,7 +1407,9 @@
       <support>EXPERIMENTAL FVM physics grid</support>
     </domain>
 
+    <!-- ======================================================== -->
     <!-- OCN/ICE domains -->
+    <!-- ======================================================== -->
 
     <domain name="gx1v6">
       <nx>320</nx>  <ny>384</ny>
@@ -1433,6 +1442,14 @@
       <support>Experimental for MOM6 experiments</support>
     </domain>
 
+    <domain name="tx0.25v1">
+      <nx>1440</nx> <ny>1080</ny>
+      <file grid="ocnice">$DIN_LOC_ROOT/share/domains/domain.ocn.tx0.25v1.190207.nc</file>
+      <mesh driver="nuopc">$DIN_LOC_ROOT/share/meshes/tx0.25v1_190204_ESMFmesh.nc</mesh>
+      <desc>tx0.25v1 is tripole v1 0.25-deg MOM6 grid:</desc>
+      <support>Experimental for MOM6 experiments</support>
+    </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>
@@ -1461,7 +1478,9 @@
       <support>Experimental, under development</support>
     </domain>
 
+    <!-- ======================================================== -->
     <!-- ROF domains -->
+    <!-- ======================================================== -->
 
     <domain name="rx1">
       <nx>360</nx> <ny>180</ny>
@@ -1554,8 +1573,8 @@
     <required_gridmap grid1="ocn_grid" grid2="wav_grid">OCN2WAV_SMAPNAME</required_gridmap>
     <required_gridmap grid1="ocn_grid" grid2="wav_grid">ICE2WAV_SMAPNAME</required_gridmap> <!-- ??? -->
     <!-- <required_gridmap grid1="ocn_grid" grid2="rof_grid" not_compset="_POP">ROF2OCN_FMAPNAME</required_gridmap> ?? -->
-    <required_gridmap grid1="ocn_grid" grid2="rof_grid" >ROF2OCN_LIQ_RMAPNAME</required_gridmap>
-    <required_gridmap grid1="ocn_grid" grid2="rof_grid" >ROF2OCN_ICE_RMAPNAME</required_gridmap>
+    <required_gridmap grid1="ocn_grid" grid2="rof_grid">ROF2OCN_LIQ_RMAPNAME</required_gridmap>
+    <required_gridmap grid1="ocn_grid" grid2="rof_grid">ROF2OCN_ICE_RMAPNAME</required_gridmap>
     <required_gridmap grid1="lnd_grid" grid2="rof_grid">LND2ROF_FMAPNAME</required_gridmap>
     <required_gridmap grid1="lnd_grid" grid2="rof_grid">ROF2LND_FMAPNAME</required_gridmap>
   </required_gridmaps>

diff --git a/config/cesm/config_grids_common.xml b/config/cesm/config_grids_common.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0"?>
 
   <gridmaps>
+
     <!-- ======================================================== -->
     <!--- river to land and land to river mapping files    -->
     <!-- ======================================================== -->
@@ -459,7 +460,6 @@
       <map name="GLC2OCN_LIQ_RMAPNAME">cpl/gridmaps/gland4km/map_gland4km_to_gx3v7_nnsm_e1000r500_180502.nc</map>
       <map name="GLC2OCN_ICE_RMAPNAME">cpl/gridmaps/gland4km/map_gland4km_to_gx3v7_nnsm_e1000r500_180502.nc</map>
     </gridmap>
-
     <gridmap ocn_grid="gx1v6" glc_grid="gland5UM" >
       <map name="GLC2OCN_LIQ_RMAPNAME">cpl/gridmaps/gland5km/map_gland5km_to_gx1v6_nn_open_ocean_nnsm_e1000r300_marginal_sea_171105.nc</map>
       <map name="GLC2OCN_ICE_RMAPNAME">cpl/gridmaps/gland5km/map_gland5km_to_gx1v6_nnsm_e1000r300_171105.nc</map>
@@ -490,4 +490,26 @@
       <map name="GLC2OCN_ICE_RMAPNAME">cpl/gridmaps/gland20km/map_gland20km_to_gx3v7_nnsm_e1000r500_180502.nc</map>
     </gridmap>
 
+    <!-- ======================================================== -->
+    <!-- wav->ocn, ocn->wav, ice->wav -->
+    <!-- ======================================================== -->
+
+    <gridmap ocn_grid="gx3v7" wav_grid="ww3a">
+      <map name="WAV2OCN_SMAPNAME">cpl/gridmaps/ww3a/map_ww3a_TO_gx3v7_splice_150428.nc</map>
+      <map name="OCN2WAV_SMAPNAME">cpl/gridmaps/gx3v7/map_gx3v7_TO_ww3a_splice_150428.nc</map>
+      <map name="ICE2WAV_SMAPNAME">cpl/gridmaps/gx3v7/map_gx3v7_TO_ww3a_splice_150428.nc</map>
+    </gridmap>
+
+    <gridmap ocn_grid="gx1v6" wav_grid="ww3a">
+      <map name="WAV2OCN_SMAPNAME">cpl/gridmaps/ww3a/map_ww3a_TO_gx1v6_splice_150428.nc</map>
+      <map name="OCN2WAV_SMAPNAME">cpl/gridmaps/gx1v6/map_gx1v6_TO_ww3a_splice_150428.nc</map>
+      <map name="ICE2WAV_SMAPNAME">cpl/gridmaps/gx1v6/map_gx1v6_TO_ww3a_splice_150428.nc</map>
+    </gridmap>
+
+    <gridmap ocn_grid="gx1v7" wav_grid="ww3a">
+      <map name="WAV2OCN_SMAPNAME">cpl/gridmaps/ww3a/map_ww3a_TO_gx1v7_splice_170214.nc</map>
+      <map name="OCN2WAV_SMAPNAME">cpl/gridmaps/gx1v7/map_gx1v7_TO_ww3a_splice_170214.nc</map>
+      <map name="ICE2WAV_SMAPNAME">cpl/gridmaps/gx1v7/map_gx1v7_TO_ww3a_splice_170214.nc</map>
+    </gridmap>
+
   </gridmaps>
diff --git a/config/cesm/config_grids_mct.xml b/config/cesm/config_grids_mct.xml
@@ -75,13 +75,15 @@
       <map name="OCN2ATM_FMAPNAME">cpl/gridmaps/gx1v6/map_gx1v6_TO_fv1.9x2.5_aave.130322.nc</map>
       <map name="OCN2ATM_SMAPNAME">cpl/gridmaps/gx1v6/map_gx1v6_TO_fv1.9x2.5_aave.130322.nc</map>
     </gridmap>
+
     <gridmap atm_grid="1.9x2.5" ocn_grid="gx1v7">
       <map name="ATM2OCN_FMAPNAME">cpl/gridmaps/fv1.9x2.5/map_fv1.9x2.5_TO_gx1v7_aave.181205.nc</map>
       <map name="ATM2OCN_SMAPNAME">cpl/gridmaps/fv1.9x2.5/map_fv1.9x2.5_TO_gx1v7_blin.181205.nc</map>
       <map name="ATM2OCN_VMAPNAME">cpl/gridmaps/fv1.9x2.5/map_fv1.9x2.5_TO_gx1v7_patc.181205.nc</map>
       <map name="OCN2ATM_FMAPNAME">cpl/gridmaps/gx1v7/map_gx1v7_TO_fv1.9x2.5_aave.181205.nc</map>
       <map name="OCN2ATM_SMAPNAME">cpl/gridmaps/gx1v7/map_gx1v7_TO_fv1.9x2.5_aave.181205.nc</map>
     </gridmap>
+
     <gridmap atm_grid="1.9x2.5" ocn_grid="tx1v1">
       <map name="ATM2OCN_FMAPNAME">cpl/cpl6/map_fv1.9x2.5_to_tx1v1_aave_da_090710.nc</map>
       <map name="ATM2OCN_SMAPNAME">cpl/cpl6/map_fv1.9x2.5_to_tx1v1_bilin_da_090710.nc</map>
@@ -349,24 +351,6 @@
 
     <!--  QL, 150525, wav to ocn, atm, ice mapping files  -->
 
-    <gridmap ocn_grid="gx3v7" wav_grid="ww3a">
-      <map name="WAV2OCN_SMAPNAME">cpl/gridmaps/ww3a/map_ww3a_TO_gx3v7_splice_150428.nc</map>
-      <map name="OCN2WAV_SMAPNAME">cpl/gridmaps/gx3v7/map_gx3v7_TO_ww3a_splice_150428.nc</map>
-      <map name="ICE2WAV_SMAPNAME">cpl/gridmaps/gx3v7/map_gx3v7_TO_ww3a_splice_150428.nc</map>
-    </gridmap>
-
-    <gridmap ocn_grid="gx1v6" wav_grid="ww3a">
-      <map name="WAV2OCN_SMAPNAME">cpl/gridmaps/ww3a/map_ww3a_TO_gx1v6_splice_150428.nc</map>
-      <map name="OCN2WAV_SMAPNAME">cpl/gridmaps/gx1v6/map_gx1v6_TO_ww3a_splice_150428.nc</map>
-      <map name="ICE2WAV_SMAPNAME">cpl/gridmaps/gx1v6/map_gx1v6_TO_ww3a_splice_150428.nc</map>
-    </gridmap>
-
-    <gridmap ocn_grid="gx1v7" wav_grid="ww3a">
-      <map name="WAV2OCN_SMAPNAME">cpl/gridmaps/ww3a/map_ww3a_TO_gx1v7_splice_170214.nc</map>
-      <map name="OCN2WAV_SMAPNAME">cpl/gridmaps/gx1v7/map_gx1v7_TO_ww3a_splice_170214.nc</map>
-      <map name="ICE2WAV_SMAPNAME">cpl/gridmaps/gx1v7/map_gx1v7_TO_ww3a_splice_170214.nc</map>
-    </gridmap>
-
     <gridmap ocn_grid="tx1v1" wav_grid="ww3a">
       <map name="WAV2OCN_SMAPNAME">cpl/gridmaps/ww3a/map_ww3a_TO_tx1v1_blin.170523.nc</map>
       <map name="OCN2WAV_SMAPNAME">cpl/gridmaps/tx1v1/map_tx1v1_TO_ww3a_blin.170523.nc</map>

diff --git a/config/cesm/machines/config_machines.xml b/config/cesm/machines/config_machines.xml
@@ -2309,7 +2309,7 @@ This allows using a different mpirun command to launch unit tests
      </environment_variables>
     <environment_variables comp_interface="nuopc" mpilib="impi">
       <!-- <env name="ESMFMKFILE">/work/02503/edwardsj/stampede2/esmf_8.0.0bs27/lib/libg/Linux.intel.64.intelmpi.default/esmf.mk</env> -->
-      <env name="ESMFMKFILE">/home1/06242/tg855414/ESMF-INSTALL/master/lib/libg/Linux.intel.64.intelmpi.default/esmf.mk</env>
+      <env name="ESMFMKFILE">/work/06242/tg855414/stampede2/ESMF-INSTALL/8.0.0bs28/lib/libO/Linux.intel.64.intelmpi.default/esmf.mk</env>
      </environment_variables>
     <environment_variables comp_interface="nuopc">
       <env name="ESMF_RUNTIME_PROFILE">ON</env>
@@ -2421,7 +2421,7 @@ This allows using a different mpirun command to launch unit tests
         <command name="load">netcdf/4.3.0</command>
         <command name="load">pnetcdf</command>
         <command name="use">/scratch4/NCEPDEV/nems/noscrub/emc.nemspara/soft/modulefiles</command>
-        <command name="load">esmf/8.0.0bs27g</command>
+        <command name="load">esmf/8.0.0bs28g</command>
       </modules>
     </module_system>
     <environment_variables comp_interface="nuopc">

diff --git a/config/e3sm/config_files.xml b/config/e3sm/config_files.xml
@@ -365,6 +365,19 @@
     <schema version="3.0">$CIMEROOT/config/xml_schemas/entry_id_version3.xsd</schema>
   </entry>
 
+  <entry id="CONFIG_IAC_FILE">
+    <type>char</type>
+    <default_value>unset</default_value>
+    <values>
+      <value component="siac">$CIMEROOT/src/components/stub_comps/siac/cime_config/config_component.xml</value>
+    </values>
+    <group>case_last</group>
+    <file>env_case.xml</file>
+    <desc>file containing specification of component specific definitions and values(for documentation only - DO NOT EDIT)</desc>
+    <schema version="2.0">$CIMEROOT/config/xml_schemas/entry_id.xsd</schema>
+    <schema version="3.0">$CIMEROOT/config/xml_schemas/entry_id_version3.xsd</schema>
+  </entry>
+
   <entry id="CONFIG_WAV_FILE">
     <type>char</type>
     <default_value>unset</default_value>

diff --git a/config/e3sm/config_grids.xml b/config/e3sm/config_grids.xml
@@ -45,6 +45,7 @@
       <grid name="wav"    compset="DWAV">ww3a</grid>
       <grid name="wav"    compset="WW3">ww3a</grid>
       <grid name="wav"    compset="XWAV">ww3a</grid>
+      <grid name="iac"    compset="SIAC">null</grid>
     </model_grid_defaults>
 
     <model_grid alias="g16_g16" compset="DATM.+DROF">

diff --git a/config/e3sm/tests.py b/config/e3sm/tests.py
@@ -41,6 +41,7 @@
             "SMS_Ln9.ne4_ne4.FC5AV1C-L.cam-outfrq9s",
             "SMS.ne4_ne4.FC5AV1C-L.cam-cosplite",
             "SMS_R_Ld5.T42_T42.FSCM5A97",
+            "SMS_R_Ld5.ne4_ne4.FSCM5A97",
             "SMS_D_Ln5.ne4_ne4.FC5AV1C-L",
             )
         },

diff --git a/config/xml_schemas/entry_id_base_version3.xsd b/config/xml_schemas/entry_id_base_version3.xsd
@@ -40,7 +40,7 @@
       <xs:attribute name="ice" type="xs:string"/>
       <xs:attribute name="rof" type="xs:string"/>
       <xs:attribute name="lnd" type="xs:string"/>
-
+      <xs:attribute name="iac" type="xs:string"/>
       <xs:attribute name="esp" type="xs:string"/>
       <xs:attribute name="forcing" type="xs:string"/>
       <xs:attribute name="option" type="xs:string"/>

diff --git a/doc/source/index.rst b/doc/source/index.rst
@@ -14,7 +14,7 @@ and libraries.
 Table of contents
 -----------------
 .. toctree::
-   :maxdepth: 3
+   :maxdepth: 2
 
    what_cime/index.rst
    users_guide/index.rst

diff --git a/doc/source/users_guide/creating-new-compsets.rst b/doc/source/users_guide/creating-new-compsets.rst