Skip to content

Commit e73a79b

Browse files
nusbaumenusbaume
authored
Merge pull request #1214 from PeterHjortLauritzen/clean-up-bugfix
cam6_4_075: Clean up (all SE dycore) plus other misc
2 parents acc5271 + f30339a commit e73a79b

20 files changed

+537
-157
lines changed

‎.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
[submodule "atmos_phys"]
3737
path = src/atmos_phys
3838
url = https://github.com/ESCOMP/atmospheric_physics
39-
fxtag = atmos_phys0_10_000
39+
fxtag = atmos_phys0_10_001
4040
fxrequired = AlwaysRequired
4141
fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics
4242

‎LICENSE

+201-34
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,201 @@
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.
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright [yyyy] [name of copyright owner]
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.

‎bld/build-namelist

+1
Original file line numberDiff line numberDiff line change
@@ -3738,6 +3738,7 @@ if (!$simple_phys) {
37383738
add_default($nl, 'zmconv_tiedke_add');
37393739
add_default($nl, 'zmconv_capelmt');
37403740
add_default($nl, 'zmconv_tau');
3741+
add_default($nl, 'zmconv_parcel_hscale');
37413742
}
37423743

37433744
# moist convection rainwater coefficients

‎bld/namelist_files/namelist_defaults_cam.xml

+6-9
Original file line numberDiff line numberDiff line change
@@ -767,24 +767,20 @@
767767
<pgwv waccmx="1">18</pgwv>
768768

769769
<!-- gravity wave settings -->
770-
<effgw_beres_dp>0.7D0</effgw_beres_dp>
771-
<effgw_beres_dp hgrid="0.9x1.25" >0.4D0</effgw_beres_dp>
770+
771+
<effgw_beres_dp >0.7D0</effgw_beres_dp>
772772
<effgw_beres_dp model_top="lt" >0.30D0</effgw_beres_dp>
773773
<effgw_beres_dp model_top="mt" >0.70D0</effgw_beres_dp>
774+
<effgw_beres_dp hgrid="0.9x1.25" >0.4D0</effgw_beres_dp>
774775
<effgw_beres_dp waccm_phys="0" >0.55D0</effgw_beres_dp>
775776
<effgw_beres_dp waccm_phys="1" hgrid="0.9x1.25" >0.5D0</effgw_beres_dp>
776-
<effgw_beres_dp waccm_phys="1" hgrid="ne30np4" nlev="70" >0.5D0</effgw_beres_dp>
777-
<effgw_beres_dp waccm_phys="1" hgrid="ne30np4" nlev="110" >0.7D0</effgw_beres_dp>
778-
<effgw_beres_dp chem="geoschem_mam4" hgrid="0.9x1.25" >0.5D0</effgw_beres_dp>
779-
<effgw_beres_dp chem="trop_strat_mam4_vbs" hgrid="0.9x1.25" >0.5D0</effgw_beres_dp>
780-
<effgw_beres_dp chem="trop_strat_mam4_vbsext" hgrid="0.9x1.25">0.5D0</effgw_beres_dp>
777+
<effgw_beres_dp waccm_phys="1" hgrid="ne30np4" >0.5D0</effgw_beres_dp>
778+
<effgw_beres_dp chem="geoschem_mam4" hgrid="0.9x1.25" >0.5D0</effgw_beres_dp>
781779
<effgw_beres_dp chem="trop_strat_mam5_vbs" hgrid="0.9x1.25" >0.5D0</effgw_beres_dp>
782780
<effgw_beres_dp chem="trop_strat_mam5_vbsext" hgrid="0.9x1.25">0.5D0</effgw_beres_dp>
783781
<effgw_beres_dp carma="trop_strat_soa1" hgrid="0.9x1.25" >0.5D0</effgw_beres_dp>
784782
<effgw_beres_dp carma="trop_strat_soa5" hgrid="0.9x1.25" >0.5D0</effgw_beres_dp>
785783

786-
<effgw_oro nlev="60" >0.0625D0</effgw_oro>
787-
788784
<effgw_rdg_resid >1.0D0</effgw_rdg_resid>
789785

790786
<effgw_rdg_beta >1.0D0</effgw_rdg_beta>
@@ -2848,6 +2844,7 @@
28482844
<zmconv_tau > 3600.0 </zmconv_tau>
28492845

28502846
<zmconv_parcel_pbl > .false. </zmconv_parcel_pbl>
2847+
<zmconv_parcel_hscale > 0.5 </zmconv_parcel_hscale>
28512848

28522849
<!-- Cloud sedimentation -->
28532850

‎bld/namelist_files/namelist_definition.xml

+6
Original file line numberDiff line numberDiff line change
@@ -3224,6 +3224,12 @@ Turn on ZM deep convection initial parcel properties as a function of a well mix
32243224
Default: .false.
32253225
</entry>
32263226

3227+
<entry id="zmconv_parcel_hscale" type="real" category="conv"
3228+
group="zmconv_nl" valid_values="" >
3229+
The fraction of the boundary layer (PBL) depth, over which to mix the initial ZM convective parcel properties (fraction).
3230+
Default: 0.5
3231+
</entry>
3232+
32273233
<entry id="zmconv_tau" type="real" category="conv"
32283234
group="zmconv_nl" valid_values="" >
32293235
Convective adjustment timescale in units of (s)

0 commit comments

Comments
 (0)