From 01f3b83926a48949146a45ce35bed82749981ace Mon Sep 17 00:00:00 2001 From: JoerivanEngelen Date: Mon, 17 Jul 2023 08:54:26 +0000 Subject: [PATCH] deploy: 262f759abf0667da2b2278fb208ced119a0a3c06 --- .buildinfo | 2 +- _modules/xugrid/plot/plot.html | 3 +- _modules/xugrid/regrid/regridder.html | 19 +- _sources/changelog.rst.txt | 12 +- .../examples-dev/sg_execution_times.rst.txt | 4 +- _sources/examples-dev/voronoi.rst.txt | 2 +- _sources/examples/connectivity.rst.txt | 24 +- _sources/examples/overlap_regridder.rst.txt | 10 +- _sources/examples/partitioning.rst.txt | 18 +- _sources/examples/plotting.rst.txt | 32 +-- _sources/examples/quick_overview.rst.txt | 48 ++-- _sources/examples/regridder_overview.rst.txt | 34 +-- _sources/examples/sg_execution_times.rst.txt | 14 +- _sources/sample_data/adh_san_diego.rst.txt | 4 +- _sources/sample_data/disk.rst.txt | 4 +- _sources/sample_data/elevation_nl.rst.txt | 4 +- .../sample_data/sg_execution_times.rst.txt | 10 +- _sources/sample_data/xoxo.rst.txt | 2 +- changelog.html | 227 +++++++++--------- examples-dev/sg_execution_times.html | 4 +- examples-dev/voronoi.html | 2 +- examples/connectivity.html | 24 +- examples/overlap_regridder.html | 10 +- examples/partitioning.html | 18 +- examples/plotting.html | 32 +-- examples/quick_overview.html | 48 ++-- examples/regridder_overview.html | 34 +-- examples/sg_execution_times.html | 18 +- sample_data/adh_san_diego.html | 4 +- sample_data/disk.html | 4 +- sample_data/elevation_nl.html | 4 +- sample_data/sg_execution_times.html | 10 +- sample_data/xoxo.html | 2 +- searchindex.js | 2 +- 34 files changed, 350 insertions(+), 339 deletions(-) diff --git a/.buildinfo b/.buildinfo index e46c4cd49..52ddac0fa 100644 --- a/.buildinfo +++ b/.buildinfo @@ -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 diff --git a/_modules/xugrid/plot/plot.html b/_modules/xugrid/plot/plot.html index a93d180cc..a00f16358 100644 --- a/_modules/xugrid/plot/plot.html +++ b/_modules/xugrid/plot/plot.html @@ -965,7 +965,6 @@

