cam6_4_055: Add QPLT and QPMT compsets, plus misc.

bld/namelist_files/namelist_defaults_cam.xml

@@ -264,8 +264,6 @@
 <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/cam6_QPC6_aqua_ne3pg3_mg37_L58_01-01-31_c221214.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>

bld/namelist_files/use_cases/aquaplanet_cam7.xml

@@ -0,0 +1,63 @@
+<?xml version="1.0"?>
+
+<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>
+<ncdata hgrid="ne3np4"   nlev="93" >atm/cam/inic/se/QPMT_L93_ne3pg3_c241223.nc</ncdata>
+<ncdata hgrid="ne30np4"  nlev="93" >atm/cam/inic/se/QPMT_L93_ne30pg3_c241223.nc</ncdata>
+
+<!-- make planet orbit circular              -->
+<orb_eccen                >0.</orb_eccen>
+<orb_obliq                >0.</orb_obliq>
+<orb_mvelp                >0.</orb_mvelp>
+<orb_mode>fixed_parameters</orb_mode>
+
+<!-- turn off volcanos   -->
+<prescribed_strataero_feedback> false </prescribed_strataero_feedback>
+
+<!-- APE ghg -->
+<ch4vmr                   >1.650e-6</ch4vmr>
+<n2ovmr                   >0.306e-6</n2ovmr>
+<co2vmr                   >348.0e-6</co2vmr>
+<f11vmr                   >0.0     </f11vmr>
+<f12vmr                   >0.0     </f12vmr>
+
+<!-- Solar insolation of 1365 -->
+<solar_irrad_data_file    >atm/cam/solar/ape_solar_ave_tsi_1365.nc</solar_irrad_data_file>
+
+<!-- zonally symmetric ozone file -->
+<prescribed_ozone_file model_top="lt">apeozone_cam3_5_54.nc</prescribed_ozone_file>
+<prescribed_ozone_file model_top="mt">aquaplanet_ozone_hightop_c20180412.nc</prescribed_ozone_file>
+<prescribed_ozone_datapath>atm/cam/ozone</prescribed_ozone_datapath>
+<prescribed_ozone_name    >OZONE</prescribed_ozone_name>
+<prescribed_ozone_type    >CYCLICAL</prescribed_ozone_type>
+<prescribed_ozone_cycle_yr>1990</prescribed_ozone_cycle_yr>
+
+<!-- Revised physics constants for ape experiments -->
+<sday                     >86164.10063718943</sday>
+<rearth                   >6.37100e6</rearth>
+<gravit                   >9.79764</gravit>
+<mwdry                    >28.96623324623746</mwdry>
+<mwh2o                    >18.01618112892741</mwh2o>
+<cpwv                     >1.846e3</cpwv>
+
+<use_topo_file            >.false.</use_topo_file>
+
+<micro_mg_nccons          >.true. </micro_mg_nccons>
+<micro_mg_nicons          >.true. </micro_mg_nicons>
+<ext_frc_specifier        > ""    </ext_frc_specifier>
+<srf_emis_specifier       > ""    </srf_emis_specifier>
+<tracer_cnst_specifier    > ""    </tracer_cnst_specifier>
+<prescribed_aero_file     > ""    </prescribed_aero_file>
+<prescribed_aero_specifier> ""    </prescribed_aero_specifier>
+
+<seasalt_emis_scale       > 0.0   </seasalt_emis_scale>
+
+<!-- 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>
+
+</namelist_defaults>

cime_config/config_component.xml

@@ -204,6 +204,7 @@
       <!-- Aquaplanet -->
       <value compset="_DOCN%SOMAQP">-aquaplanet</value>
       <value compset="_DOCN%AQP"   >-aquaplanet</value>
+      <value compset="_CAM70.*_SLND_SICE_DOCN%AQP" >-chem none</value>
 
       <!-- PORT -->
       <value compset="%PORT">-offline_drv rad</value>
@@ -255,6 +256,7 @@
       <value compset="2000_CAM60_SLND_SICE_DOCN%SOMAQP">aquaplanet_cam6</value>
       <value compset="2000_CAM60_SLND_SICE_DOCN%AQP"   >aquaplanet_cam6</value>
       <value compset="2000_CAM60_SLND_SICE_DOCN%AQPCONST" >aquaplanet_rce_cam6</value>
