Skip to content

Commit 553e9a3

Browse files
peverwheepeverwhee
authored
Merge pull request #343 from peverwhee/misc_updates
cam6_3_013: Misc updates
2 parents 2039254 + 67d7028 commit 553e9a3

File tree

15 files changed

+1188
-2019
lines changed

15 files changed

+1188
-2019
lines changed

‎LICENSE‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
Copyright (c) 2005-2018, University Corporation for Atmospheric Research (UCAR)
2+
All rights reserved.
3+
4+
Developed by:
5+
University Corporation for Atmospheric Research - National Center for Atmospheric Research
6+
https://www2.cesm.ucar.edu/working-groups/sewg
7+
8+
Permission is hereby granted, free of charge, to any person obtaining
9+
a copy of this software and associated documentation files (the "Software"),
10+
to deal with the Software without restriction, including without limitation
11+
the rights to use, copy, modify, merge, publish, distribute, sublicense,
12+
and/or sell copies of the Software, and to permit persons to whom
13+
the Software is furnished to do so, subject to the following conditions:
14+
15+
- Redistributions of source code must retain the above copyright notice,
16+
this list of conditions and the following disclaimers.
17+
- Redistributions in binary form must reproduce the above copyright notice,
18+
this list of conditions and the following disclaimers in the documentation
19+
and/or other materials provided with the distribution.
20+
- Neither the names of [Name of Development Group, UCAR],
21+
nor the names of its contributors may be used to endorse or promote
22+
products derived from this Software without specific prior written permission.
23+
24+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
25+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
26+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
27+
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
28+
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
29+
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
30+
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
31+
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
32+
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
33+
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
34+
POSSIBILITY OF SUCH DAMAGE.

‎bld/build-namelist‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2831,10 +2831,6 @@ $cam_chempkg = "'" . "$chem" . "'"; # add quotes to this string value
28312831

28322832
$nl->set_variable_value('phys_ctl_nl', 'cam_chempkg', $cam_chempkg);
28332833

2834-
# Check the snapshot settings.
2835-
add_default($nl, 'cam_snapshot_before_num');
2836-
add_default($nl, 'cam_snapshot_after_num');
2837-
check_snapshot_settings();
28382834

28392835
# Tropopause climatology
28402836
if (!$simple_phys) {
@@ -3835,6 +3831,11 @@ foreach my $comp (@comps) {
38353831
}
38363832
}
38373833

3834+
# Check the snapshot settings.
3835+
add_default($nl, 'cam_snapshot_before_num');
3836+
add_default($nl, 'cam_snapshot_after_num');
3837+
check_snapshot_settings();
3838+
38383839
#-----------------------------------------------------------------------------------------------
38393840
# Write output files
38403841

‎bld/namelist_files/namelist_definition.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2149,9 +2149,8 @@ Default: 2,2,2,2,2,2,2,2,2,2
21492149
group="cam_history_nl" valid_values="" >
21502150

21512151
Array of write frequencies for each history file series.
2152-
If {{ hilight }}nhtfrq(1){{ closehilight }} = 0, the file will be a monthly average.
2153-
Only the first file series may be a monthly average. If
2154-
{{ hilight }}nhtfrq(i){{ closehilight }} > 0, frequency is specified as number of
2152+
If {{ hilight }}nhtfrq(i){{ closehilight }} = 0, the file will be a monthly average.
2153+
If {{ hilight }}nhtfrq(i){{ closehilight }} > 0, frequency is specified as number of
21552154
timesteps. If {{ hilight }}nhtfrq(i){{ closehilight }} < 0, frequency is specified
21562155
as number of hours.
21572156

‎cime_config/buildcpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ def buildcpp(case):
7878
# other unstructured dycores?
7979
match = re.match(r'ne[0-9]', atm_grid)
8080
if match:
81-
case.set_value('VECT_MAP', 'cart3d')
81+
if (comp_interface == 'mct'):
82+
case.set_value('VECT_MAP', 'cart3d')
8283

