Skip to content

Commit 7de26a3

Browse files
brian-eatonbrian-eaton
authored
Merge pull request ESCOMP#1203 from brian-eaton/misc06
cam6_4_055: Add QPLT and QPMT compsets, plus misc.
2 parents 7a90325 + 27f78e8 commit 7de26a3

File tree

18 files changed

+357
-151
lines changed

18 files changed

+357
-151
lines changed

‎bld/namelist_files/namelist_defaults_cam.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,8 +264,6 @@
264264
<ncdata dyn="se" hgrid="ne120np4" nlev="30" aquaplanet="1" ic_ymd="101" >atm/cam/inic/se/ape_cam5_ne120np4_L30_c170419.nc</ncdata>
265265

266266
<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>
267-
<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>
268-
<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>
269267
<ncdata dyn="se" hgrid="ne5np4" nlev="32" aquaplanet="1" ic_ymd="101" >atm/cam/inic/se/ape_cam6_ne5np4_L32_c170517.nc</ncdata>
270268
<ncdata dyn="se" hgrid="ne16np4" nlev="32" aquaplanet="1" ic_ymd="101" >atm/cam/inic/se/ape_cam6_ne16np4_L32_c170509.nc</ncdata>
271269
<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‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
<?xml version="1.0"?>
2+
3+
<namelist_defaults>
4+
5+
<!-- Spun up IC files -->
6+
<ncdata hgrid="ne3np4" nlev="58" >atm/cam/inic/se/QPLT_L58_ne3pg3_c241127.nc</ncdata>
7+
<ncdata hgrid="ne30np4" nlev="58" >atm/cam/inic/se/QPLT_L58_ne30pg3_c241127.nc</ncdata>
8+
<ncdata hgrid="ne3np4" nlev="93" >atm/cam/inic/se/QPMT_L93_ne3pg3_c241223.nc</ncdata>
9+
<ncdata hgrid="ne30np4" nlev="93" >atm/cam/inic/se/QPMT_L93_ne30pg3_c241223.nc</ncdata>
10+
11+
<!-- make planet orbit circular -->
12+
<orb_eccen >0.</orb_eccen>
13+
<orb_obliq >0.</orb_obliq>
14+
<orb_mvelp >0.</orb_mvelp>
15+
<orb_mode>fixed_parameters</orb_mode>
16+
17+
<!-- turn off volcanos -->
18+
<prescribed_strataero_feedback> false </prescribed_strataero_feedback>
19+
20+
<!-- APE ghg -->
21+
<ch4vmr >1.650e-6</ch4vmr>
22+
<n2ovmr >0.306e-6</n2ovmr>
23+
<co2vmr >348.0e-6</co2vmr>
24+
<f11vmr >0.0 </f11vmr>
25+
<f12vmr >0.0 </f12vmr>
26+
27+
<!-- Solar insolation of 1365 -->
28+
<solar_irrad_data_file >atm/cam/solar/ape_solar_ave_tsi_1365.nc</solar_irrad_data_file>
29+
30+
<!-- zonally symmetric ozone file -->
31+
<prescribed_ozone_file model_top="lt">apeozone_cam3_5_54.nc</prescribed_ozone_file>
32+
<prescribed_ozone_file model_top="mt">aquaplanet_ozone_hightop_c20180412.nc</prescribed_ozone_file>
33+
<prescribed_ozone_datapath>atm/cam/ozone</prescribed_ozone_datapath>
34+
<prescribed_ozone_name >OZONE</prescribed_ozone_name>
35+
<prescribed_ozone_type >CYCLICAL</prescribed_ozone_type>
36+
<prescribed_ozone_cycle_yr>1990</prescribed_ozone_cycle_yr>
37+
38+
<!-- Revised physics constants for ape experiments -->
39+
<sday >86164.10063718943</sday>
40+
<rearth >6.37100e6</rearth>
41+
<gravit >9.79764</gravit>
42+
<mwdry >28.96623324623746</mwdry>
43+
<mwh2o >18.01618112892741</mwh2o>
44+
<cpwv >1.846e3</cpwv>
45+
46+
<use_topo_file >.false.</use_topo_file>
47+
48+
<micro_mg_nccons >.true. </micro_mg_nccons>
49+
<micro_mg_nicons >.true. </micro_mg_nicons>
50+
<ext_frc_specifier > "" </ext_frc_specifier>
51+
<srf_emis_specifier > "" </srf_emis_specifier>
52+
<tracer_cnst_specifier > "" </tracer_cnst_specifier>
53+
<prescribed_aero_file > "" </prescribed_aero_file>
54+
<prescribed_aero_specifier> "" </prescribed_aero_specifier>
55+
56+
<seasalt_emis_scale > 0.0 </seasalt_emis_scale>
57+
58+
<!-- Just make the GHGs radiatively active (no aerosols).
59+
CFC concentrations are set to zero above -->
60+
<rad_climate> 'A:Q:H2O', 'N:O2:O2', 'N:CO2:CO2', 'N:ozone:O3',
61+
'N:N2O:N2O', 'N:CH4:CH4', 'N:CFC11:CFC11', 'N:CFC12:CFC12' </rad_climate>
62+
63+
</namelist_defaults>