+      <value compset="2000_CAM70.*_SLND_SICE_DOCN%AQP" >aquaplanet_cam7</value>
       <value compset="2000_CAM\d0%WC.*_SLND_SICE_DOCN%AQP">aquaplanet_waccm_2000</value>
 
       <value compset="2010_CAM60"        >2010_cam6</value>

cime_config/config_compsets.xml

@@ -291,6 +291,16 @@
     <science_support grid="f19_f19_mg17"/>
   </compset>
 
+  <compset>
+    <alias>QPLT</alias>
+    <lname>2000_CAM70%LT_SLND_SICE_DOCN%AQP3_SROF_SGLC_SWAV</lname>
+  </compset>
+
+  <compset>
+    <alias>QPMT</alias>
+    <lname>2000_CAM70%MT_SLND_SICE_DOCN%AQP3_SROF_SGLC_SWAV</lname>
+  </compset>
+
   <compset>
     <alias>QPC2000climo</alias>
     <lname>2000_CAM60%CT1S_SLND_SICE_DOCN%AQP3_SROF_SGLC_SWAV</lname>

cime_config/testdefs/testlist_cam.xml

@@ -49,7 +49,7 @@
       <machine name="derecho" compiler="intel" category="prealpha"/>
     </machines>
     <options>
-      <option name="wallclock">00:10:00</option>
+      <option name="wallclock">00:20:00</option>
     </options>
   </test>
 
@@ -59,7 +59,7 @@
       <machine name="derecho" compiler="intel" category="prealpha"/>
     </machines>
     <options>
-      <option name="wallclock">00:10:00</option>
+      <option name="wallclock">00:20:00</option>
     </options>
   </test>
 
@@ -161,7 +161,6 @@
     <machines>
       <machine name="derecho" compiler="intel" category="aux_cime_baselines"/>
       <machine name="derecho" compiler="intel" category="prealpha"/>
-      <machine name="derecho" compiler="intel" category="aux_cam"/>
     </machines>
     <options>
       <option name="wallclock">00:10:00</option>
@@ -191,13 +190,40 @@
       <option name="wallclock">00:10:00</option>
     </options>
   </test>
-  <test compset="QPC6" grid="ne3pg3_ne3pg3_mg37" name="ERP_D_Ln9" testmods="cam/outfrq9s_rrtmgp">
+  <test compset="QPLT" grid="ne3pg3_ne3pg3_mg37" name="ERP_D_Ln9" testmods="cam/outfrq9s">
     <machines>
       <machine name="izumi" compiler="gnu" category="aux_cam"/>
     </machines>
     <options>
       <option name="wallclock">00:10:00</option>
-      <option name="comment" >CAM6 aquaplanet w/ RRTMGP</option>
+      <option name="comment" >CAM7-LT aquaplanet</option>
+    </options>
+  </test>
+  <test compset="QPLT" grid="ne30pg3_ne30pg3_mg17" name="ERP_D_Ln9" testmods="cam/outfrq3s_cosp">
+    <machines>
+      <machine name="derecho" compiler="intel" category="aux_cam"/>
+    </machines>
+    <options>
+      <option name="wallclock">00:10:00</option>
+      <option name="comment" >CAM7-LT aquaplanet w/ COSP</option>
+    </options>
+  </test>
+  <test compset="QPMT" grid="ne3pg3_ne3pg3_mg37" name="ERP_D_Ln9" testmods="cam/outfrq9s">
+    <machines>
+      <machine name="izumi" compiler="gnu" category="aux_cam"/>
+    </machines>
+    <options>
+      <option name="wallclock">00:20:00</option>
+      <option name="comment" >CAM7-MT aquaplanet</option>
+    </options>
+  </test>
+  <test compset="QPMT" grid="ne30pg3_ne30pg3_mg17" name="ERP_D_Ln9" testmods="cam/outfrq9s">
+    <machines>
+      <machine name="derecho" compiler="intel" category="aux_cam"/>
+    </machines>
+    <options>
+      <option name="wallclock">00:20:00</option>
+      <option name="comment" >CAM7-MT aquaplanet</option>
     </options>
   </test>
   <test compset="QPRCEMIP" grid="ne30_ne30_mg17" name="ERP_Ln9" testmods="cam/outfrq9s">
