fixes for QPLT tests

bld/namelist_files/namelist_defaults_cam.xml

@@ -264,12 +264,12 @@
 <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"              >atm/cam/inic/se/QPLT_L58_ne3pg3_c241127.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"              >atm/cam/inic/se/QPLT_L58_ne30pg3_c241127.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>
 

bld/namelist_files/use_cases/aquaplanet_cam7.xml

@@ -1,8 +1,11 @@
 <?xml version="1.0"?>
 
-<!-- Do not specify orb_*, co2vmr, ch4 or n2o for aquaplanet runs -->
-
 <namelist_defaults>
+
+<!-- Spun up IC files -->
+<ncdata hgrid="ne3np4"   nlev="58" >atm/cam/inic/se/QPLT_L58_ne3pg3_c241127.nc</ncdata>
+<ncdata hgrid="ne30np4"  nlev="58" >atm/cam/inic/se/QPLT_L58_ne30pg3_c241127.nc</ncdata>
+
 <!-- make planet orbit circular              -->
 <orb_eccen                >0.</orb_eccen>
 <orb_obliq                >0.</orb_obliq>
@@ -49,7 +52,8 @@
 
 <seasalt_emis_scale       > 0.0   </seasalt_emis_scale>
 
-<!-- Just make the GHGs radiatively active.  CFC concentrations are set to zero above -->
+<!-- Just make the GHGs radiatively active (no aerosols).
+     CFC concentrations are set to zero above -->
 <rad_climate> 'A:Q:H2O', 'N:O2:O2', 'N:CO2:CO2', 'N:ozone:O3',
          'N:N2O:N2O', 'N:CH4:CH4', 'N:CFC11:CFC11', 'N:CFC12:CFC12' </rad_climate>
 

doc/ChangeLog

@@ -50,9 +50,7 @@ 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.  Also remove the ic_ymd attribute since
-  aquaplanet does not have an annual cycle and that attribute interferes
-  with starting a run from an arbitrary time.
+  QPLT_L58_ne3pg3_c241127.nc.
 . add new file for ne30np4 L58 aquaplanet.
 
 bld/namelist_files/use_cases/aquaplanet_cam7.xml
@@ -63,6 +61,9 @@ bld/namelist_files/use_cases/aquaplanet_cam7.xml
     override the default bulk aerosol settings from build-namelist.
   - set rad_climate to just make the GHGs radiatively active to override
     the default build-namelist setting which includes bulk aerosols.
+  - Add spun-up IC files.  This allows us to remove the ic_ymd attribute
+    which should not be needed for aquaplanet runs.  Removing ic_ymd
+    enables testing with arbitrary start dates.
 
 cime_config/config_component.xml
 . CAM_CONFIG_OPTS
@@ -89,6 +90,11 @@ src/chemistry/mozart/mo_drydep.F90
 . get_landuse_and_soilw_from_file
   - restrict the INFO messages to only print from masterproc
 
+src/physics/cam/microp_aero.F90
+. microp_aero_run
+  - add condition that number of bulk aerosols must be > 0 before calling
+    ndrop_bam_run.
+
 src/physics/cam/nucleate_ice_cam.F90
 . nucleate_ice_cam_calc
   - add conditionals so naer2 array not referenced when there are no

src/physics/cam/microp_aero.F90

@@ -756,7 +756,7 @@ subroutine microp_aero_run ( &
       do k = top_lev, pver
          do i = 1, ncol
 
-            if (state1%q(i,k,cldliq_idx) >= qsmall) then
+            if (naer_all > 0 .and. state1%q(i,k,cldliq_idx) >= qsmall) then
 
                ! get droplet activation rate