Skip to content

Commit 9a03b76

Browse files
Merge pull request #904 from sadielbartholomew/reference-training
Reference training materials (& remove reference to 'the the'!)
2 parents 5b9078a + 3e3ad11 commit 9a03b76

File tree

14 files changed

+104
-70
lines changed

14 files changed

+104
-70
lines changed

README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,3 +148,11 @@ Tests
148148
Tests are run from within the ``cf/test`` directory:
149149

150150
python run_tests.py
151+
152+
Training
153+
=======
154+
155+
Training material on cf-python and cf-plot i.e. the CF Data Tools,
156+
in the form of Jupyter Notebooks, is openly-accessible and available
157+
(with instructions for set-up provided) at:
158+
https://github.com/NCAS-CMS/cf-tools-training.

cf/data/data.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7099,7 +7099,7 @@ def sinh(self, inplace=False):
70997099
71007100
Units are accounted for in the calculation. If the units are not
71017101
equivalent to radians (such as Kelvin) then they are treated as if
7102-
they were radians. For example, the the hyperbolic sine of 90
7102+
they were radians. For example, the hyperbolic sine of 90
71037103
degrees_north is 2.30129890, as is the hyperbolic sine of
71047104
1.57079632 radians.
71057105
@@ -7159,7 +7159,7 @@ def cosh(self, inplace=False):
71597159
71607160
Units are accounted for in the calculation. If the units are not
71617161
equivalent to radians (such as Kelvin) then they are treated as if
7162-
they were radians. For example, the the hyperbolic cosine of 0
7162+
they were radians. For example, the hyperbolic cosine of 0
71637163
degrees_east is 1.0, as is the hyperbolic cosine of 1.57079632 radians.
71647164
71657165
The output units are changed to '1' (nondimensional).
@@ -7219,7 +7219,7 @@ def tanh(self, inplace=False):
72197219
72207220
Units are accounted for in the calculation. If the units are not
72217221
equivalent to radians (such as Kelvin) then they are treated as if
7222-
they were radians. For example, the the hyperbolic tangent of 90
7222+
they were radians. For example, the hyperbolic tangent of 90
72237223
degrees_east is 0.91715234, as is the hyperbolic tangent of
72247224
1.57079632 radians.
72257225

cf/mixin/fielddomain.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ def _indices(self, config, data_axes, ancillary_mask, kwargs):
247247
tuples of domain axis identifier combinations, each
248248
of which has of a `Data` object containing the
249249
ancillary mask to apply to those domain axes
250-
immediately after the the subspace has been created
250+
immediately after the subspace has been created
251251
by the ``'indices'``. This dictionary will always be
252252
empty if the *ancillary_mask* parameter is False.
253253

cf/mixin/propertiesdata.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4165,7 +4165,7 @@ def tanh(self, inplace=False):
41654165
41664166
Units are accounted for in the calculation. If the units are
41674167
not equivalent to radians (such as Kelvin) then they are
4168-
treated as if they were radians. For example, the the
4168+
treated as if they were radians. For example, the
41694169
hyperbolic tangent of 90 degrees_east is 0.91715234, as is the
41704170
hyperbolic tangent of 1.57079632 radians.
41714171
@@ -4227,7 +4227,7 @@ def sinh(self, inplace=False):
42274227
42284228
Units are accounted for in the calculation. If the units are
42294229
not equivalent to radians (such as Kelvin) then they are
4230-
treated as if they were radians. For example, the the
4230+
treated as if they were radians. For example, the
42314231
hyperbolic sine of 90 degrees_north is 2.30129890, as is the
42324232
hyperbolic sine of 1.57079632 radians.
42334233
@@ -4288,7 +4288,7 @@ def cosh(self, inplace=False):
42884288
42894289
Units are accounted for in the calculation. If the units are
42904290
not equivalent to radians (such as Kelvin) then they are
4291-
treated as if they were radians. For example, the the
4291+
treated as if they were radians. For example, the
42924292
hyperbolic cosine of 0 degrees_east is 1.0, as is the
42934293
hyperbolic cosine of 1.57079632 radians.
42944294

