Merge pull request #330 from billsacks/add_aoflux_tests

Add a debug B compset test with the standard configuration, and tests with aoflux_grid = agrid and ogrid

Author: fischer-ncar

cime_config/testlist_allactive.xml

@@ -208,4 +208,32 @@
       <option name="wallclock"> 03:00:00 </option>
     </options>
   </test>
+
+  <test name="ERS_D_Ld3" grid="ne30pg3_t232" compset="BLT1850" testmods="allactive/defaultio">
+   <machines>
+     <machine name="derecho" compiler="intel" category="prealpha"/>
+   </machines>
+   <options>
+     <option name="wallclock"> 02:00:00 </option>
+     <option name="comment">Include a debug B compset exact restart test.</option>
+   </options>
+ </test>
+ <test name="SMS_D_Ld1" grid="ne30pg3_t232" compset="BLT1850" testmods="allactive/aoflux_ogrid">
+   <machines>
+     <machine name="derecho" compiler="intel" category="prebeta"/>
+   </machines>
+   <options>
+     <option name="wallclock"> 00:30:00 </option>
+     <option name="comment">Include a short debug test using the ocn grid for aoflux calculations rather than the default xgrid.</option>
+   </options>
+ </test>
+ <test name="SMS_D_Ld1" grid="ne30pg3_t232" compset="BLT1850" testmods="allactive/aoflux_agrid">
+   <machines>
+     <machine name="derecho" compiler="intel" category="prebeta"/>
+   </machines>
+   <options>
+     <option name="wallclock"> 00:30:00 </option>
+     <option name="comment">Include a short debug test using the atm grid for aoflux calculations rather than the default xgrid.</option>
+   </options>
+ </test>
 </testlist>

cime_config/testmods_dirs/allactive/aoflux_agrid/include_user_mods

@@ -0,0 +1 @@
+../defaultio

cime_config/testmods_dirs/allactive/aoflux_agrid/user_nl_cpl

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

cime_config/testmods_dirs/allactive/aoflux_ogrid/include_user_mods

@@ -0,0 +1 @@
+../defaultio

cime_config/testmods_dirs/allactive/aoflux_ogrid/user_nl_cpl

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