mods to namelist defaults and testlist

bld/namelist_files/namelist_defaults_cam.xml

@@ -264,12 +264,9 @@
 <ncdata dyn="se" hgrid="ne120np4" nlev="30"  aquaplanet="1" ic_ymd="101" >atm/cam/inic/se/ape_cam5_ne120np4_L30_c170419.nc</ncdata>
 
 <ncdata dyn="se" hgrid="ne3np4"   nlev="32"  aquaplanet="1" ic_ymd="101" >atm/cam/inic/se/cam6_QPC6_aqua_ne3pg3_mg37_L32_01-01-31_c221214.nc</ncdata>
-<ncdata dyn="se" hgrid="ne3np4"   nlev="58"  aquaplanet="1" ic_ymd="101" >atm/cam/inic/se/QPLT_L58_ne3pg3_c241127.nc</ncdata>
-<ncdata dyn="se" hgrid="ne3np4"   nlev="93"  aquaplanet="1" ic_ymd="101" >atm/cam/inic/se/cam6_QPC6_aqua_ne3pg3_mg37_L93_01_02_01_c240518.nc</ncdata>
 <ncdata dyn="se" hgrid="ne5np4"   nlev="32"  aquaplanet="1" ic_ymd="101" >atm/cam/inic/se/ape_cam6_ne5np4_L32_c170517.nc</ncdata>
 <ncdata dyn="se" hgrid="ne16np4"  nlev="32"  aquaplanet="1" ic_ymd="101" >atm/cam/inic/se/ape_cam6_ne16np4_L32_c170509.nc</ncdata>
 <ncdata dyn="se" hgrid="ne30np4"  nlev="32"  aquaplanet="1" ic_ymd="101" >atm/cam/inic/se/ape_cam6_ne30np4_L32_c170509.nc</ncdata>
-<ncdata dyn="se" hgrid="ne30np4"  nlev="58"  aquaplanet="1" ic_ymd="101" >atm/cam/inic/se/QPLT_L58_ne30pg3_c241127.nc</ncdata>
 <ncdata dyn="se" hgrid="ne120np4"  nlev="32"  aquaplanet="1" ic_ymd="101" >atm/cam/inic/se/ape_cam6_ne120np4_L32_c170908.nc</ncdata>
 <ncdata dyn="se" hgrid="ne240np4"  nlev="32"  aquaplanet="1" ic_ymd="101" >atm/cam/inic/se/ape_cam6_ne240np4_L32_c170908.nc</ncdata>
 

cime_config/testdefs/testlist_cam.xml

@@ -1778,15 +1778,6 @@
       <option name="wallclock">00:20:00</option>
     </options>
   </test>
-  <test compset="FLTHIST" grid="ne30pg3_ne30pg3_mg17" name="SMS_Ln9" testmods="cam/outfrq9s_eoy">
-    <machines>
-      <machine name="derecho" compiler="intel" category="aux_cam"/>
-    </machines>
-    <options>
-      <option name="wallclock">00:20:00</option>
-      <option name="comment">CAM7-LT run over year end boundary</option>
-    </options>
-  </test>
   <test compset="FLTHIST" grid="ne30pg3_ne30pg3_mg17" name="SMS_D_Ln9" testmods="cam/outfrq9s">
     <machines>
       <machine name="derecho" compiler="intel" category="prealpha"/>

doc/ChangeLog

@@ -63,9 +63,8 @@ List all files added and what they do: none
 List all existing files that have been modified, and describe the changes:
 
 bld/namelist_files/namelist_defaults_cam.xml
-. replace current entry for ne3np4 L58 aquaplanet with
-  QPLT_L58_ne3pg3_c241127.nc.
-. add new file for ne30np4 L58 aquaplanet.
+. Remove ncdata files for nlev=58 and nlev=93 aquaplanet.  Those files are
+  specified in the aquaplanet_cam7.xml use case file.
 
 bld/namelist_files/use_cases/aquaplanet_cam7.xml
 . use case file for QPLT and QPMT.  Same as for QPC6 except:
@@ -98,7 +97,7 @@ cime_config/testdefs/testlist_cam.xml
 . remove non-working DAE test
 . replace ERP_D_Ln9.f19_f19_mg17.QPC6.derecho_intel.cam-outfrq9s
   by ERP_D_Ln9.ne30pg3_ne30pg3_mg17.QPLT.derecho_intel.cam-outfrq3s_cosp
-. Add ERP_D_Ln9.ne30pg3_ne30pg3_mg17.QPMT.derecho_intel.cam-outfrq3s
+. Add ERP_D_Ln9.ne30pg3_ne30pg3_mg17.QPMT.derecho_intel.cam-outfrq9s
 . replace ERP_D_Ln9.ne3pg3_ne3pg3_mg37.QPC6.izumi_gnu.cam-outfrq9s_rrtmgp
   by      ERP_D_Ln9.ne3pg3_ne3pg3_mg37.QPLT.izumi_gnu.cam-outfrq9s
 . Add ERP_D_Ln9.ne3pg3_ne3pg3_mg37.QPMT.izumi_gnu.cam-outfrq9s
@@ -161,7 +160,9 @@ izumi/gnu/aux_cam:
 CAM tag used for the baseline comparison tests if different than previous
 tag:
 
-Summarize any changes to answers:
+Summarize any changes to answers: BFB.  Note however that a change in the
+ testmod definition for outfrq3s_cosp causes answer changes for tests
+ using that testmod.
 
 ===============================================================
 ===============================================================