cf/mixin/propertiesdatabounds.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3009,7 +3009,7 @@ def tanh(self, bounds=True, inplace=False):
30093009
30103010
Units are accounted for in the calculation. If the units are not
30113011
equivalent to radians (such as Kelvin) then they are treated as if
3012-
they were radians. For example, the the hyperbolic tangent of 90
3012+
they were radians. For example, the hyperbolic tangent of 90
30133013
degrees_east is 0.91715234, as is the hyperbolic tangent of
30143014
1.57079632 radians.
30153015
@@ -3069,7 +3069,7 @@ def sinh(self, bounds=True, inplace=False):
30693069
30703070
Units are accounted for in the calculation. If the units are not
30713071
equivalent to radians (such as Kelvin) then they are treated as if
3072-
they were radians. For example, the the hyperbolic sine of 90
3072+
they were radians. For example, the hyperbolic sine of 90
30733073
degrees_north is 2.30129890, as is the hyperbolic sine of
30743074
1.57079632 radians.
30753075
@@ -3128,7 +3128,7 @@ def cosh(self, bounds=True, inplace=False):
31283128
31293129
Units are accounted for in the calculation. If the units are not
31303130
equivalent to radians (such as Kelvin) then they are treated as if
3131-
they were radians. For example, the the hyperbolic cosine of 0
3131+
they were radians. For example, the hyperbolic cosine of 0
31323132
degrees_east is 1.0, as is the hyperbolic cosine of 1.57079632 radians.
31333133
31343134
The output units are changed to '1' (nondimensional).

cf/read_write/read.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class read(cfdm.read):
8888
the end of the Python session, at which time it is automatically
8989
deleted. The CDL file may omit data array values (as would be the
9090
case, for example, if the file was created with the ``-h`` or
91-
``-c`` option to ``ncdump``), in which case the the relevant
91+
``-c`` option to ``ncdump``), in which case the relevant
9292
constructs in memory will be created with data with all missing
9393
values.
9494

docs/analysis.html

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
<meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="viewport" content="width=device-width, initial-scale=1" />
77

88
<title>Analysis &#8212; Documentation</title>
9-
<link rel="stylesheet" type="text/css" href="_static/pygments.css?v=b3523f8e" />
10-
<link rel="stylesheet" type="text/css" href="_static/alabaster.css?v=541523b4" />
9+
<link rel="stylesheet" type="text/css" href="_static/pygments.css?v=61cd365c" />
10+
<link rel="stylesheet" type="text/css" href="_static/alabaster.css?v=a5d0ad34" />
1111
<link rel="stylesheet" type="text/css" href="_static/graphviz.css?v=fd3f3429" />
1212
<link rel="stylesheet" type="text/css" href="_static/copybutton.css?v=76b2166b" />
13-
<link rel="stylesheet" type="text/css" href="_static/sg_gallery.css?v=61a4c737" />
14-
<link rel="stylesheet" type="text/css" href="_static/sg_gallery-binder.css?v=ca3c1c84" />
15-
<link rel="stylesheet" type="text/css" href="_static/sg_gallery-dataframe.css?v=e5fbc548" />
13+
<link rel="stylesheet" type="text/css" href="_static/sg_gallery.css?v=d2d258e8" />
14+
<link rel="stylesheet" type="text/css" href="_static/sg_gallery-binder.css?v=f4aeca0c" />
15+
<link rel="stylesheet" type="text/css" href="_static/sg_gallery-dataframe.css?v=2082cf3c" />
1616
<link rel="stylesheet" type="text/css" href="_static/sg_gallery-rendered-html.css?v=1277b6f3" />
1717
<link rel="stylesheet" type="text/css" href="_static/customise-alabaster.css?v=5dec66a6" />
1818
<script src="_static/documentation_options.js?v=5318ce95"></script>
@@ -28,16 +28,17 @@
2828

2929
<link rel="stylesheet" href="_static/custom.css" type="text/css" />
3030

31+
32+
3133

32-
<meta name="viewport" content="width=device-width, initial-scale=0.9, maximum-scale=0.9" />
3334