@@ -2021,15 +2047,7 @@
       <machine name="izumi" compiler="nag" category="aux_cam"/>
     </machines>
   </test>
-  <!--  DART -->
-  <test compset="FHS94" grid="f45_f45_mg37" name="DAE" testmods="cam/dae">
-    <machines>
-      <machine name="izumi" compiler="nag" category="aux_cam"/>
-    </machines>
-    <options>
-      <option name="wallclock"> 00:20:00 </option>
-    </options>
-  </test>
+
 <!-- SPCAM testing -->
   <test compset="FSPCAMS" grid="C48_C48_mg17" name="ERS_Ln9" testmods="cam/outfrq9s">
     <machines>

cime_config/testdefs/testmods_dirs/cam/outfrq3s_cosp/shell_commands

@@ -1,8 +1,7 @@
 CAM_CONFIG_OPTS=`./xmlquery CAM_CONFIG_OPTS --value`
 if [[ $CAM_CONFIG_OPTS != *"-cosp"* ]]; then
-  ./xmlchange -append CAM_CONFIG_OPTS="-cosp"
+  ./xmlchange --append CAM_CONFIG_OPTS="-cosp"
 fi
 ./xmlchange ROF_NCPL=\$ATM_NCPL
 ./xmlchange GLC_NCPL=\$ATM_NCPL
-./xmlchange CAM_NML_USE_CASE=UNSET
 ./xmlchange RUN_STARTDATE="19950101"

cime_config/testdefs/testmods_dirs/cam/outfrq3s_cosp/user_nl_cam

@@ -2,4 +2,5 @@ mfilt=1,1,1,1,1,1
 ndens=1,1,1,1,1,1
 nhtfrq=3,3,3,3,3,3
 inithist='ENDOFRUN'
-fexcl1='CFAD_DBZE94_CS','CLDTOT_CALCS','CLD_CAL_NOTCS','CS_MIXCERT','CS_MIXPOSS','CS_NOPRECIP','CS_PIA','CS_RAINPOSS','CS_RAINPROB'
+fexcl1='CFAD_DBZE94_CS','CLDTOT_CALCS','CLD_CAL_NOTCS','CS_MIXCERT','CS_MIXPOSS','CS_NOPRECIP','CS_PIA',
+       'CS_RAINPOSS','CS_RAINPROB','CS_SNOWCERT','CS_SNOWPOSS'

doc/ChangeLog

@@ -1,4 +1,171 @@
 ===============================================================
