Skip to content

Commit 44511df

Browse files
matthew-mizielinskimatthew-mizielinski
authored
Merge pull request #126 from MetOffice/CDDSO-275_v2.4.5_release
CDDSO-275 v2.4.5 release
2 parents 4376da3 + 0097a97 commit 44511df

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+558
-234
lines changed

‎cdds/CHANGES.rst‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
44
.. include:: common.txt
55

6+
Release 2.4.5, May 22, 2023
7+
===========================
8+
* Added HighResMIP models to CMIP6 plugin (CDDSO-158, cherry-picked from main)
9+
610
Release 2.4.4, May 4, 2023
711
==========================
812
* Added options to use a “relaxed” approach to MIP name (activity_id), and experiment id,

‎cdds/cdds/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
# Please see LICENSE.rst for license details.
33
from cdds.versions import get_version
44

5-
_DEV = True
5+
_DEV = False
66
_NUMERICAL_VERSION = '2.4.5'
77
__version__ = get_version('cdds')

‎docs/cdds/doctrees/environment.pickle‎

7.91 KB
Binary file not shown.

‎docs/cdds/doctrees/plugins/plugins.cmip6.doctree‎

37.4 KB
Binary file not shown.

‎docs/cdds/html/.buildinfo‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Sphinx build info version 1
22
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
3-
config: ab561a7c875f32274c30fb487b3556a3
3+
config: 2ba3b300c2b5acbd6253f087db04534b
44
tags: 645f666f9bcd5a90fca523b33c5a78b7

‎docs/cdds/html/_modules/cdds/common/plugins/cmip6/cmip6_models.html‎

Lines changed: 126 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<head>
66
<meta charset="utf-8" />
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
8-
<title>cdds.common.plugins.cmip6.cmip6_models &#8212; CDDS 2.4.4 documentation</title>
8+
<title>cdds.common.plugins.cmip6.cmip6_models &#8212; CDDS 2.4.5 documentation</title>
99
<link rel="stylesheet" type="text/css" href="../../../../../_static/pygments.css" />
1010
<link rel="stylesheet" type="text/css" href="../../../../../_static/nature.css" />
1111
<script data-url_root="../../../../../" id="documentation_options" src="../../../../../_static/documentation_options.js"></script>
@@ -25,7 +25,7 @@ <h3>Navigation</h3>
2525
<li class="right" >
2626
<a href="../../../../../py-modindex.html" title="Python Module Index"
2727
>modules</a> |</li>
28-
<li class="nav-item nav-item-0"><a href="../../../../../index.html">CDDS 2.4.4 documentation</a> &#187;</li>
28+
<li class="nav-item nav-item-0"><a href="../../../../../index.html">CDDS 2.4.5 documentation</a> &#187;</li>
2929
<li class="nav-item nav-item-1"><a href="../../../../index.html" accesskey="U">Module code</a> &#187;</li>
3030
<li class="nav-item nav-item-this"><a href="">cdds.common.plugins.cmip6.cmip6_models</a></li>
3131
</ul>
@@ -69,6 +69,9 @@ <h1>Source code for cdds.common.plugins.cmip6.cmip6_models</h1><div class="highl
6969
<span class="n">HadREM3_GA7_05</span> <span class="o">=</span> <span class="s1">&#39;HadREM3-GA7-05&#39;</span>
7070
<span class="n">HadGEM3_GC31_LL</span> <span class="o">=</span> <span class="s1">&#39;HadGEM3-GC31-LL&#39;</span>
7171
<span class="n">HadGEM3_GC31_MM</span> <span class="o">=</span> <span class="s1">&#39;HadGEM3-GC31-MM&#39;</span>
72+
<span class="n">HadGEM3_GC31_HM</span> <span class="o">=</span> <span class="s1">&#39;HadGEM3-GC31-HM&#39;</span>
73+
<span class="n">HadGEM3_GC31_MH</span> <span class="o">=</span> <span class="s1">&#39;HadGEM3-GC31-MH&#39;</span>
74+
<span class="n">HadGEM3_GC31_HH</span> <span class="o">=</span> <span class="s1">&#39;HadGEM3-GC31-HH&#39;</span>
7275
<span class="n">UKESM1_0_LL</span> <span class="o">=</span> <span class="s1">&#39;UKESM1-0-LL&#39;</span>
7376
<span class="n">UKESM1_1_LL</span> <span class="o">=</span> <span class="s1">&#39;UKESM1-1-LL&#39;</span>
7477
<span class="n">UKESM1_ICE_LL</span> <span class="o">=</span> <span class="s1">&#39;UKESM1-ice-LL&#39;</span></div>
@@ -194,6 +197,123 @@ <h1>Source code for cdds.common.plugins.cmip6.cmip6_models</h1><div class="highl
194197
<span class="k">return</span> <span class="s1">&#39;10.7&#39;</span></div>
195198