3435
</head><body>
3536
<div class="document">
3637

37-
<div class="sphinxsidebar" role="navigation" aria-label="Main">
38+
<div class="sphinxsidebar" role="navigation" aria-label="main navigation">
3839
<div class="sphinxsidebarwrapper">
3940
<p class="logo"><a href="index.html">
40-
<img class="logo" src="_static/logo.svg" alt="Logo of Python cf package"/>
41+
<img class="logo" src="_static/logo.svg" alt="Logo"/>
4142
</a></p>
4243

4344

@@ -124,7 +125,7 @@ <h3>Related Topics</h3>
124125
<hr class="docutils" />
125126
<p>Version 3.18.2 for version 1.12 of the CF conventions.</p>
126127
<p>All of the Python code in this tutorial is available in an executable
127-
script (<a class="reference download internal" download="" href="_downloads/f005a212533d023d9ca8ee5ecd9a9065/field_analysis.py"><code class="xref download docutils literal notranslate"><span class="pre">download</span></code></a>, 8kB).</p>
128+
script (<a class="reference download internal" download="" href="_downloads/field_analysis.py"><code class="xref download docutils literal notranslate"><span class="pre">download</span></code></a>, 8kB).</p>
128129
<p>Note that this page is duplicated in the <a class="reference internal" href="tutorial.html#tutorial"><span class="std std-ref">tutorial</span></a>.</p>
129130
<nav class="contents local" id="contents">
130131
<ul class="simple">
@@ -182,7 +183,7 @@ <h3>Related Topics</h3>
182183
<span id="id2"></span><h2><a class="toc-backref" href="#id83" role="doc-backlink"><strong>Sample datasets</strong></a><a class="headerlink" href="#sample-datasets" title="Link to this heading"></a></h2>
183184
<p>This tutorial uses a number of small sample datasets, all of which can
184185
be found in the zip file <code class="docutils literal notranslate"><span class="pre">cf_tutorial_files.zip</span></code>
185-
(<a class="reference download internal" download="" href="_downloads/662a6146f847a4d1c19d523d3f30e1cc/cf_tutorial_files.zip"><code class="xref download docutils literal notranslate"><span class="pre">download</span></code></a>,
186+
(<a class="reference download internal" download="" href="_downloads/cf_tutorial_files.zip"><code class="xref download docutils literal notranslate"><span class="pre">download</span></code></a>,
186187
164kB):</p>
187188
<div class="literal-block-wrapper docutils container" id="id28">
188189
<div class="code-block-caption"><span class="caption-text"><em>Unpack the sample datasets.</em></span><a class="headerlink" href="#id28" title="Link to this code"></a></div>
@@ -2444,7 +2445,7 @@ <h3><a class="toc-backref" href="#id112" role="doc-backlink">Moving windows</a><
24442445
cell sizes (or custom weights) may applied to the calculation.</p>
24452446
<div class="literal-block-wrapper docutils container" id="id79">
24462447
<div class="code-block-caption"><span class="caption-text"><em>Calculate a 3-point weighted mean of the ‘X’ axis. Since
2447-
the the ‘X’ axis is cyclic, the mean wraps by default.</em></span><a class="headerlink" href="#id79" title="Link to this code"></a></div>
2448+
the ‘X’ axis is cyclic, the mean wraps by default.</em></span><a class="headerlink" href="#id79" title="Link to this code"></a></div>
24482449
<div class="highlight-python notranslate"><div class="highlight"><pre><span></span><span class="gp">&gt;&gt;&gt; </span><span class="n">q</span><span class="p">,</span> <span class="n">t</span> <span class="o">=</span> <span class="n">cf</span><span class="o">.</span><span class="n">read</span><span class="p">(</span><span class="s1">&#39;file.nc&#39;</span><span class="p">)</span>
24492450
<span class="gp">&gt;&gt;&gt; </span><span class="nb">print</span><span class="p">(</span><span class="n">q</span><span class="p">)</span>
24502451
<span class="go">Field: specific_humidity (ncvar%q)</span>
@@ -2517,7 +2518,7 @@ <h3><a class="toc-backref" href="#id113" role="doc-backlink">Convolution filters
25172518
<a class="reference internal" href="method/cf.Field.convolution_filter.html#cf.Field.convolution_filter" title="cf.Field.convolution_filter"><code class="xref py py-obj docutils literal notranslate"><span class="pre">convolution_filter</span></code></a> method of the field construct.</p>
25182519
<div class="literal-block-wrapper docutils container" id="id80">
25192520
<div class="code-block-caption"><span class="caption-text"><em>Calculate a 5-point mean of the ‘X’ axis with a
2520-
non-uniform window function. Since the the ‘X’ axis is
2521+
non-uniform window function. Since the ‘X’ axis is
25212522
cyclic, the convolution wraps by default.</em></span><a class="headerlink" href="#id80" title="Link to this code"></a></div>
25222523
<div class="highlight-python notranslate"><div class="highlight"><pre><span></span><span class="gp">&gt;&gt;&gt; </span><span class="nb">print</span><span class="p">(</span><span class="n">q</span><span class="p">)</span>
25232524
<span class="go">Field: specific_humidity (ncvar%q)</span>
@@ -2746,11 +2747,11 @@ <h3><a class="toc-backref" href="#id118" role="doc-backlink">Curl</a><a class="h
27462747
<div class="clearer"></div>
27472748
</div>
27482749
<div class="footer">
2749-
&copy;2025, NCAS | Page built on 2025-10-16.
2750+
&#169;2025, NCAS | Page built on 2025-10-29.
27502751

27512752
|
2752-
Powered by <a href="http://sphinx-doc.org/">Sphinx 7.4.7</a>
2753-
&amp; <a href="https://github.com/sphinx-doc/alabaster">Alabaster 0.7.14</a>
2753+
Powered by <a href="https://www.sphinx-doc.org/">Sphinx 7.3.7</a>
2754+
&amp; <a href="https://alabaster.readthedocs.io">Alabaster 0.7.16</a>
27542755

27552756
</div>
27562757

docs/field_analysis.html

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
<meta name="viewport" content="width=device-width, initial-scale=1.0" /><meta name="viewport" content="width=device-width, initial-scale=1" />
77

88
<title>Statistical collapses &#8212; Documentation</title>
9-
<link rel="stylesheet" type="text/css" href="_static/pygments.css?v=b3523f8e" />
10-
<link rel="stylesheet" type="text/css" href="_static/alabaster.css?v=541523b4" />
9+
<link rel="stylesheet" type="text/css" href="_static/pygments.css?v=61cd365c" />
10+
<link rel="stylesheet" type="text/css" href="_static/alabaster.css?v=a5d0ad34" />
1111
<link rel="stylesheet" type="text/css" href="_static/graphviz.css?v=fd3f3429" />
1212
<link rel="stylesheet" type="text/css" href="_static/copybutton.css?v=76b2166b" />
13-
<link rel="stylesheet" type="text/css" href="_static/sg_gallery.css?v=61a4c737" />
14-
<link rel="stylesheet" type="text/css" href="_static/sg_gallery-binder.css?v=ca3c1c84" />
15-
<link rel="stylesheet" type="text/css" href="_static/sg_gallery-dataframe.css?v=e5fbc548" />
13+
<link rel="stylesheet" type="text/css" href="_static/sg_gallery.css?v=d2d258e8" />
14+
<link rel="stylesheet" type="text/css" href="_static/sg_gallery-binder.css?v=f4aeca0c" />
15+
<link rel="stylesheet" type="text/css" href="_static/sg_gallery-dataframe.css?v=2082cf3c" />
1616
<link rel="stylesheet" type="text/css" href="_static/sg_gallery-rendered-html.css?v=1277b6f3" />
1717
<link rel="stylesheet" type="text/css" href="_static/customise-alabaster.css?v=5dec66a6" />
1818
<script src="_static/documentation_options.js?v=5318ce95"></script>
@@ -28,16 +28,17 @@
2828

2929
<link rel="stylesheet" href="_static/custom.css" type="text/css" />
3030

31+
32+
3133

32-
<meta name="viewport" content="width=device-width, initial-scale=0.9, maximum-scale=0.9" />
3334

3435
</head><body>
3536
<div class="document">
3637

37-
<div class="sphinxsidebar" role="navigation" aria-label="Main">
38+
<div class="sphinxsidebar" role="navigation" aria-label="main navigation">
3839
<div class="sphinxsidebarwrapper">
3940
<p class="logo"><a href="index.html">
40-
<img class="logo" src="_static/logo.svg" alt="Logo of Python cf package"/>
41+
<img class="logo" src="_static/logo.svg" alt="Logo"/>
4142
</a></p>
4243

4344

@@ -2352,7 +2353,7 @@ <h2>Moving windows<a class="headerlink" href="#moving-windows" title="Link to th
23522353
cell sizes (or custom weights) may applied to the calculation.</p>
23532354
<div class="literal-block-wrapper docutils container" id="id76">
23542355
<div class="code-block-caption"><span class="caption-text"><em>Calculate a 3-point weighted mean of the ‘X’ axis. Since
2355-
the the ‘X’ axis is cyclic, the mean wraps by default.</em></span><a class="headerlink" href="#id76" title="Link to this code"></a></div>
2356+
the ‘X’ axis is cyclic, the mean wraps by default.</em></span><a class="headerlink" href="#id76" title="Link to this code"></a></div>
23562357
<div class="highlight-python notranslate"><div class="highlight"><pre><span></span><span class="gp">&gt;&gt;&gt; </span><span class="n">q</span><span class="p">,</span> <span class="n">t</span> <span class="o">=</span> <span class="n">cf</span><span class="o">.</span><span class="n">read</span><span class="p">(</span><span class="s1">&#39;file.nc&#39;</span><span class="p">)</span>
23572358
<span class="gp">&gt;&gt;&gt; </span><span class="nb">print</span><span class="p">(</span><span class="n">q</span><span class="p">)</span>
23582359
<span class="go">Field: specific_humidity (ncvar%q)</span>
@@ -2425,7 +2426,7 @@ <h2>Convolution filters<a class="headerlink" href="#convolution-filters" title="
24252426
<a class="reference internal" href="method/cf.Field.convolution_filter.html#cf.Field.convolution_filter" title="cf.Field.convolution_filter"><code class="xref py py-obj docutils literal notranslate"><span class="pre">convolution_filter</span></code></a> method of the field construct.</p>
24262427
<div class="literal-block-wrapper docutils container" id="id77">
24272428
<div class="code-block-caption"><span class="caption-text"><em>Calculate a 5-point mean of the ‘X’ axis with a
2428-
non-uniform window function. Since the the ‘X’ axis is
2429+
non-uniform window function. Since the ‘X’ axis is
24292430
cyclic, the convolution wraps by default.</em></span><a class="headerlink" href="#id77" title="Link to this code"></a></div>
24302431
<div class="highlight-python notranslate"><div class="highlight"><pre><span></span><span class="gp">&gt;&gt;&gt; </span><span class="nb">print</span><span class="p">(</span><span class="n">q</span><span class="p">)</span>
24312432
<span class="go">Field: specific_humidity (ncvar%q)</span>
@@ -2653,11 +2654,11 @@ <h2>Curl<a class="headerlink" href="#curl" title="Link to this heading">¶</a></
26532654
<div class="clearer"></div>
26542655
</div>
26552656
<div class="footer">
2656-
&copy;2025, NCAS | Page built on 2025-10-16.
2657+
&#169;2025, NCAS | Page built on 2025-10-29.
26572658

26582659
|
2659-
Powered by <a href="http://sphinx-doc.org/">Sphinx 7.4.7</a>
2660-
&amp; <a href="https://github.com/sphinx-doc/alabaster">Alabaster 0.7.14</a>
2660+
Powered by <a href="https://www.sphinx-doc.org/">Sphinx 7.3.7</a>
2661+
&amp; <a href="https://alabaster.readthedocs.io">Alabaster 0.7.16</a>
26612662

26622663
</div>
26632664

0 commit comments

Comments
 (0)