+
+Tag name:
+Originator(s): eaton
+Date:
+One-line Summary: Add QPLT and QPMT compsets, plus misc.
+Github PR URL: https://github.com/ESCOMP/CAM/pull/1203
+
+Purpose of changes (include the issue number and title text for each relevant GitHub issue):
+
+Issue #814 - Introduce QPC7 and possibly QPS7 aquaplanet compsets
+  - Analogous to FLT and FMT compset names, create QPLT and QPMT compsets.
+  - Open new issue to address QPS7.
+  - The new aquaplanet configurations use '-chem none' to eliminate the
+    aerosols.  This is much faster and requires much less memory than a
+    configuration that leaves the default chemistry in place and removes
+    aerosols by zeroing the initial concentrations and emission sources.
+
+Issue #1159 - Prealpha tests exceeding wallclock
+  - increased time limit to 20 minutes for these prealpha tests:
+    ERP_Ln9.f09_f09_mg17.FHIST_BGC.derecho_intel.cam-outfrq9s
+    ERP_Ln9.f09_f09_mg17.FHIST.derecho_intel.cam-outfrq9s
+
+Issue #670 - DAE test broken
+  - ChangeLog indicates that this test has never worked since it was added
+    in cam6_2_046 (2020-09-01).  Test removed.
+
+Issue #807 - add UT and UQ to cam_diagnostics
+  - Add UT and UQ.  Note that other possible fields mentioned in the issue,
+    i.e., OMEGA2, OMEGAQ, OMEGAU, and OMEGAV, are already implemented.
+    OMEGA2 is called OMGAOMGA.
+
+Describe any changes made to build system: none
+
+Describe any changes made to the namelist: none
+
+List any changes to the defaults for the boundary datasets:
+. add spun up initial files for QPLT compset on ne3pg3 and ne30pg3 grids.
+  atm/cam/inic/se/QPLT_L58_ne3pg3_c241127.nc
+  atm/cam/inic/se/QPLT_L58_ne30pg3_c241127.nc
+
+. add spun up initial files for QPMT compset on ne3pg3 and ne30pg3 grids.
+  atm/cam/inic/se/QPMT_L93_ne3pg3_c241223.nc
+  atm/cam/inic/se/QPMT_L93_ne30pg3_c241223.nc
+
+. add ozone dataset for high top aquaplanet runs
+  atm/cam/ozone/aquaplanet_ozone_hightop_c20180412.nc
+
+Describe any substantial timing or memory changes: n/a
+
+Code reviewed by:
+
+List all files eliminated:
+
+cime_config/testdefs/testmods_dirs/cam/dae/shell_commands
+cime_config/testdefs/testmods_dirs/cam/dae/user_nl_cam
+cime_config/testdefs/testmods_dirs/cam/dae/user_nl_cpl
+test/system/da_cam_no_data_mod.sh
+. DAE test removed
+
+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
+. 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:
+  - set f11vmr=f12vmr=0 to override the non-zero default values from
+    namelist_defaults_cam.xml.
+  - set prescribed_aero_file="" and prescribed_aero_specifier="" to
+    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.
+  - Add ozone dataset for high top aquaplanet configuration
+
+cime_config/config_component.xml
+. CAM_CONFIG_OPTS
+  - add match for _CAM70.*_SLND_SICE_DOCN%AQP to set '-chem none'
+. CAM_NML_USE_CASE
+  - add match for 2000_CAM70.*_SLND_SICE_DOCN%AQP to use aquaplanet_cam7.
+    This match will work for both %LT and %MT configs.
+
+cime_config/config_compsets.xml
+. add QPLT = 2000_CAM70%LT_SLND_SICE_DOCN%AQP3_SROF_SGLC_SWAV
+. add QPMT = 2000_CAM70%MT_SLND_SICE_DOCN%AQP3_SROF_SGLC_SWAV
+
+cime_config/testdefs/testlist_cam.xml
+. increase time limit to 20 minutes for these prealpha tests:
+  ERP_Ln9.f09_f09_mg17.FHIST_BGC.derecho_intel.cam-outfrq9s
+  ERP_Ln9.f09_f09_mg17.FHIST.derecho_intel.cam-outfrq9s
+. 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-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
+
+cime_config/testdefs/testmods_dirs/cam/outfrq3s_cosp/shell_commands
+. remove "./xmlchange CAM_NML_USE_CASE=UNSET"
+
+cime_config/testdefs/testmods_dirs/cam/outfrq3s_cosp/user_nl_cam
+. add CS_SNOWCERT and CS_SNOWPOSS to fexcl1
+
+src/chemistry/mozart/mo_drydep.F90
+. get_landuse_and_soilw_from_file
+  - restrict the INFO messages to only print from masterproc
+
+src/physics/cam/cam_diagnostics.F90
+. diag_init_dry
+  - add addfld call for UT, and corresponding add_default for UT inside the
+    history_eddy conditional.
+. diag_phys_writeout_dry
+  - add calculation and outfld call for UT
+. diag_init_moist
+  - add addfld call for UQ, and corresponding add_default for UQ inside the
+    history_eddy conditional.
+. diag_phys_writeout_moist
+  - add calculation and outfld call for UQ
+
+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
+    aerosols.
+
+src/physics/cam/vertical_diffusion.F90
+. vertical_diffusion_init
+  - fix conditional around add_default call for UFLX and VFLX so those
+    fields aren't added if they're not computed.
+
+src/physics/cam7/physpkg.F90
+. tphysbc
+  - add conditionals so modal aerosol calculations only called when modal
+    aerosols are present.
+
+If there were any failures reported from running test_driver.sh on any test
+platform, and checkin with these failures has been OK'd by the gatekeeper,
+then copy the lines from the td.*.status files for the failed tests to the
+appropriate machine below.  All failed tests must be justified.
+
+derecho/intel/aux_cam:
+
+derecho/nvhpc/aux_cam:
+
+izumi/nag/aux_cam:
+
+izumi/gnu/aux_cam:
+
+CAM tag used for the baseline comparison tests if different than previous
+tag:
+
+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.
+
+===============================================================
+===============================================================
 Tag name: cam6_4_050
 Originator(s): jimmielin
 Date: 31 Dec 2024