196199

200+
<div class="viewcode-block" id="HadGEM3_GC31_HM_Params"><a class="viewcode-back" href="../../../../../plugins/plugins.cmip6.html#cdds.common.plugins.cmip6.cmip6_models.HadGEM3_GC31_HM_Params">[docs]</a><span class="k">class</span> <span class="nc">HadGEM3_GC31_HM_Params</span><span class="p">(</span><span class="n">BaseModelParameters</span><span class="p">):</span>
201+
<span class="sd">&quot;&quot;&quot;</span>
202+
<span class="sd"> Class to store the parameters for the HadGEM3_GC31_HM model.</span>
203+
<span class="sd"> &quot;&quot;&quot;</span>
204+
205+
<span class="k">def</span> <span class="fm">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="kc">None</span><span class="p">:</span>
206+
<span class="nb">super</span><span class="p">(</span><span class="n">HadGEM3_GC31_HM_Params</span><span class="p">,</span> <span class="bp">self</span><span class="p">)</span><span class="o">.</span><span class="fm">__init__</span><span class="p">(</span><span class="n">Cmip6ModelId</span><span class="o">.</span><span class="n">HadGEM3_GC31_HM</span><span class="p">)</span>
207+
208+
<span class="nd">@property</span>
209+
<span class="k">def</span> <span class="nf">model_version</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="nb">str</span><span class="p">:</span>
210+
<span class="sd">&quot;&quot;&quot;</span>
211+
<span class="sd"> Returns the model version of the HadGEM3_GC31_HM model.</span>
212+
213+
<span class="sd"> :return: Model version of HadGEM3_GC31_HM</span>
214+
<span class="sd"> :rtype: str</span>
215+
<span class="sd"> &quot;&quot;&quot;</span>
216+
<span class="k">return</span> <span class="s1">&#39;3.1&#39;</span>
217+
218+
<span class="nd">@property</span>
219+
<span class="k">def</span> <span class="nf">data_request_version</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="nb">str</span><span class="p">:</span>
220+
<span class="sd">&quot;&quot;&quot;</span>
221+
<span class="sd"> Returns the data request version of the HadGEM3_GC31_HM model.</span>
222+
223+
<span class="sd"> :return: Data request version of HadGEM3_GC31_HM</span>
224+
<span class="sd"> :rtype: str</span>
225+
<span class="sd"> &quot;&quot;&quot;</span>
226+
<span class="k">return</span> <span class="s1">&#39;01.00.10&#39;</span>
227+
228+
<span class="nd">@property</span>
229+
<span class="k">def</span> <span class="nf">um_version</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="nb">str</span><span class="p">:</span>
230+
<span class="sd">&quot;&quot;&quot;</span>
231+
<span class="sd"> Returns the UM version of the HadGEM3_GC31_HM model.</span>
232+
233+
<span class="sd"> :return: UM version of HadGEM3_GC31_HM</span>
234+
<span class="sd"> :rtype: str</span>
235+
<span class="sd"> &quot;&quot;&quot;</span>
236+
<span class="k">return</span> <span class="s1">&#39;10.7&#39;</span></div>
237+
238+
239+
<div class="viewcode-block" id="HadGEM3_GC31_MH_Params"><a class="viewcode-back" href="../../../../../plugins/plugins.cmip6.html#cdds.common.plugins.cmip6.cmip6_models.HadGEM3_GC31_MH_Params">[docs]</a><span class="k">class</span> <span class="nc">HadGEM3_GC31_MH_Params</span><span class="p">(</span><span class="n">BaseModelParameters</span><span class="p">):</span>
240+
<span class="sd">&quot;&quot;&quot;</span>
241+
<span class="sd"> Class to store the parameters for the HadGEM3_GC31_MH model.</span>
242+
<span class="sd"> &quot;&quot;&quot;</span>
243+
244+
<span class="k">def</span> <span class="fm">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="kc">None</span><span class="p">:</span>
245+
<span class="nb">super</span><span class="p">(</span><span class="n">HadGEM3_GC31_MH_Params</span><span class="p">,</span> <span class="bp">self</span><span class="p">)</span><span class="o">.</span><span class="fm">__init__</span><span class="p">(</span><span class="n">Cmip6ModelId</span><span class="o">.</span><span class="n">HadGEM3_GC31_MH</span><span class="p">)</span>
246+
247+
<span class="nd">@property</span>
248+
<span class="k">def</span> <span class="nf">model_version</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="nb">str</span><span class="p">:</span>
249+
<span class="sd">&quot;&quot;&quot;</span>
250+
<span class="sd"> Returns the model version of the HadGEM3_GC31_MH model.</span>
251+
252+
<span class="sd"> :return: Model version of HadGEM3_GC31_MH</span>
253+
<span class="sd"> :rtype: str</span>
254+
<span class="sd"> &quot;&quot;&quot;</span>
255+
<span class="k">return</span> <span class="s1">&#39;3.1&#39;</span>
256+
257+
<span class="nd">@property</span>
258+
<span class="k">def</span> <span class="nf">data_request_version</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="nb">str</span><span class="p">:</span>
259+
<span class="sd">&quot;&quot;&quot;</span>
260+
<span class="sd"> Returns the data request version of the HadGEM3_GC31_MH model.</span>
261+
262+
<span class="sd"> :return: Data request version of HadGEM3_GC31_MH</span>
263+
<span class="sd"> :rtype: str</span>
264+
<span class="sd"> &quot;&quot;&quot;</span>
265+
<span class="k">return</span> <span class="s1">&#39;01.00.10&#39;</span>
266+
267+
<span class="nd">@property</span>
268+
<span class="k">def</span> <span class="nf">um_version</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="nb">str</span><span class="p">:</span>
269+
<span class="sd">&quot;&quot;&quot;</span>
270+
<span class="sd"> Returns the UM version of the HadGEM3_GC31_MH model.</span>
271+
272+
<span class="sd"> :return: UM version of HadGEM3_GC31_MH</span>
273+
<span class="sd"> :rtype: str</span>
274+
<span class="sd"> &quot;&quot;&quot;</span>
275+
<span class="k">return</span> <span class="s1">&#39;10.7&#39;</span></div>
276+
277+
278+
<div class="viewcode-block" id="HadGEM3_GC31_HH_Params"><a class="viewcode-back" href="../../../../../plugins/plugins.cmip6.html#cdds.common.plugins.cmip6.cmip6_models.HadGEM3_GC31_HH_Params">[docs]</a><span class="k">class</span> <span class="nc">HadGEM3_GC31_HH_Params</span><span class="p">(</span><span class="n">BaseModelParameters</span><span class="p">):</span>
279+
<span class="sd">&quot;&quot;&quot;</span>
280+
<span class="sd"> Class to store the parameters for the HadGEM3_GC31_HH model.</span>
281+
<span class="sd"> &quot;&quot;&quot;</span>
282+
283+
<span class="k">def</span> <span class="fm">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="kc">None</span><span class="p">:</span>
284+
<span class="nb">super</span><span class="p">(</span><span class="n">HadGEM3_GC31_HH_Params</span><span class="p">,</span> <span class="bp">self</span><span class="p">)</span><span class="o">.</span><span class="fm">__init__</span><span class="p">(</span><span class="n">Cmip6ModelId</span><span class="o">.</span><span class="n">HadGEM3_GC31_HH</span><span class="p">)</span>
285+
286+
<span class="nd">@property</span>
287+
<span class="k">def</span> <span class="nf">model_version</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="nb">str</span><span class="p">:</span>
288+
<span class="sd">&quot;&quot;&quot;</span>
289+
<span class="sd"> Returns the model version of the HadGEM3_GC31_HH model.</span>
290+
291+
<span class="sd"> :return: Model version of HadGEM3_GC31_HH</span>
292+
<span class="sd"> :rtype: str</span>
293+
<span class="sd"> &quot;&quot;&quot;</span>
294+
<span class="k">return</span> <span class="s1">&#39;3.1&#39;</span>
295+
296+
<span class="nd">@property</span>
297+
<span class="k">def</span> <span class="nf">data_request_version</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="nb">str</span><span class="p">:</span>
298+
<span class="sd">&quot;&quot;&quot;</span>
299+
<span class="sd"> Returns the data request version of the HadGEM3_GC31_HH model.</span>
300+
301+
<span class="sd"> :return: Data request version of HadGEM3_GC31_HH</span>
302+
<span class="sd"> :rtype: str</span>
303+
<span class="sd"> &quot;&quot;&quot;</span>
304+
<span class="k">return</span> <span class="s1">&#39;01.00.10&#39;</span>
305+
306+
<span class="nd">@property</span>
307+
<span class="k">def</span> <span class="nf">um_version</span><span class="p">(</span><span class="bp">self</span><span class="p">)</span> <span class="o">-&gt;</span> <span class="nb">str</span><span class="p">:</span>
308+
<span class="sd">&quot;&quot;&quot;</span>
309+
<span class="sd"> Returns the UM version of the HadGEM3_GC31_HH model.</span>
310+
311+
<span class="sd"> :return: UM version of HadGEM3_GC31_HH</span>
312+
<span class="sd"> :rtype: str</span>
313+
<span class="sd"> &quot;&quot;&quot;</span>
314+
<span class="k">return</span> <span class="s1">&#39;10.7&#39;</span></div>
315+
316+
197317
<div class="viewcode-block" id="UKESM1_0_LL_Params"><a class="viewcode-back" href="../../../../../plugins/plugins.cmip6.html#cdds.common.plugins.cmip6.cmip6_models.UKESM1_0_LL_Params">[docs]</a><span class="k">class</span> <span class="nc">UKESM1_0_LL_Params</span><span class="p">(</span><span class="n">BaseModelParameters</span><span class="p">):</span>
198318
<span class="sd">&quot;&quot;&quot;</span>
199319
<span class="sd"> Class to store the parameters for the UKESM1_0_LL model.</span>
@@ -325,6 +445,9 @@ <h1>Source code for cdds.common.plugins.cmip6.cmip6_models</h1><div class="highl
325445
<span class="n">HadREM3_GA7_05_Params</span><span class="p">(),</span>
326446
<span class="n">HadGEM3_GC31_LL_Params</span><span class="p">(),</span>
327447
<span class="n">HadGEM3_GC31_MM_Params</span><span class="p">(),</span>
448+
<span class="n">HadGEM3_GC31_HM_Params</span><span class="p">(),</span>
449+
<span class="n">HadGEM3_GC31_MH_Params</span><span class="p">(),</span>
450+
<span class="n">HadGEM3_GC31_HH_Params</span><span class="p">(),</span>
328451
<span class="n">UKESM1_0_LL_Params</span><span class="p">(),</span>
329452
<span class="n">UKESM1_1_LL_Params</span><span class="p">(),</span>
330453
<span class="n">UKESM1_ice_LL_Params</span><span class="p">()</span>
@@ -387,7 +510,7 @@ <h3>Navigation</h3>
387510
<li class="right" >
388511
<a href="../../../../../py-modindex.html" title="Python Module Index"
389512
>modules</a> |</li>
390-
<li class="nav-item nav-item-0"><a href="../../../../../index.html">CDDS 2.4.4 documentation</a> &#187;</li>
513+
<li class="nav-item nav-item-0"><a href="../../../../../index.html">CDDS 2.4.5 documentation</a> &#187;</li>
391514
<li class="nav-item nav-item-1"><a href="../../../../index.html" >Module code</a> &#187;</li>
392515
<li class="nav-item nav-item-this"><a href="">cdds.common.plugins.cmip6.cmip6_models</a></li>
393516
</ul>

