Merge pull request #1203 from brian-eaton/misc06

cam6_4_055: Add QPLT and QPMT compsets, plus misc.
ESCOMP · Jan 13, 2025 · 7de26a3 · 7de26a3
2 parents 7a90325 + 27f78e8
commit 7de26a3
Show file tree

Hide file tree

Showing 18 changed files with 357 additions and 151 deletions.
diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/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>

diff --git a/bld/namelist_files/use_cases/aquaplanet_cam7.xml b/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>
diff --git a/cime_config/config_component.xml b/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>

diff --git a/cime_config/config_compsets.xml b/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>

diff --git a/cime_config/testdefs/testlist_cam.xml b/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,42 @@
       <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"/>
+      <machine name="derecho" compiler="intel" category="prealpha"/>
+    </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"/>
+      <machine name="derecho" compiler="intel" category="prealpha"/>
+    </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">
@@ -2127,15 +2155,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>

diff --git a/cime_config/testdefs/testmods_dirs/cam/dae/shell_commands b/cime_config/testdefs/testmods_dirs/cam/dae/shell_commands
diff --git a/cime_config/testdefs/testmods_dirs/cam/dae/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/dae/user_nl_cam
diff --git a/cime_config/testdefs/testmods_dirs/cam/dae/user_nl_cpl b/cime_config/testdefs/testmods_dirs/cam/dae/user_nl_cpl
diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq3s_cosp/shell_commands b/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"
diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq3s_cosp/user_nl_cam b/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'