Skip to content

Commit

Permalink
deploy: 262f759
Browse files Browse the repository at this point in the history
  • Loading branch information
JoerivanEngelen committed Jul 17, 2023
1 parent 14dd2a4 commit 01f3b83
Show file tree
Hide file tree
Showing 34 changed files with 350 additions and 339 deletions.
2 changes: 1 addition & 1 deletion .buildinfo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
config: 51b00bc5cf129f0cdb92ff41214df90d
config: 57e5d8f111e99969288ecac88b45fbc0
tags: 645f666f9bcd5a90fca523b33c5a78b7
3 changes: 1 addition & 2 deletions _modules/xugrid/plot/plot.html
Original file line number Diff line number Diff line change
Expand Up @@ -965,7 +965,6 @@ <h1>Source code for xugrid.plot.plot</h1><div class="highlight"><pre>
<span class="sd"> **kwargs : optional</span>
<span class="sd"> Additional keyword arguments for Matplotlib.</span>
<span class="sd"> &quot;&quot;&quot;</span>
<span class="n">darray</span> <span class="o">=</span> <span class="n">darray</span><span class="o">.</span><span class="n">squeeze</span><span class="p">()</span><span class="o">.</span><span class="n">compute</span><span class="p">()</span>

<span class="n">dim</span> <span class="o">=</span> <span class="n">darray</span><span class="o">.</span><span class="n">dims</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span>
<span class="n">kwargs</span><span class="p">[</span><span class="s2">&quot;ax&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">ax</span>
Expand Down Expand Up @@ -1011,7 +1010,7 @@ <h1>Source code for xugrid.plot.plot</h1><div class="highlight"><pre>
<span class="p">)</span>

<span class="bp">self</span><span class="o">.</span><span class="n">grid</span> <span class="o">=</span> <span class="n">grid</span>
<span class="bp">self</span><span class="o">.</span><span class="n">darray</span> <span class="o">=</span> <span class="n">darray</span>
<span class="bp">self</span><span class="o">.</span><span class="n">darray</span> <span class="o">=</span> <span class="n">darray</span><span class="o">.</span><span class="n">squeeze</span><span class="p">()</span><span class="o">.</span><span class="n">compute</span><span class="p">()</span>

<span class="k">def</span> <span class="fm">__call__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="o">**</span><span class="n">kwargs</span><span class="p">):</span>
<span class="k">return</span> <span class="n">plot</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">grid</span><span class="p">,</span> <span class="bp">self</span><span class="o">.</span><span class="n">darray</span><span class="p">,</span> <span class="o">**</span><span class="n">kwargs</span><span class="p">)</span>
Expand Down
19 changes: 8 additions & 11 deletions _modules/xugrid/regrid/regridder.html
Original file line number Diff line number Diff line change
Expand Up @@ -392,10 +392,8 @@ <h1>Source code for xugrid.regrid.regridder</h1><div class="highlight"><pre>
<span class="kn">import</span> <span class="nn">dask.array</span>

<span class="n">DaskArray</span> <span class="o">=</span> <span class="n">dask</span><span class="o">.</span><span class="n">array</span><span class="o">.</span><span class="n">Array</span>
<span class="n">DaskRechunk</span> <span class="o">=</span> <span class="n">dask</span><span class="o">.</span><span class="n">array</span><span class="o">.</span><span class="n">rechunk</span>
<span class="k">except</span> <span class="ne">ImportError</span><span class="p">:</span>
<span class="n">DaskArray</span> <span class="o">=</span> <span class="p">()</span>
<span class="n">DaskRechunk</span> <span class="o">=</span> <span class="p">()</span>

<span class="kn">import</span> <span class="nn">xugrid</span>
<span class="kn">from</span> <span class="nn">xugrid.constants</span> <span class="kn">import</span> <span class="n">FloatArray</span>
Expand Down Expand Up @@ -523,12 +521,8 @@ <h1>Source code for xugrid.regrid.regridder</h1><div class="highlight"><pre>
<span class="n">source</span> <span class="o">=</span> <span class="n">source</span><span class="o">.</span><span class="n">reshape</span><span class="p">((</span><span class="o">-</span><span class="mi">1</span><span class="p">,</span> <span class="n">source_grid</span><span class="o">.</span><span class="n">size</span><span class="p">))</span>

<span class="n">size</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">_target</span><span class="o">.</span><span class="n">size</span>