8384
# if need to build - then construct configure command
8485
config_opts = ["-s", "-fc_type", compiler, "-dyn", cam_dycore,

‎cime_config/config_compsets.xml‎

Lines changed: 36 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
ICE = [CICE, DICE, SICE]
1919
OCN = [DOCN, ,AQUAP, SOCN]
2020
ROF = [RTM, SROF]
21-
GLC = [CISM1, CISM2, SGLC]
21+
GLC = [CISM2, SGLC]
2222
WAV = [SWAV]
2323
BGC = optional BGC scenario
2424

@@ -77,6 +77,29 @@
7777
<science_support grid="T85z30_T85_mg17"/>
7878
<science_support grid="T85z60_T85_mg17"/>
7979
</compset>
80+
81+
<compset>
82+
<alias>FHS94</alias>
83+
<lname>2000_CAM%HS94_SLND_SICE_SOCN_SROF_SGLC_SWAV</lname>
84+
<science_support grid="T42z30_T42_mg17"/>
85+
<science_support grid="T85z30_T85_mg17"/>
86+
<science_support grid="T85z60_T85_mg17"/>
87+
</compset>
88+
89+
<compset>
90+
<alias>FKESSLER</alias>
91+
<lname>2000_CAM%KESSLER_SLND_SICE_SOCN_SROF_SGLC_SWAV</lname>
92+
</compset>
93+
94+
<compset>
95+
<alias>FTJ16</alias>
96+
<lname>2000_CAM%TJ16_SLND_SICE_SOCN_SROF_SGLC_SWAV</lname>
97+
</compset>
98+
99+
<compset>
100+
<alias>QPRCEMIP</alias>
101+
<lname>2000_CAM60_SLND_SICE_DOCN%AQPCONST_SROF_SGLC_SWAV</lname>
102+
</compset>
80103

81104
<compset>
82105
<alias>FSCAM</alias>
@@ -91,11 +114,8 @@
91114
</compset>
92115

93116
<compset>
94-
<alias>FHS94</alias>
95-
<lname>2000_CAM%HS94_SLND_SICE_SOCN_SROF_SGLC_SWAV</lname>
96-
<science_support grid="T42z30_T42_mg17"/>
97-
<science_support grid="T85z30_T85_mg17"/>
98-
<science_support grid="T85z60_T85_mg17"/>
117+
<alias>FADIAB</alias>
118+
<lname>2000_CAM%ADIAB_SLND_SICE_SOCN_SROF_SGLC_SWAV</lname>
99119
</compset>
100120

101121
<!-- CAM aquaplanet compsets -->
@@ -162,11 +182,6 @@
162182
<science_support grid="f19_f19_mg17"/>
163183
</compset>
164184

165-
<compset>
166-
<alias>QPHISTC6</alias>
167-
<lname>HIST_CAM60_SLND_SICE_DOCN%AQP3_SROF_SGLC_SWAV</lname>
168-
</compset>
169-
170185
<compset>
171186
<alias>QPC2000climo</alias>
172187
<lname>2000_CAM60%CCTS1_SLND_SICE_DOCN%AQP3_SROF_SGLC_SWAV</lname>
@@ -188,6 +203,16 @@
188203
<science_support grid="f09_f09_mg17"/>
189204
<science_support grid="f19_f19_mg17"/>
190205
</compset>
206+
207+
<compset>
208+
<alias>QSC4</alias>
209+
<lname>2000_CAM40_SLND_SICE_DOCN%SOMAQP_SROF_SGLC_SWAV</lname>
210+
</compset>
211+
212+
<compset>
213+
<alias>QSC5</alias>
214+
<lname>2000_CAM50_SLND_SICE_DOCN%SOMAQP_SROF_SGLC_SWAV</lname>
215+
</compset>
191216

192217
<!-- ****************************** -->
193218
<!-- CAM tested compsets -->
@@ -213,39 +238,11 @@
213238
<lname>2000_CAM%SPCAMS_CLM50%SP_CICE%PRES_DOCN%DOM_RTM_SGLC_SWAV</lname>
214239
</compset>
215240

216-
<compset>
217-
<alias>F1850_BDRD</alias>
218-
<lname>1850_CAM60_CLM50%BGC_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV_BGC%BDRD</lname>
219-
</compset>
220-
221241
<compset>
222242
<alias>FHIST_BDRD</alias>
223243
<lname>HIST_CAM60_CLM50%BGC-CROP_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV_BGC%BDRD</lname>
224244
</compset>
225245

226-
<!-- CAM simpler model compsets -->
227-
228-
<compset>
229-
<alias>FADIAB</alias>
230-
<lname>2000_CAM%ADIAB_SLND_SICE_SOCN_SROF_SGLC_SWAV</lname>
231-
</compset>
232-
233-
<!-- CAM Dycore test compsets -->
234-
<compset>
235-
<alias>FHIST_DARTC6</alias>
236-
<lname>HIST_CAM60_CLM50%SP_CICE%PRES_DOCN%DOM_SROF_SGLC_SWAV</lname>
237-
</compset>
238-
239-
<compset>
240-
<alias>FTJ16</alias>
241-
<lname>2000_CAM%TJ16_SLND_SICE_SOCN_SROF_SGLC_SWAV</lname>
242-
</compset>
243-
244-
<compset>
245-
<alias>FKESSLER</alias>
246-
<lname>2000_CAM%KESSLER_SLND_SICE_SOCN_SROF_SGLC_SWAV</lname>
247-
</compset>
248-
249246
<!-- PORT compsets -->
250247
<compset>
251248
<alias>PC4</alias>
@@ -332,58 +329,16 @@
332329
<lname>2000_CAM40%TMOZ_CLM45%SP_CICE%PRES_DOCN%DOM_RTM_SGLC_SWAV</lname>
333330
</compset>
334331

335-
<compset>
336-
<alias>FSPCAMS</alias>
337-
<lname>2000_CAM%SPCAMS_CLM50%SP_CICE%PRES_DOCN%DOM_RTM_SGLC_SWAV</lname>
338-
</compset>
339-
340332
<compset>
341333
<alias>F1850_BDRD</alias>
342334
<lname>1850_CAM60_CLM50%BGC_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV_BGC%BDRD</lname>
343335
</compset>
344336

345-
<compset>
346-
<alias>FHIST_BDRD</alias>
347-
<lname>HIST_CAM60_CLM50%BGC-CROP_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV_BGC%BDRD</lname>
348-
</compset>
349-
350-
<!-- CAM simpler model compsets -->
351-
352-
<compset>
353-
<alias>FADIAB</alias>
354-
<lname>2000_CAM%ADIAB_SLND_SICE_SOCN_SROF_SGLC_SWAV</lname>
355-
</compset>
356-
357-
<!-- CAM Dycore test compsets -->
358337
<compset>
359338
<alias>FHIST_DARTC6</alias>
360339
<lname>HIST_CAM60_CLM50%SP_CICE%PRES_DOCN%DOM_SROF_SGLC_SWAV</lname>
361340
</compset>
362341

363-
<compset>
364-
<alias>FTJ16</alias>
365-
<lname>2000_CAM%TJ16_SLND_SICE_SOCN_SROF_SGLC_SWAV</lname>
366-
</compset>
367-
368-
<compset>
369-
<alias>FKESSLER</alias>
370-
<lname>2000_CAM%KESSLER_SLND_SICE_SOCN_SROF_SGLC_SWAV</lname>
371-
</compset>
372-
373-
<compset>
374-
<alias>QSC4</alias>
375-
<lname>2000_CAM40_SLND_SICE_DOCN%SOMAQP_SROF_SGLC_SWAV</lname>
376-
</compset>
377-
378-
<compset>
379-
<alias>QSC5</alias>
380-
<lname>2000_CAM50_SLND_SICE_DOCN%SOMAQP_SROF_SGLC_SWAV</lname>
381-
</compset>
382-
383-
<compset>
384-
<alias>QPRCEMIP</alias>
385-
<lname>2000_CAM60_SLND_SICE_DOCN%AQPCONST_SROF_SGLC_SWAV</lname>
386-
</compset>
387342

388343
<!-- ****************************** -->
389344
<!-- WACCM science supported compsets -->
@@ -646,10 +601,8 @@
646601
<!-- <values match="first"> -->
647602
<!-- <value grid="a%0.9x1.25_l%0.9x1.25_oi%0.9x1.25_r%r05_g%gland4_w%null_m%gx1v7" compset="HIST_CAM60_CLM50%BGC-CROP_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV" >hybrid</value> -->
648603
<!-- <value grid="a%0.9x1.25_l%0.9x1.25_oi%0.9x1.25_r%r05_g%gland4_w%null_m%gx1v7" compset="2000_CAM60_CLM50%BGC-CROP_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV" >hybrid</value> -->
649-
<!-- <value grid="a%0.9x1.25_l%0.9x1.25_oi%0.9_1.25_r%r05_m%gx1v6" compset="2000_CAM60_CLM50%BGC-CROP_CICE%PRES_DOCN%DOM_MOSART_CISM1%NOEVOLVE_SWAV">hybrid</value> -->
650604
<!-- <value grid="a%0.9x1.25_l%0.9x1.25_oi%0.9_1.25_r%r05_m%gx1v6" compset="2000_CAM60_CLM50%BGC-CROP_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV">hybrid</value> -->
651605

652-
<!-- <value grid="a%0.9x1.25_l%0.9x1.25_oi%0.9_1.25_r%r05_m%gx1v7" compset="2000_CAM60_CLM50%BGC-CROP_CICE%PRES_DOCN%DOM_MOSART_CISM1%NOEVOLVE_SWAV">hybrid</value> -->
653606
<!-- <value grid="a%0.9x1.25_l%0.9x1.25_oi%0.9_1.25_r%r05_m%gx1v7" compset="2000_CAM60_CLM50%BGC-CROP_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV">hybrid</value> -->
654607
<!-- <value grid="a%0.9x1.25_l%0.9x1.25_oi%0.9x1.25_r%r05_g%gland4_w%null_m%gx1v7" compset="HIST_CAM60%WC.*_CLM50%BGC-CROP_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV">hybrid</value> -->
655608
<!-- </values> -->
@@ -660,10 +613,8 @@
660613
<!-- <values match="first"> -->
661614
<!-- <value grid="a%0.9x1.25_l%0.9x1.25_oi%0.9x1.25_r%r05_g%gland4_w%null_m%gx1v7" compset="2000_CAM60_CLM50%BGC-CROP_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV" >b.e20.BHIST.f09_g17.20thC.297_01_v2</value> -->
662615
<!-- <value grid="a%0.9x1.25_l%0.9x1.25_oi%0.9x1.25_r%r05_g%gland4_w%null_m%gx1v7" compset="HIST_CAM60_CLM50%BGC-CROP_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV" >b.e20.BHIST.f09_g17.20thC.297_01_v2</value> -->
663-
<!-- <value grid="a%0.9x1.25_l%0.9x1.25_oi%0.9_1.25_r%r05_m%gx1v6" compset="2000_CAM60_CLM50%BGC-CROP_CICE%PRES_DOCN%DOM_MOSART_CISM1%NOEVOLVE_SWAV">b.e16.B1850_WW3.f09_g16.lang_redi_2hr_frz_chl.003</value> -->
664616
<!-- <value grid="a%0.9x1.25_l%0.9x1.25_oi%0.9_1.25_r%r05_m%gx1v6" compset="2000_CAM60_CLM50%BGC-CROP_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV">b.e20.B1850.f09_g16.pi_control.all.123</value> -->
665617

666-
<!-- <value grid="a%0.9x1.25_l%0.9x1.25_oi%0.9_1.25_r%r05_m%gx1v7" compset="2000_CAM60_CLM50%BGC-CROP_CICE%PRES_DOCN%DOM_MOSART_CISM1%NOEVOLVE_SWAV">b.e16.B1850_WW3.f09_g16.lang_redi_2hr_frz_chl.003</value> -->
667618
<!-- <value grid="a%0.9x1.25_l%0.9x1.25_oi%0.9_1.25_r%r05_m%gx1v7" compset="2000_CAM60_CLM50%BGC-CROP_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV">b.e20.B1850.f09_g16.pi_control.all.123</value> -->
668619
<!-- <value grid="a%0.9x1.25_l%0.9x1.25_oi%0.9x1.25_r%r05_g%gland4_w%null_m%gx1v7" compset="HIST_CAM60%WC.*_CLM50%BGC-CROP_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV">b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.001</value> -->
669620
<!-- </values> -->
@@ -674,9 +625,7 @@
674625
<!-- <values match="first"> -->
675626
<!-- <value grid="a%0.9x1.25_l%0.9x1.25_oi%0.9x1.25_r%r05_g%gland4_w%null_m%gx1v7" compset="HIST_CAM60_CLM50%BGC-CROP_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV" >1979-01-01</value> -->
676627
<!-- <value grid="a%0.9x1.25_l%0.9x1.25_oi%0.9x1.25_r%r05_g%gland4_w%null_m%gx1v7" compset="2000_CAM60_CLM50%BGC-CROP_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV" >2000-01-01</value> -->
677-
<!-- <value grid="a%0.9x1.25_l%0.9x1.25_oi%0.9_1.25_r%r05_m%gx1v6" compset="2000_CAM60_CLM50%BGC-CROP_CICE%PRES_DOCN%DOM_MOSART_CISM1%NOEVOLVE_SWAV">0097-01-01</value> -->
678628
<!-- <value grid="a%0.9x1.25_l%0.9x1.25_oi%0.9_1.25_r%r05_m%gx1v6" compset="2000_CAM60_CLM50%BGC-CROP_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV">0010-01-01</value> -->
679-
<!-- <value grid="a%0.9x1.25_l%0.9x1.25_oi%0.9_1.25_r%r05_m%gx1v7" compset="2000_CAM60_CLM50%BGC-CROP_CICE%PRES_DOCN%DOM_MOSART_CISM1%NOEVOLVE_SWAV">0097-01-01</value> -->
680629
<!-- <value grid="a%0.9x1.25_l%0.9x1.25_oi%0.9_1.25_r%r05_m%gx1v7" compset="2000_CAM60_CLM50%BGC-CROP_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV">0010-01-01</value> -->
681630
<!-- <value grid="a%0.9x1.25_l%0.9x1.25_oi%0.9x1.25_r%r05_g%gland4_w%null_m%gx1v7" compset="HIST_CAM60%WC.*_CLM50%BGC-CROP_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV">1950-01-01</value> -->
682631
<!-- </values> -->

‎cime_config/config_pes.xml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1550,14 +1550,6 @@
15501550
<nthrds_cpl>1</nthrds_cpl>
15511551
</nthrds>
15521552
</pes>
1553-
<pes pesize="any" compset="CISM1">
1554-
<ntasks>
1555-
<ntasks_glc>1</ntasks_glc>
1556-
</ntasks>
1557-
<nthrds>
1558-
<nthrds_glc>1</nthrds_glc>
1559-
</nthrds>
1560-
</pes>
15611553
</mach>
15621554
</grid>
15631555
</overrides>

0 commit comments

Comments
 (0)