testing fixes

Author: brian-eaton

cime_config/testdefs/testlist_cam.xml

@@ -108,7 +108,7 @@
     </options>
   </test>
 
-  <test compset="FHIST" grid="f09_f09_mt232" name="ERI_D_Ln9" testmods="cam/outfrq3s_eri">
+  <test compset="FHIST" grid="f09_f09_mt232" name="ERI_D_Ln18" testmods="cam/outfrq3s_eri">
     <machines>
       <machine name="derecho" compiler="intel" category="aux_cam"/>
     </machines>
@@ -1095,16 +1095,6 @@
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
-<!--              360                        -->
-  <test compset="QPC5HIST" grid="f19_f19_mg17" name="SMS_D_Ld2" testmods="cam/volc_usecase">
-    <machines>
-      <machine name="derecho" compiler="intel" category="aux_cam"/>
-    </machines>
-    <options>
-      <option name="comment" >360 tsm</option>
-      <option name="wallclock">00:30:00</option>
-    </options>
-  </test>
 <!--              370                        -->
   <test compset="QPC2000climo" grid="f19_f19_mg17" name="SMS_D_Ln9" testmods="cam/outfrq3s_usecase">
     <machines>
@@ -1161,16 +1151,6 @@
       <option name="wallclock">01:00:00</option>
     </options>
   </test>
-<!--              735                        -->
-  <test compset="QPC5HIST" grid="ne16_ne16_mg17" name="ERC_D_Ln9" testmods="cam/outfrq3s_usecase">
-    <machines>
-      <machine name="derecho" compiler="intel" category="aux_cam"/>
-    </machines>
-    <options>
-      <option name="comment" >735 tsm, ter</option>
-      <option name="wallclock">00:30:00</option>
-    </options>
-  </test>
 
   <test compset="QPC5" grid="ne3_ne3_mg37" name="SCT_D_Ln7" testmods="cam/scm_prep">
     <machines>

doc/ChangeLog

@@ -8,25 +8,27 @@ Github PR URL:
 
 Purpose of changes (include the issue number and title text for each relevant GitHub issue):
 
-. Add ERI tests (branch and hybrid runs) for cam5, cam6, and cam7 F
-  compsets.  Previously only aquaplanet configurations tested. 
+. Add ERI tests (branch and hybrid runs) for cam5, cam6, and cam7
+  F-compsets.  Previously only aquaplanet configurations tested. 
 
 . Add testing of interpolated output for FHISTC_LTso.  Move COSP output to
   a separate history file that uses the native SE grid.  The COSP output of
   fields with more than 1 mdim to an interpolated lat/lon grid doesn't
-  work.  A check was added to build-namelist to prevent specifiying COSP
-  output on an interpolated history file.
+  work.
+
+. Add check to build-namelist to prevent specifiying COSP output on an
+  interpolated history file.
 
 . Updates to cam5 testing: combine several one-off tests into a single test
   and move most QPC5 tests to FHIST_C5.
 
-Describe any changes made to build system:
+Describe any changes made to build system: none
 
-Describe any changes made to the namelist:
+Describe any changes made to the namelist: none
 
-List any changes to the defaults for the boundary datasets:
+List any changes to the defaults for the boundary datasets: none
 
-Describe any substantial timing or memory changes:
+Describe any substantial timing or memory changes: none
 
 Code reviewed by:
 
@@ -94,6 +96,13 @@ cime_config/testdefs/testlist_cam.xml
   by
   SMS_D_Ln9.f19_f19_mt232.FHIST_C5.derecho_intel.cam-mam7
 
+. Combine these tests and move to FHIST_C5.
+  Replace
+  ERC_D_Ln9.ne16_ne16_mg17.QPC5HIST.derecho_intel.cam-outfrq3s_usecase
+  SMS_D_Ld2.f19_f19_mg17.QPC5HIST.derecho_intel.cam-volc_usecase
+  by
+  ERI_D_Ln18.f19_f19_mt232.FHIST_C5.derecho_intel.cam-outfrq3s_eri
+
 . remove
   SMS_D_Ln9.ne5pg3_ne5pg3_mg37.QPC5.izumi_gnu.cam-outfrq3s_ttrac
   ERC_D_Ln9.ne5_ne5_mg37.QPC5.izumi_nag.cam-outfrq3s_ttrac
@@ -136,8 +145,6 @@ cime_config/testdefs/testlist_cam.xml
   PLB_D_Ln9.f10_f10_mt232.FHIST_C5.izumi_gnu.cam-ttrac_loadbal1
   PLB_D_Ln9.f10_f10_mt232.FHIST_C5.izumi_gnu.cam-ttrac_loadbal3
 
-
-
 cime_config/testdefs/testmods_dirs/cam/cosp_rad_diags/user_nl_cam
 . move the cosp output to h1, add cosp aux output to h2
 . interpolate h0 to default lat/lon grid