<span class="k">if</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">source</span><span class="p">,</span> <span class="n">DaskArray</span><span class="p">):</span>
<span class="c1"># for DaskArray&#39;s from multiple partitions, rechunk first to single size per dimension</span>
<span class="c1"># for now always rechunk, could be optional only when explicit chunks in single dimension</span>
<span class="n">source</span> <span class="o">=</span> <span class="n">DaskRechunk</span><span class="p">(</span><span class="n">source</span><span class="p">,</span> <span class="n">source</span><span class="o">.</span><span class="n">shape</span><span class="p">)</span>
<span class="n">chunks</span> <span class="o">=</span> <span class="n">source</span><span class="o">.</span><span class="n">chunks</span><span class="p">[:</span> <span class="o">-</span><span class="n">source_grid</span><span class="o">.</span><span class="n">ndim</span><span class="p">]</span> <span class="o">+</span> <span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">_target</span><span class="o">.</span><span class="n">shape</span><span class="p">)</span>
<span class="n">chunks</span> <span class="o">=</span> <span class="n">source</span><span class="o">.</span><span class="n">chunks</span><span class="p">[:</span> <span class="o">-</span><span class="n">source_grid</span><span class="o">.</span><span class="n">ndim</span><span class="p">]</span> <span class="o">+</span> <span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">_target</span><span class="o">.</span><span class="n">shape</span><span class="p">,)</span>
<span class="n">out</span> <span class="o">=</span> <span class="n">dask</span><span class="o">.</span><span class="n">array</span><span class="o">.</span><span class="n">map_blocks</span><span class="p">(</span>
<span class="bp">self</span><span class="o">.</span><span class="n">_regrid</span><span class="p">,</span> <span class="c1"># func</span>
<span class="n">source</span><span class="p">,</span> <span class="c1"># *args</span>
Expand All @@ -538,16 +532,14 @@ <h1>Source code for xugrid.regrid.regridder</h1><div class="highlight"><pre>
<span class="n">chunks</span><span class="o">=</span><span class="n">chunks</span><span class="p">,</span>
<span class="n">meta</span><span class="o">=</span><span class="n">np</span><span class="o">.</span><span class="n">array</span><span class="p">((),</span> <span class="n">dtype</span><span class="o">=</span><span class="n">source</span><span class="o">.</span><span class="n">dtype</span><span class="p">),</span>
<span class="p">)</span>
<span class="c1"># TODO: for now we compute first, since .reshape and dask.array.reshape</span>
<span class="c1"># does not reshapes the underlying data somehow. This need to be evaluated.</span>
<span class="n">out</span> <span class="o">=</span> <span class="n">out</span><span class="o">.</span><span class="n">compute</span><span class="p">()</span>
<span class="k">elif</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">source</span><span class="p">,</span> <span class="n">np</span><span class="o">.</span><span class="n">ndarray</span><span class="p">):</span>
<span class="n">out</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">_regrid</span><span class="p">(</span><span class="n">source</span><span class="p">,</span> <span class="bp">self</span><span class="o">.</span><span class="n">_weights</span><span class="p">,</span> <span class="n">size</span><span class="p">)</span>
<span class="k">else</span><span class="p">:</span>
<span class="k">raise</span> <span class="ne">TypeError</span><span class="p">(</span>
<span class="s2">&quot;Expected dask.array.Array or numpy.ndarray. Received: &quot;</span>
<span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="nb">type</span><span class="p">(</span><span class="n">source</span><span class="p">)</span><span class="o">.</span><span class="vm">__name__</span><span class="si">}</span><span class="s2">&quot;</span>
<span class="p">)</span>