‎docs/cdds/html/_modules/index.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<head>
66
<meta charset="utf-8" />
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
8-
<title>Overview: module code &#8212; CDDS 2.4.4 documentation</title>
8+
<title>Overview: module code &#8212; CDDS 2.4.5 documentation</title>
99
<link rel="stylesheet" type="text/css" href="../_static/pygments.css" />
1010
<link rel="stylesheet" type="text/css" href="../_static/nature.css" />
1111
<script data-url_root="../" id="documentation_options" src="../_static/documentation_options.js"></script>
@@ -25,7 +25,7 @@ <h3>Navigation</h3>
2525
<li class="right" >
2626
<a href="../py-modindex.html" title="Python Module Index"
2727
>modules</a> |</li>
28-
<li class="nav-item nav-item-0"><a href="../index.html">CDDS 2.4.4 documentation</a> &#187;</li>
28+
<li class="nav-item nav-item-0"><a href="../index.html">CDDS 2.4.5 documentation</a> &#187;</li>
2929
<li class="nav-item nav-item-this"><a href="">Overview: module code</a></li>
3030
</ul>
3131
</div>
@@ -79,7 +79,7 @@ <h3>Navigation</h3>
7979
<li class="right" >
8080
<a href="../py-modindex.html" title="Python Module Index"
8181
>modules</a> |</li>
82-
<li class="nav-item nav-item-0"><a href="../index.html">CDDS 2.4.4 documentation</a> &#187;</li>
82+
<li class="nav-item nav-item-0"><a href="../index.html">CDDS 2.4.5 documentation</a> &#187;</li>
8383
<li class="nav-item nav-item-this"><a href="">Overview: module code</a></li>
8484
</ul>
8585
</div>