‎cime_config/config_component.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@
204204
<!-- Aquaplanet -->
205205
<value compset="_DOCN%SOMAQP">-aquaplanet</value>
206206
<value compset="_DOCN%AQP" >-aquaplanet</value>
207+
<value compset="_CAM70.*_SLND_SICE_DOCN%AQP" >-chem none</value>
207208

208209
<!-- PORT -->
209210
<value compset="%PORT">-offline_drv rad</value>
@@ -255,6 +256,7 @@
255256
<value compset="2000_CAM60_SLND_SICE_DOCN%SOMAQP">aquaplanet_cam6</value>
256257
<value compset="2000_CAM60_SLND_SICE_DOCN%AQP" >aquaplanet_cam6</value>
257258
<value compset="2000_CAM60_SLND_SICE_DOCN%AQPCONST" >aquaplanet_rce_cam6</value>
259+
<value compset="2000_CAM70.*_SLND_SICE_DOCN%AQP" >aquaplanet_cam7</value>
258260
<value compset="2000_CAM\d0%WC.*_SLND_SICE_DOCN%AQP">aquaplanet_waccm_2000</value>
259261

260262
<value compset="2010_CAM60" >2010_cam6</value>

‎cime_config/config_compsets.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,16 @@
291291
<science_support grid="f19_f19_mg17"/>
292292
</compset>
293293

294+
<compset>
295+
<alias>QPLT</alias>
296+
<lname>2000_CAM70%LT_SLND_SICE_DOCN%AQP3_SROF_SGLC_SWAV</lname>
297+
</compset>
298+
299+
<compset>
300+
<alias>QPMT</alias>
301+
<lname>2000_CAM70%MT_SLND_SICE_DOCN%AQP3_SROF_SGLC_SWAV</lname>
302+
</compset>
303+
294304
<compset>
295305
<alias>QPC2000climo</alias>
296306
<lname>2000_CAM60%CT1S_SLND_SICE_DOCN%AQP3_SROF_SGLC_SWAV</lname>

‎cime_config/testdefs/testlist_cam.xml‎

Lines changed: 34 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<machine name="derecho" compiler="intel" category="prealpha"/>
5050
</machines>
5151
<options>
52-
<option name="wallclock">00:10:00</option>
52+
<option name="wallclock">00:20:00</option>
5353
</options>
5454
</test>
5555

@@ -59,7 +59,7 @@
5959
<machine name="derecho" compiler="intel" category="prealpha"/>
6060
</machines>
6161
<options>
62-
<option name="wallclock">00:10:00</option>
62+
<option name="wallclock">00:20:00</option>
6363
</options>
6464
</test>
6565