<span class="c1"># E.g.: sizes of (&quot;time&quot;, &quot;layer&quot;) + (&quot;y&quot;, &quot;x&quot;)</span>
<span class="n">out_shape</span> <span class="o">=</span> <span class="n">first_dims_shape</span> <span class="o">+</span> <span class="bp">self</span><span class="o">.</span><span class="n">_target</span><span class="o">.</span><span class="n">shape</span>
<span class="k">return</span> <span class="n">out</span><span class="o">.</span><span class="n">reshape</span><span class="p">(</span><span class="n">out_shape</span><span class="p">)</span>
Expand Down Expand Up @@ -588,7 +580,12 @@ <h1>Source code for xugrid.regrid.regridder</h1><div class="highlight"><pre>
<span class="k">if</span> <span class="nb">type</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">_target</span><span class="p">)</span> <span class="ow">is</span> <span class="n">StructuredGrid2d</span><span class="p">:</span>
<span class="n">source_dims</span> <span class="o">=</span> <span class="p">(</span><span class="s2">&quot;y&quot;</span><span class="p">,</span> <span class="s2">&quot;x&quot;</span><span class="p">)</span>
<span class="n">regridded</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">regrid_dataarray</span><span class="p">(</span><span class="nb">object</span><span class="p">,</span> <span class="n">source_dims</span><span class="p">)</span>
<span class="n">regridded</span> <span class="o">=</span> <span class="n">regridded</span><span class="o">.</span><span class="n">assign_coords</span><span class="p">(</span><span class="n">coords</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">_target</span><span class="o">.</span><span class="n">coords</span><span class="p">)</span>
<span class="n">regridded</span> <span class="o">=</span> <span class="n">regridded</span><span class="o">.</span><span class="n">assign_coords</span><span class="p">(</span>
<span class="n">coords</span><span class="o">=</span><span class="p">{</span>
<span class="s2">&quot;y&quot;</span><span class="p">:</span> <span class="n">np</span><span class="o">.</span><span class="n">flip</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">_target</span><span class="o">.</span><span class="n">ybounds</span><span class="o">.</span><span class="n">midpoints</span><span class="p">),</span>
<span class="s2">&quot;x&quot;</span><span class="p">:</span> <span class="bp">self</span><span class="o">.</span><span class="n">_target</span><span class="o">.</span><span class="n">xbounds</span><span class="o">.</span><span class="n">midpoints</span><span class="p">,</span>
<span class="p">}</span>
<span class="p">)</span>
<span class="k">return</span> <span class="n">regridded</span>
<span class="k">else</span><span class="p">:</span>
<span class="n">source_dims</span> <span class="o">=</span> <span class="p">(</span><span class="nb">object</span><span class="o">.</span><span class="n">ugrid</span><span class="o">.</span><span class="n">grid</span><span class="o">.</span><span class="n">face_dimension</span><span class="p">,)</span>
Expand Down
12 changes: 9 additions & 3 deletions _sources/changelog.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,21 @@ The format is based on `Keep a Changelog`_, and this project adheres to
Unreleased
----------

Fixed
~~~~~

- Computing indexer to avoid dask array of unknown shape upon plotting.
See `#117 <https://github.com/Deltares/xugrid/issues/117>`_.


[0.6.1] 2023-07-07
------------------

Fixed
~~~~~

- fillvalue was not properly replaced in cast.
See `#113 <https://github.com/Deltares/xugrid/issues/113>`_,
which was introduced by fixing `#101 <https://github.com/Deltares/xugrid/issues/101>`_.
- Fillvalue was not properly replaced in cast.
See `#113 <https://github.com/Deltares/xugrid/issues/113>`_.


[0.6.0] 2023-07-05
Expand Down
4 changes: 2 additions & 2 deletions _sources/examples-dev/sg_execution_times.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

Computation times
=================
**00:01.786** total execution time for **examples-dev** files:
**00:01.929** total execution time for **examples-dev** files:

+----------------------------------------------------------+-----------+--------+
| :ref:`sphx_glr_examples-dev_voronoi.py` (``voronoi.py``) | 00:01.786 | 0.0 MB |
| :ref:`sphx_glr_examples-dev_voronoi.py` (``voronoi.py``) | 00:01.929 | 0.0 MB |
+----------------------------------------------------------+-----------+--------+
2 changes: 1 addition & 1 deletion _sources/examples-dev/voronoi.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -630,7 +630,7 @@ The figure shows:
.. rst-class:: sphx-glr-timing

**Total running time of the script:** ( 0 minutes 1.786 seconds)
**Total running time of the script:** ( 0 minutes 1.929 seconds)


.. _sphx_glr_download_examples-dev_voronoi.py:
Expand Down
24 changes: 12 additions & 12 deletions _sources/examples/connectivity.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ By default, the border value for binary erosion is set to ``False`` (equal to
.. code-block:: none
<matplotlib.collections.PolyCollection object at 0x7ff7e21e1bb0>
<matplotlib.collections.PolyCollection object at 0x7f000cd20be0>
Expand Down Expand Up @@ -165,7 +165,7 @@ start by setting a single value in the center of the grid to ``True``.
.. code-block:: none
<matplotlib.collections.PolyCollection object at 0x7ff7e3adb430>
<matplotlib.collections.PolyCollection object at 0x7f000e1b60d0>
Expand Down Expand Up @@ -200,7 +200,7 @@ alternative border value:
.. code-block:: none
<matplotlib.collections.PolyCollection object at 0x7ff7e31103d0>
<matplotlib.collections.PolyCollection object at 0x7f000f2bbb50>
Expand Down Expand Up @@ -238,7 +238,7 @@ analyse connected parts of the mesh.
.. code-block:: none
<matplotlib.collections.PolyCollection object at 0x7ff7e2d2bfd0>
<matplotlib.collections.PolyCollection object at 0x7f000d7bf490>
Expand Down Expand Up @@ -272,7 +272,7 @@ Tesselation.
.. code-block:: none
<matplotlib.collections.LineCollection object at 0x7ff7e31cdfd0>
<matplotlib.collections.LineCollection object at 0x7f000cd83b50>
Expand Down Expand Up @@ -316,7 +316,7 @@ the original.
.. code-block:: none
<matplotlib.collections.LineCollection object at 0x7ff7e3bee940>
<matplotlib.collections.LineCollection object at 0x7f00175165e0>
Expand Down Expand Up @@ -355,7 +355,7 @@ We can break down one of the Voronoi tesselations from above into triangles:
.. code-block:: none
<matplotlib.collections.LineCollection object at 0x7ff7e34b5bb0>
<matplotlib.collections.LineCollection object at 0x7f000da32fd0>
Expand Down Expand Up @@ -409,7 +409,7 @@ the upper and lower parts:
.. code-block:: none
<matplotlib.collections.LineCollection object at 0x7ff7e2c6cc10>
<matplotlib.collections.LineCollection object at 0x7f00177fd0d0>
Expand Down Expand Up @@ -439,7 +439,7 @@ We can now use Laplace interpolation to fill the gaps in the grid.
.. code-block:: none
<matplotlib.collections.PolyCollection object at 0x7ff7e2fd5370>
<matplotlib.collections.PolyCollection object at 0x7f000d8fb850>
Expand Down Expand Up @@ -480,7 +480,7 @@ To illustrate, let's take a look at the connectivity matrix of the Xoxo grid.
.. code-block:: none
<matplotlib.image.AxesImage object at 0x7ff7ec8e2d60>
<matplotlib.image.AxesImage object at 0x7f001747cfd0>
Expand Down Expand Up @@ -516,14 +516,14 @@ locality:
.. code-block:: none
<matplotlib.image.AxesImage object at 0x7ff7e3275940>
<matplotlib.image.AxesImage object at 0x7f000de103a0>
.. rst-class:: sphx-glr-timing

**Total running time of the script:** ( 0 minutes 1.835 seconds)
**Total running time of the script:** ( 0 minutes 1.980 seconds)


.. _sphx_glr_download_examples_connectivity.py:
Expand Down
10 changes: 5 additions & 5 deletions _sources/examples/overlap_regridder.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ some bathymetry) of the Netherlands, and a coarser target grid.
.. code-block:: none
<matplotlib.collections.LineCollection object at 0x7ff7e2dd4cd0>
<matplotlib.collections.LineCollection object at 0x7f000d8101f0>
Expand Down Expand Up @@ -204,7 +204,7 @@ conservative methods, such as conductance:
.. code-block:: none
<matplotlib.collections.PolyCollection object at 0x7ff7e2316b80>
<matplotlib.collections.PolyCollection object at 0x7f000d965340>
Expand Down Expand Up @@ -282,7 +282,7 @@ To use our custom method, we provide at initialization of the OverlapRegridder:
.. code-block:: none
<matplotlib.collections.PolyCollection object at 0x7ff7e3a67e20>
<matplotlib.collections.PolyCollection object at 0x7f001766c760>
Expand Down Expand Up @@ -322,7 +322,7 @@ function can deal with NaN values! -- hence ``nanpercentile`` rather than
.. code-block:: none
<matplotlib.collections.PolyCollection object at 0x7ff7e3ccd910>
<matplotlib.collections.PolyCollection object at 0x7f000e6d4130>
Expand All @@ -333,7 +333,7 @@ function can deal with NaN values! -- hence ``nanpercentile`` rather than

.. rst-class:: sphx-glr-timing

**Total running time of the script:** ( 0 minutes 5.416 seconds)
**Total running time of the script:** ( 0 minutes 6.162 seconds)


.. _sphx_glr_download_examples_overlap_regridder.py:
Expand Down
Loading

0 comments on commit 01f3b83

Please sign in to comment.