‎docs/cdds/html/_static/documentation_options.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var DOCUMENTATION_OPTIONS = {
22
URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
3-
VERSION: '2.4.4',
3+
VERSION: '2.4.5',
44
LANGUAGE: 'None',
55
COLLAPSE_INDEX: false,
66
BUILDER: 'html',

‎docs/cdds/html/about.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<meta charset="utf-8" />
77
<meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />
88

9-
<title>About &#8212; CDDS 2.4.4 documentation</title>
9+
<title>About &#8212; CDDS 2.4.5 documentation</title>
1010
<link rel="stylesheet" type="text/css" href="_static/pygments.css" />
1111
<link rel="stylesheet" type="text/css" href="_static/nature.css" />
1212
<script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>
@@ -34,7 +34,7 @@ <h3>Navigation</h3>
3434
<li class="right" >
3535
<a href="index.html" title="Welcome to CDDS’s documentation!"
3636
accesskey="P">previous</a> |</li>
37-
<li class="nav-item nav-item-0"><a href="index.html">CDDS 2.4.4 documentation</a> &#187;</li>
37+
<li class="nav-item nav-item-0"><a href="index.html">CDDS 2.4.5 documentation</a> &#187;</li>
3838
<li class="nav-item nav-item-this"><a href="">About</a></li>
3939
</ul>
4040
</div>
@@ -175,7 +175,7 @@ <h3>Navigation</h3>
175175
<li class="right" >
176176
<a href="index.html" title="Welcome to CDDS’s documentation!"
177177
>previous</a> |</li>
178-
<li class="nav-item nav-item-0"><a href="index.html">CDDS 2.4.4 documentation</a> &#187;</li>
178+
<li class="nav-item nav-item-0"><a href="index.html">CDDS 2.4.5 documentation</a> &#187;</li>
179179
<li class="nav-item nav-item-this"><a href="">About</a></li>
180180
</ul>
181181
</div>

0 commit comments

Comments
 (0)