@@ -161,7 +161,6 @@
161161
<machines>
162162
<machine name="derecho" compiler="intel" category="aux_cime_baselines"/>
163163
<machine name="derecho" compiler="intel" category="prealpha"/>
164-
<machine name="derecho" compiler="intel" category="aux_cam"/>
165164
</machines>
166165
<options>
167166
<option name="wallclock">00:10:00</option>
@@ -191,13 +190,42 @@
191190
<option name="wallclock">00:10:00</option>
192191
</options>
193192
</test>
194-
<test compset="QPC6" grid="ne3pg3_ne3pg3_mg37" name="ERP_D_Ln9" testmods="cam/outfrq9s_rrtmgp">
193+
<test compset="QPLT" grid="ne3pg3_ne3pg3_mg37" name="ERP_D_Ln9" testmods="cam/outfrq9s">
195194
<machines>
196195
<machine name="izumi" compiler="gnu" category="aux_cam"/>
197196
</machines>
198197
<options>
199198
<option name="wallclock">00:10:00</option>
200-
<option name="comment" >CAM6 aquaplanet w/ RRTMGP</option>
199+
<option name="comment" >CAM7-LT aquaplanet</option>
200+
</options>
201+
</test>
202+
<test compset="QPLT" grid="ne30pg3_ne30pg3_mg17" name="ERP_D_Ln9" testmods="cam/outfrq3s_cosp">
203+
<machines>
204+
<machine name="derecho" compiler="intel" category="aux_cam"/>
205+
<machine name="derecho" compiler="intel" category="prealpha"/>
206+
</machines>
207+
<options>
208+
<option name="wallclock">00:10:00</option>
209+
<option name="comment" >CAM7-LT aquaplanet w/ COSP</option>
210+
</options>
211+
</test>
212+
<test compset="QPMT" grid="ne3pg3_ne3pg3_mg37" name="ERP_D_Ln9" testmods="cam/outfrq9s">
213+
<machines>
214+
<machine name="izumi" compiler="gnu" category="aux_cam"/>
215+
</machines>
216+
<options>
217+
<option name="wallclock">00:20:00</option>
218+
<option name="comment" >CAM7-MT aquaplanet</option>
219+
</options>
220+
</test>
221+
<test compset="QPMT" grid="ne30pg3_ne30pg3_mg17" name="ERP_D_Ln9" testmods="cam/outfrq9s">
222+
<machines>
223+
<machine name="derecho" compiler="intel" category="aux_cam"/>
224+
<machine name="derecho" compiler="intel" category="prealpha"/>
225+
</machines>
226+
<options>
227+
<option name="wallclock">00:20:00</option>
228+
<option name="comment" >CAM7-MT aquaplanet</option>
201229
</options>
202230
</test>
203231
<test compset="QPRCEMIP" grid="ne30_ne30_mg17" name="ERP_Ln9" testmods="cam/outfrq9s">
@@ -2127,15 +2155,7 @@
21272155
<machine name="izumi" compiler="nag" category="aux_cam"/>
21282156
</machines>
21292157
</test>
2130-
<!-- DART -->
2131-
<test compset="FHS94" grid="f45_f45_mg37" name="DAE" testmods="cam/dae">
2132-
<machines>
2133-
<machine name="izumi" compiler="nag" category="aux_cam"/>
2134-
</machines>
2135-
<options>
2136-
<option name="wallclock"> 00:20:00 </option>
2137-
</options>
2138-
</test>
2158+
21392159
<!-- SPCAM testing -->
21402160
<test compset="FSPCAMS" grid="C48_C48_mg17" name="ERS_Ln9" testmods="cam/outfrq9s">
21412161
<machines>

‎cime_config/testdefs/testmods_dirs/cam/dae/shell_commands‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎cime_config/testdefs/testmods_dirs/cam/dae/user_nl_cam‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎cime_config/testdefs/testmods_dirs/cam/dae/user_nl_cpl‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎cime_config/testdefs/testmods_dirs/cam/outfrq3s_cosp/shell_commands‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
CAM_CONFIG_OPTS=`./xmlquery CAM_CONFIG_OPTS --value`
22
if [[ $CAM_CONFIG_OPTS != *"-cosp"* ]]; then
3-
./xmlchange -append CAM_CONFIG_OPTS="-cosp"
3+
./xmlchange --append CAM_CONFIG_OPTS="-cosp"
44
fi
55
./xmlchange ROF_NCPL=\$ATM_NCPL
66
./xmlchange GLC_NCPL=\$ATM_NCPL
7-
./xmlchange CAM_NML_USE_CASE=UNSET
87
./xmlchange RUN_STARTDATE="19950101"

‎cime_config/testdefs/testmods_dirs/cam/outfrq3s_cosp/user_nl_cam‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ mfilt=1,1,1,1,1,1
22
ndens=1,1,1,1,1,1
33
nhtfrq=3,3,3,3,3,3
44
inithist='ENDOFRUN'
5-
fexcl1='CFAD_DBZE94_CS','CLDTOT_CALCS','CLD_CAL_NOTCS','CS_MIXCERT','CS_MIXPOSS','CS_NOPRECIP','CS_PIA','CS_RAINPOSS','CS_RAINPROB'
5+
fexcl1='CFAD_DBZE94_CS','CLDTOT_CALCS','CLD_CAL_NOTCS','CS_MIXCERT','CS_MIXPOSS','CS_NOPRECIP','CS_PIA',
6+
'CS_RAINPOSS','CS_RAINPROB','CS_SNOWCERT','CS_SNOWPOSS'

0 commit comments

Comments
 (0)