Source code for xugrid.plot.plot

     **kwargs : optional
         Additional keyword arguments for Matplotlib.
     """
-    darray = darray.squeeze().compute()
 
     dim = darray.dims[0]
     kwargs["ax"] = ax
@@ -1011,7 +1010,7 @@ 

Source code for xugrid.plot.plot

             )
 
         self.grid = grid
-        self.darray = darray
+        self.darray = darray.squeeze().compute()
 
     def __call__(self, **kwargs):
         return plot(self.grid, self.darray, **kwargs)
diff --git a/_modules/xugrid/regrid/regridder.html b/_modules/xugrid/regrid/regridder.html
index 3b139e8e6..386ac4e11 100644
--- a/_modules/xugrid/regrid/regridder.html
+++ b/_modules/xugrid/regrid/regridder.html
@@ -392,10 +392,8 @@ 

Source code for xugrid.regrid.regridder

     import dask.array
 
     DaskArray = dask.array.Array
-    DaskRechunk = dask.array.rechunk
 except ImportError:
     DaskArray = ()
-    DaskRechunk = ()
 
 import xugrid
 from xugrid.constants import FloatArray
@@ -523,12 +521,8 @@ 

Source code for xugrid.regrid.regridder

         source = source.reshape((-1, source_grid.size))
 
         size = self._target.size
-
         if isinstance(source, DaskArray):
-            # for DaskArray's from multiple partitions, rechunk first to single size per dimension
-            # for now always rechunk, could be optional only when explicit chunks in single dimension
-            source = DaskRechunk(source, source.shape)
-            chunks = source.chunks[: -source_grid.ndim] + (self._target.shape)
+            chunks = source.chunks[: -source_grid.ndim] + (self._target.shape,)
             out = dask.array.map_blocks(
                 self._regrid,  # func
                 source,  # *args
@@ -538,9 +532,6 @@ 

Source code for xugrid.regrid.regridder

                 chunks=chunks,
                 meta=np.array((), dtype=source.dtype),
             )
-            # TODO: for now we compute first, since .reshape and  dask.array.reshape
-            # does not reshapes the underlying data somehow. This need to be evaluated.
-            out = out.compute()
         elif isinstance(source, np.ndarray):
             out = self._regrid(source, self._weights, size)
         else:
@@ -548,6 +539,7 @@ 

Source code for xugrid.regrid.regridder

                 "Expected dask.array.Array or numpy.ndarray. Received: "
                 f"{type(source).__name__}"
             )
+
         # E.g.: sizes of ("time", "layer") + ("y", "x")
         out_shape = first_dims_shape + self._target.shape
         return out.reshape(out_shape)
@@ -588,7 +580,12 @@ 

Source code for xugrid.regrid.regridder

         if type(self._target) is StructuredGrid2d:
             source_dims = ("y", "x")
             regridded = self.regrid_dataarray(object, source_dims)
-            regridded = regridded.assign_coords(coords=self._target.coords)
+            regridded = regridded.assign_coords(
+                coords={
+                    "y": np.flip(self._target.ybounds.midpoints),
+                    "x": self._target.xbounds.midpoints,
+                }
+            )
             return regridded
         else:
             source_dims = (object.ugrid.grid.face_dimension,)
diff --git a/_sources/changelog.rst.txt b/_sources/changelog.rst.txt
index 2b17c1344..c88eae083 100644
--- a/_sources/changelog.rst.txt
+++ b/_sources/changelog.rst.txt
@@ -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 `_.
+
+
 [0.6.1] 2023-07-07
 ------------------
 
 Fixed
 ~~~~~
 
-- fillvalue was not properly replaced in cast.
-  See `#113 `_,
-  which was introduced by fixing `#101 `_. 
+- Fillvalue was not properly replaced in cast.
+  See `#113 `_. 
 
 
 [0.6.0] 2023-07-05
diff --git a/_sources/examples-dev/sg_execution_times.rst.txt b/_sources/examples-dev/sg_execution_times.rst.txt
index 6b7e21d9f..fcf77150f 100644
--- a/_sources/examples-dev/sg_execution_times.rst.txt
+++ b/_sources/examples-dev/sg_execution_times.rst.txt
@@ -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 |
 +----------------------------------------------------------+-----------+--------+
diff --git a/_sources/examples-dev/voronoi.rst.txt b/_sources/examples-dev/voronoi.rst.txt
index 1d74f20fd..2a945ccad 100644
--- a/_sources/examples-dev/voronoi.rst.txt
+++ b/_sources/examples-dev/voronoi.rst.txt
@@ -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:
diff --git a/_sources/examples/connectivity.rst.txt b/_sources/examples/connectivity.rst.txt
index 22a5d53e3..e18c56a53 100644
--- a/_sources/examples/connectivity.rst.txt
+++ b/_sources/examples/connectivity.rst.txt
@@ -129,7 +129,7 @@ By default, the border value for binary erosion is set to ``False`` (equal to
  .. code-block:: none
 
 
-    
+    
 
 
 
@@ -165,7 +165,7 @@ start by setting a single value in the center of the grid to ``True``.
  .. code-block:: none
 
 
-    
+    
 
 
 
@@ -200,7 +200,7 @@ alternative border value:
  .. code-block:: none
 
 
-    
+    
 
 
 
@@ -238,7 +238,7 @@ analyse connected parts of the mesh.
  .. code-block:: none
 
 
-    
+    
 
 
 
@@ -272,7 +272,7 @@ Tesselation.
  .. code-block:: none
 
 
-    
+    
 
 
 
@@ -316,7 +316,7 @@ the original.
  .. code-block:: none
 
 
-    
+    
 
 
 
@@ -355,7 +355,7 @@ We can break down one of the Voronoi tesselations from above into triangles:
  .. code-block:: none
 
 
-    
+    
 
 
 
@@ -409,7 +409,7 @@ the upper and lower parts:
  .. code-block:: none
 
 
-    
+    
 
 
 
@@ -439,7 +439,7 @@ We can now use Laplace interpolation to fill the gaps in the grid.
  .. code-block:: none
 
 
-    
+    
 
 
 
@@ -480,7 +480,7 @@ To illustrate, let's take a look at the connectivity matrix of the Xoxo grid.
  .. code-block:: none
 
 
-    
+    
 
 
 
@@ -516,14 +516,14 @@ locality:
  .. code-block:: none
 
 
-    
+    
 
 
 
 
 .. 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:
diff --git a/_sources/examples/overlap_regridder.rst.txt b/_sources/examples/overlap_regridder.rst.txt
index 370cb3cd8..84773c43a 100644
--- a/_sources/examples/overlap_regridder.rst.txt
+++ b/_sources/examples/overlap_regridder.rst.txt
@@ -114,7 +114,7 @@ some bathymetry) of the Netherlands, and a coarser target grid.
  .. code-block:: none
 
 
-    
+    
 
 
 
@@ -204,7 +204,7 @@ conservative methods, such as conductance:
  .. code-block:: none
 
 
-    
+    
 
 
 
@@ -282,7 +282,7 @@ To use our custom method, we provide at initialization of the OverlapRegridder:
  .. code-block:: none
 
 
-    
+    
 
 
 
@@ -322,7 +322,7 @@ function can deal with NaN values! -- hence ``nanpercentile`` rather than
  .. code-block:: none
 
 
-    
+    
 
 
 
@@ -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:
diff --git a/_sources/examples/partitioning.rst.txt b/_sources/examples/partitioning.rst.txt
index 1f9845638..38cc72e0a 100644
--- a/_sources/examples/partitioning.rst.txt
+++ b/_sources/examples/partitioning.rst.txt
@@ -76,7 +76,7 @@ into several parts.
  .. code-block:: none
 
 
-    
+    
 
 
 
@@ -145,7 +145,7 @@ We can easily plot this data to visualize the partitions:
  .. code-block:: none
 
 
-    
+    
 
 
 
@@ -213,7 +213,7 @@ merge these partitions back into one whole for post-processing:
  .. code-block:: none
 
 
-    
+    
 
 
 
@@ -275,7 +275,7 @@ data:
  .. code-block:: none
 
 
-    
+    
 
 
 
@@ -667,7 +667,7 @@ Note that partioning and merging does not preserve order!
     
<xarray.DataArray 'elevation' (mesh2d_nFaces: 5248)>
     array([False, False, False, ..., False, False, False])
     Coordinates:
-      * mesh2d_nFaces  (mesh2d_nFaces) int64 0 1 2 3 4 ... 5243 5244 5245 5246 5247
+ * mesh2d_nFaces (mesh2d_nFaces) int64 0 1 2 3 4 ... 5243 5244 5245 5246 5247


@@ -1071,9 +1071,9 @@ reorder the data after merging. Coordinates: mesh2d_face_x (mesh2d_nFaces) float64 2.388e+04 1.86e+05 ... 3.03e+04 mesh2d_face_y (mesh2d_nFaces) float64 3.648e+05 4.171e+05 ... 3.964e+05 - * mesh2d_nFaces (mesh2d_nFaces) int64 0 1 2 3 4 ... 5243 5244 5245 5246 5247
+ * mesh2d_nFaces (mesh2d_nFaces) int64 0 1 2 3 4 ... 5243 5244 5245 5246 5247


@@ -1090,7 +1090,7 @@ partitions. .. rst-class:: sphx-glr-timing - **Total running time of the script:** ( 0 minutes 5.430 seconds) + **Total running time of the script:** ( 0 minutes 6.102 seconds) .. _sphx_glr_download_examples_partitioning.py: diff --git a/_sources/examples/plotting.rst.txt b/_sources/examples/plotting.rst.txt index b12f6bfa6..18e433359 100644 --- a/_sources/examples/plotting.rst.txt +++ b/_sources/examples/plotting.rst.txt @@ -451,12 +451,12 @@ faces. Dimensions: (mesh2d_nNodes: 217, mesh2d_nFaces: 384, mesh2d_nEdges: 600) Coordinates: * mesh2d_nEdges (mesh2d_nEdges) int64 0 1 2 3 4 5 ... 594 595 596 597 598 599 - * mesh2d_nFaces (mesh2d_nFaces) int64 0 1 2 3 4 5 ... 378 379 380 381 382 383 * mesh2d_nNodes (mesh2d_nNodes) int64 0 1 2 3 4 5 ... 211 212 213 214 215 216 + * mesh2d_nFaces (mesh2d_nFaces) int64 0 1 2 3 4 5 ... 378 379 380 381 382 383 Data variables: node_z (mesh2d_nNodes) float64 1.933 2.091 1.875 ... 5.688 7.491 face_z (mesh2d_nFaces) float64 1.737 1.918 2.269 ... 5.408 6.424 - edge_z (mesh2d_nEdges) float64 1.989 1.875 1.8 ... 3.929 4.909 6.544
    • mesh2d_nEdges
      PandasIndex
      PandasIndex(RangeIndex(start=0, stop=600, step=1, name='mesh2d_nEdges'))
    • mesh2d_nNodes
      PandasIndex
      PandasIndex(RangeIndex(start=0, stop=217, step=1, name='mesh2d_nNodes'))
    • mesh2d_nFaces
      PandasIndex
      PandasIndex(RangeIndex(start=0, stop=384, step=1, name='mesh2d_nFaces'))


  • @@ -611,7 +611,7 @@ Dataset and calling the :py:meth:`UgridDataArray.ugrid.plot()` method. .. code-block:: none - + @@ -646,7 +646,7 @@ the edges results in a different kind of plot: .. code-block:: none - + @@ -688,7 +688,7 @@ We can put them side by side to illustrate the differences: .. code-block:: none - + @@ -718,7 +718,7 @@ filled contours for data associated with the face dimension: .. code-block:: none - + @@ -749,7 +749,7 @@ We can also overlay this data with the edges: .. code-block:: none - + @@ -824,7 +824,7 @@ All these (2D) plots are illustrated here for completeness' sake: .. code-block:: none - + @@ -857,7 +857,7 @@ The ``surface`` methods generate 3D surface plots: .. code-block:: none - + @@ -891,7 +891,7 @@ used: .. code-block:: none - + @@ -927,7 +927,7 @@ take an xarray DataArray and a xugrid grid as arguments. .. code-block:: none - + @@ -963,14 +963,14 @@ somewhere in the unstructured topology, and plot the resulting timeseries: .. code-block:: none - [] + [] .. rst-class:: sphx-glr-timing - **Total running time of the script:** ( 0 minutes 15.472 seconds) + **Total running time of the script:** ( 0 minutes 17.264 seconds) .. _sphx_glr_download_examples_plotting.py: diff --git a/_sources/examples/quick_overview.rst.txt b/_sources/examples/quick_overview.rst.txt index 67119e60d..c01940f2c 100644 --- a/_sources/examples/quick_overview.rst.txt +++ b/_sources/examples/quick_overview.rst.txt @@ -464,7 +464,7 @@ We'll start by fetching a dataset: elevation (node) float64 ... depth (time, node) float64 ... mesh2d int32 ... - face_node_connectivity (face, nmax_face) float64 ...


  • @@ -919,7 +919,7 @@ separate the variables: node_y (node) float64 ... Data variables: elevation (node) float64 ... - depth (time, node) float64 ...


  • @@ -1361,7 +1361,7 @@ We can then grab one of the data variables as usual for xarray: Coordinates: * node (node) int64 0 1 2 3 4 5 6 7 ... 9133 9134 9135 9136 9137 9138 9139 node_x (node) float64 ... - node_y (node) float64 ... + node_y (node) float64 ...

    @@ -1771,7 +1771,7 @@ some data by hand here:
    <xarray.DataArray (mesh2d_nFaces: 2)>
         array([1., 2.])
         Coordinates:
    -      * mesh2d_nFaces  (mesh2d_nFaces) int64 0 1
    + * mesh2d_nFaces (mesh2d_nFaces) int64 0 1

    @@ -1809,7 +1809,7 @@ Plotting .. code-block:: none - + @@ -1860,7 +1860,7 @@ To select based on the topology, use the ``.ugrid`` attribute: .. code-block:: none - + @@ -2258,7 +2258,7 @@ Computation on DataArrays is unchanged from xarray:
    <xarray.DataArray (mesh2d_nFaces: 2)>
         array([11., 12.])
         Coordinates:
    -      * mesh2d_nFaces  (mesh2d_nFaces) int64 0 1
    + * mesh2d_nFaces (mesh2d_nFaces) int64 0 1

    @@ -2720,7 +2720,7 @@ Conversion from Geopandas is easy too: Coordinates: * mesh2d_nFaces (mesh2d_nFaces) int64 0 1 Data variables: - test (mesh2d_nFaces) float64 1.0 2.0 + test (mesh2d_nFaces) float64 1.0 2.0

    @@ -3117,12 +3117,12 @@ grid (nodes, faces, edges). Dimensions: (mesh2d_nNodes: 217, mesh2d_nFaces: 384, mesh2d_nEdges: 600) Coordinates: * mesh2d_nEdges (mesh2d_nEdges) int64 0 1 2 3 4 5 ... 594 595 596 597 598 599 - * mesh2d_nFaces (mesh2d_nFaces) int64 0 1 2 3 4 5 ... 378 379 380 381 382 383 * mesh2d_nNodes (mesh2d_nNodes) int64 0 1 2 3 4 5 ... 211 212 213 214 215 216 + * mesh2d_nFaces (mesh2d_nFaces) int64 0 1 2 3 4 5 ... 378 379 380 381 382 383 Data variables: node_z (mesh2d_nNodes) float64 1.933 2.091 1.875 ... 5.688 7.491 face_z (mesh2d_nFaces) float64 1.737 1.918 2.269 ... 5.408 6.424 - edge_z (mesh2d_nEdges) float64 1.989 1.875 1.8 ... 3.929 4.909 6.544
    • mesh2d_nEdges
      PandasIndex
      PandasIndex(RangeIndex(start=0, stop=600, step=1, name='mesh2d_nEdges'))
    • mesh2d_nNodes
      PandasIndex
      PandasIndex(RangeIndex(start=0, stop=217, step=1, name='mesh2d_nNodes'))
    • mesh2d_nFaces
      PandasIndex
      PandasIndex(RangeIndex(start=0, stop=384, step=1, name='mesh2d_nFaces'))


  • @@ -3634,7 +3634,7 @@ a grid object:
    <xarray.Dataset>
         Dimensions:  ()
         Data variables:
    -        *empty*
    + *empty*

    @@ -4029,7 +4029,7 @@ We can then add variables one-by-one, as we might with an xarray Dataset: node_x (node) float64 ... node_y (node) float64 ... Data variables: - elevation (node) float64 ... + elevation (node) float64 ...

    @@ -4434,7 +4434,7 @@ before writing. elevation (node) float64 ... depth (time, node) float64 ... Attributes: - Conventions: CF-1.8 UGRID-1.0
  • Conventions :
    CF-1.8 UGRID-1.0


  • @@ -4495,7 +4495,7 @@ before writing. .. rst-class:: sphx-glr-timing - **Total running time of the script:** ( 0 minutes 0.739 seconds) + **Total running time of the script:** ( 0 minutes 0.882 seconds) .. _sphx_glr_download_examples_quick_overview.py: diff --git a/_sources/examples/regridder_overview.rst.txt b/_sources/examples/regridder_overview.rst.txt index 1b9b96f3f..54791d81b 100644 --- a/_sources/examples/regridder_overview.rst.txt +++ b/_sources/examples/regridder_overview.rst.txt @@ -79,7 +79,7 @@ elevation of the Netherlands. .. code-block:: none - + @@ -153,7 +153,7 @@ the centroids of the new grid fall. .. code-block:: none - + @@ -184,7 +184,7 @@ Rexgrid provides the CentroidLocatorRegridder for this: .. code-block:: none - + @@ -219,7 +219,7 @@ so large. Let's try the OverlapOverregridder instead. .. code-block:: none - + @@ -251,7 +251,7 @@ Let's try again, now with the minimum: .. code-block:: none - + @@ -282,7 +282,7 @@ Or the maximum: .. code-block:: none - + @@ -711,7 +711,7 @@ result. mesh2d_face_x (mesh2d_nFaces) float64 ... mesh2d_face_y (mesh2d_nFaces) float64 ... * mesh2d_nFaces (mesh2d_nFaces) int64 0 1 2 3 4 ... 5243 5244 5245 5246 5247 - * layer (layer) int64 1 2 3 4 5
    • mesh2d_face_x
      (mesh2d_nFaces)
      float64
      ...
      standard_name :
      projection_x_coordinate
      [5248 values with dtype=float64]
    • mesh2d_face_y
      (mesh2d_nFaces)
      float64
      ...
      standard_name :
      projection_y_coordinate
      [5248 values with dtype=float64]
    • mesh2d_nFaces
      (mesh2d_nFaces)
      int64
      0 1 2 3 4 ... 5244 5245 5246 5247
      array([   0,    1,    2, ..., 5245, 5246, 5247])
    • layer
      (layer)
      int64
      1 2 3 4 5
      array([1, 2, 3, 4, 5])
    • mesh2d_nFaces
      PandasIndex
      PandasIndex(RangeIndex(start=0, stop=5248, step=1, name='mesh2d_nFaces'))
    • layer
      PandasIndex
      PandasIndex(Index([1, 2, 3, 4, 5], dtype='int64', name='layer'))


  • @@ -1153,7 +1153,7 @@ all additional dimensions. -45.92794405, -39.50867478]]) Coordinates: * layer (layer) int64 1 2 3 4 5 - * mesh2d_nFaces (mesh2d_nFaces) int64 0 1 2 3 4 5 6 ... 91 92 93 94 95 96 97
    • layer
      PandasIndex
      PandasIndex(Index([1, 2, 3, 4, 5], dtype='int64', name='layer'))
    • mesh2d_nFaces
      PandasIndex
      PandasIndex(RangeIndex(start=0, stop=98, step=1, name='mesh2d_nFaces'))


  • @@ -1235,7 +1235,7 @@ and the aggregated mean. .. code-block:: none - [, , , , ] + [, , , , ] @@ -1272,7 +1272,7 @@ To illustrate, we will zoom in to a part of the Netherlands. .. code-block:: none - + @@ -1325,7 +1325,7 @@ the triangles. .. code-block:: none - + @@ -1366,7 +1366,7 @@ the regridders work for any collection of (convex) faces. .. code-block:: none - + @@ -1402,7 +1402,7 @@ is kept the same. .. code-block:: none - + @@ -1418,7 +1418,7 @@ is kept the same. .. rst-class:: sphx-glr-timing - **Total running time of the script:** ( 0 minutes 10.605 seconds) + **Total running time of the script:** ( 0 minutes 12.082 seconds) .. _sphx_glr_download_examples_regridder_overview.py: diff --git a/_sources/examples/sg_execution_times.rst.txt b/_sources/examples/sg_execution_times.rst.txt index 81d81ea94..64bf39cc2 100644 --- a/_sources/examples/sg_execution_times.rst.txt +++ b/_sources/examples/sg_execution_times.rst.txt @@ -6,18 +6,18 @@ Computation times ================= -**00:39.496** total execution time for **examples** files: +**00:44.472** total execution time for **examples** files: +----------------------------------------------------------------------------+-----------+--------+ -| :ref:`sphx_glr_examples_plotting.py` (``plotting.py``) | 00:15.472 | 0.0 MB | +| :ref:`sphx_glr_examples_plotting.py` (``plotting.py``) | 00:17.264 | 0.0 MB | +----------------------------------------------------------------------------+-----------+--------+ -| :ref:`sphx_glr_examples_regridder_overview.py` (``regridder_overview.py``) | 00:10.605 | 0.0 MB | +| :ref:`sphx_glr_examples_regridder_overview.py` (``regridder_overview.py``) | 00:12.082 | 0.0 MB | +----------------------------------------------------------------------------+-----------+--------+ -| :ref:`sphx_glr_examples_partitioning.py` (``partitioning.py``) | 00:05.430 | 0.0 MB | +| :ref:`sphx_glr_examples_overlap_regridder.py` (``overlap_regridder.py``) | 00:06.162 | 0.0 MB | +----------------------------------------------------------------------------+-----------+--------+ -| :ref:`sphx_glr_examples_overlap_regridder.py` (``overlap_regridder.py``) | 00:05.416 | 0.0 MB | +| :ref:`sphx_glr_examples_partitioning.py` (``partitioning.py``) | 00:06.102 | 0.0 MB | +----------------------------------------------------------------------------+-----------+--------+ -| :ref:`sphx_glr_examples_connectivity.py` (``connectivity.py``) | 00:01.835 | 0.0 MB | +| :ref:`sphx_glr_examples_connectivity.py` (``connectivity.py``) | 00:01.980 | 0.0 MB | +----------------------------------------------------------------------------+-----------+--------+ -| :ref:`sphx_glr_examples_quick_overview.py` (``quick_overview.py``) | 00:00.739 | 0.0 MB | +| :ref:`sphx_glr_examples_quick_overview.py` (``quick_overview.py``) | 00:00.882 | 0.0 MB | +----------------------------------------------------------------------------+-----------+--------+ diff --git a/_sources/sample_data/adh_san_diego.rst.txt b/_sources/sample_data/adh_san_diego.rst.txt index b3f0ec72b..a715ac663 100644 --- a/_sources/sample_data/adh_san_diego.rst.txt +++ b/_sources/sample_data/adh_san_diego.rst.txt @@ -41,7 +41,7 @@ It contains a static dataset (bed elevation) and a time varying dataset .. code-block:: none - + @@ -71,7 +71,7 @@ It contains a static dataset (bed elevation) and a time varying dataset .. rst-class:: sphx-glr-timing - **Total running time of the script:** ( 0 minutes 0.451 seconds) + **Total running time of the script:** ( 0 minutes 0.508 seconds) .. _sphx_glr_download_sample_data_adh_san_diego.py: diff --git a/_sources/sample_data/disk.rst.txt b/_sources/sample_data/disk.rst.txt index f76dcb5e8..e36040729 100644 --- a/_sources/sample_data/disk.rst.txt +++ b/_sources/sample_data/disk.rst.txt @@ -39,7 +39,7 @@ of a disk. It contains data on the nodes, faces, and edges. .. code-block:: none - + @@ -68,7 +68,7 @@ of a disk. It contains data on the nodes, faces, and edges. .. rst-class:: sphx-glr-timing - **Total running time of the script:** ( 0 minutes 0.214 seconds) + **Total running time of the script:** ( 0 minutes 0.239 seconds) .. _sphx_glr_download_sample_data_disk.py: diff --git a/_sources/sample_data/elevation_nl.rst.txt b/_sources/sample_data/elevation_nl.rst.txt index 345c12de8..b52852b78 100644 --- a/_sources/sample_data/elevation_nl.rst.txt +++ b/_sources/sample_data/elevation_nl.rst.txt @@ -39,7 +39,7 @@ of the Netherlands. .. code-block:: none - [] + [] @@ -67,7 +67,7 @@ of the Netherlands. .. rst-class:: sphx-glr-timing - **Total running time of the script:** ( 0 minutes 1.009 seconds) + **Total running time of the script:** ( 0 minutes 1.185 seconds) .. _sphx_glr_download_sample_data_elevation_nl.py: diff --git a/_sources/sample_data/sg_execution_times.rst.txt b/_sources/sample_data/sg_execution_times.rst.txt index be18181cf..4d924016e 100644 --- a/_sources/sample_data/sg_execution_times.rst.txt +++ b/_sources/sample_data/sg_execution_times.rst.txt @@ -6,14 +6,14 @@ Computation times ================= -**00:01.759** total execution time for **sample_data** files: +**00:02.029** total execution time for **sample_data** files: +---------------------------------------------------------------------+-----------+--------+ -| :ref:`sphx_glr_sample_data_elevation_nl.py` (``elevation_nl.py``) | 00:01.009 | 0.0 MB | +| :ref:`sphx_glr_sample_data_elevation_nl.py` (``elevation_nl.py``) | 00:01.185 | 0.0 MB | +---------------------------------------------------------------------+-----------+--------+ -| :ref:`sphx_glr_sample_data_adh_san_diego.py` (``adh_san_diego.py``) | 00:00.451 | 0.0 MB | +| :ref:`sphx_glr_sample_data_adh_san_diego.py` (``adh_san_diego.py``) | 00:00.508 | 0.0 MB | +---------------------------------------------------------------------+-----------+--------+ -| :ref:`sphx_glr_sample_data_disk.py` (``disk.py``) | 00:00.214 | 0.0 MB | +| :ref:`sphx_glr_sample_data_disk.py` (``disk.py``) | 00:00.239 | 0.0 MB | +---------------------------------------------------------------------+-----------+--------+ -| :ref:`sphx_glr_sample_data_xoxo.py` (``xoxo.py``) | 00:00.085 | 0.0 MB | +| :ref:`sphx_glr_sample_data_xoxo.py` (``xoxo.py``) | 00:00.097 | 0.0 MB | +---------------------------------------------------------------------+-----------+--------+ diff --git a/_sources/sample_data/xoxo.rst.txt b/_sources/sample_data/xoxo.rst.txt index 9d109e370..60f3b2054 100644 --- a/_sources/sample_data/xoxo.rst.txt +++ b/_sources/sample_data/xoxo.rst.txt @@ -55,7 +55,7 @@ directory if it's not there already. .. rst-class:: sphx-glr-timing - **Total running time of the script:** ( 0 minutes 0.085 seconds) + **Total running time of the script:** ( 0 minutes 0.097 seconds) .. _sphx_glr_download_sample_data_xoxo.py: diff --git a/changelog.html b/changelog.html index 22e1a9c2c..42ab8a36c 100644 --- a/changelog.html +++ b/changelog.html @@ -601,20 +601,26 @@

    ChangelogSemantic Versioning.

    Unreleased#

    -
    -
    -

    [0.6.1] 2023-07-07#

    Fixed#

      -
    • fillvalue was not properly replaced in cast. -See #113, -which was introduced by fixing #101.

    • +
    • Computing indexer to avoid dask array of unknown shape upon plotting. +See #117.

    • +
    +
    +
    +
    +

    [0.6.1] 2023-07-07#

    +
    +

    Fixed#

    +
      +
    • Fillvalue was not properly replaced in cast. +See #113.

    -
    -

    [0.6.0] 2023-07-05#

    +
    +

    [0.6.0] 2023-07-05#

    Added#

    -
    -

    Fixed#

    +
    +

    Fixed#

    • Regridding is possible again with regridders initiated from_weights. See #90. @@ -656,10 +662,10 @@

      Changed -

      [0.5.0] 2023-05-25#

      -

      Added#

      +

      [0.5.0] 2023-05-25#

      +
      +

      Added#

      -
      -

      [0.4.0] 2023-05-05#

      -

      Fixed#

      +

      [0.4.0] 2023-05-05#

      +
      +

      Fixed#

      -
      -

      Changed#

      +
      +

      Changed#

      -
      -

      Added#

      +
      +

      Added#

      -
      -

      [0.3.0] 2023-03-14#

      -

      Fixed#

      -
      +

      [0.3.0] 2023-03-14#

      -

      Changed#

      +

      Fixed#

      +
      +
      +

      Changed#

      -
      -

      Added#

      +
      +

      Added#

      -
      -

      [0.2.1] 2023-02-06#

      -

      Fixed#

      +

      [0.2.1] 2023-02-06#

      +
      +

      Fixed#

      -
      -

      Changed#

      -
      -

      Added#

      +

      Changed#

      +
      +
      +

      Added#

      -
      -

      [0.2.0] 2023-01-19#

      -

      Fixed#

      +

      [0.2.0] 2023-01-19#

      +
      +

      Fixed#

      -
      -

      Changed#

      +
      +

      Changed#

      • Forwarding to the internal xarray object is now setup at class definition of UgridDataArray and UgridDataset rather than at runtime. @@ -828,8 +834,8 @@

        Changed only a left or right neighbor).

      -
      -

      Added#

      +
      +

      Added#

      • xugrid.Ugrid1d and xugrid.Ugrid2d can now be initialized with an attrs argument to setup non-default UGRID attributes such as @@ -849,28 +855,28 @@

        Added#<

      -
      -

      [0.1.10] 2022-12-13#

      -

      Fixed#

      +

      [0.1.10] 2022-12-13#

      +
      +

      Fixed#

      • Move matplotlib import into a function body so matplotlib remains an optional dependency.

      -
      -

      [0.1.9] 2022-12-13#

      -

      Changed#

      +

      [0.1.9] 2022-12-13#

      +
      +

      Changed#

      • Warn instead of error when the UGRID attributes indicate a set of coordinate that are not present in the dataset.

      • Use pyproject.toml for setuptools instead of setup.cfg.

      -
      -

      Added#

      +
      +

      Added#

      -
      -

      Fixed#

      +
      +

      Fixed#

      -
      -

      [0.1.7] 2022-09-06#

      -

      Fixed#

      +

      [0.1.7] 2022-09-06#

      +
      +

      Fixed#

      • The setitem method of xugrid.UgridDataset has been updated to check the dimensions of grids rather than the dimensions of objects to decide @@ -913,25 +919,25 @@

        Fixed#<

      -
      -

      [0.1.5] 2022-08-22#

      -

      Fixed#

      +

      [0.1.5] 2022-08-22#

      +
      +

      Fixed#

      • list and dict type annotations have been replaced with List and Dict from the typing module to support older versions of Python (<3.9).

      -
      -

      Changed#

      +
      +

      Changed#

      -
      -

      Added#

      +
      +

      Added#

      -
      -

      [0.1.4] 2022-08-16#

      -

      Fixed#

      +

      [0.1.4] 2022-08-16#

      +
      +

      Fixed#

      • A start_index of 1 in connectivity arrays is handled and will no longer result in indexing errors.

      • levels argument is now respected in line and pcolormesh plotting methods.

      -
      -

      Changed#

      +
      +

      Changed#

      -
      -

      Added#

      +
      +

      Added#

      -
      -

      [0.1.3] 2021-12-23#

      +
      +

      [0.1.3] 2021-12-23#

      @@ -1052,72 +1058,75 @@

      [0.1.3] 2021-12-23