Merge pull request #515 from billsacks/xgrid_default

Make xgrid the default aoflux_grid when atm and ocn are running on different grids

Author: jedwards4b

cime_config/namelist_definition_drv.xml

@@ -925,7 +925,10 @@
       default: ogrid
     </desc>
     <values>
-      <value>ogrid</value>
+      <value>xgrid</value>
+      <!-- xgrid introduces unnecessary cost and complexity if atm & ocn are on the same
+      grid, so fall back to ogrid in that case -->
+      <value samegrid_atm_ocn='true'>ogrid</value>
     </values>
   </entry>
   <entry id="ocn_surface_flux_scheme">

cime_config/testdefs/testlist_drv.xml

@@ -65,6 +65,16 @@
     </options>
   </test>
 
+  <test compset="X" grid="f19_g17" name="ERS_D_Ln9" testmods="drv/aoflux_ogrid">
+    <machines>
+      <machine name="derecho" compiler="intel" category="aux_cmeps"/>
+    </machines>
+    <options>
+      <option name="wallclock"> 00:40:00 </option>
+      <option name="comment">The default aoflux_grid is now xgrid; include a debug test with different atm/ocn grids with aoflux_grid=ogrid to make sure that option continues to work.</option>
+    </options>
+  </test>
+
   <!-- ======================================= -->
   <!-- B compsets -->
   <!-- ======================================= -->

cime_config/testdefs/testmods_dirs/drv/aoflux_ogrid/user_nl_cpl

@@ -0,0 +1 @@
+aoflux_grid = "ogrid"