diff --git a/.buildinfo b/.buildinfo index ec582ce17..e46c4cd49 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: 41b471fb9f955ce9b60e9a6afd82478e +config: 51b00bc5cf129f0cdb92ff41214df90d tags: 645f666f9bcd5a90fca523b33c5a78b7 diff --git a/_images/sphx_glr_connectivity_001.png b/_images/sphx_glr_connectivity_001.png index fe873a82c..2e984d0dc 100644 Binary files a/_images/sphx_glr_connectivity_001.png and b/_images/sphx_glr_connectivity_001.png differ diff --git a/_images/sphx_glr_connectivity_002.png b/_images/sphx_glr_connectivity_002.png index 84cc916c9..32f54b3b6 100644 Binary files a/_images/sphx_glr_connectivity_002.png and b/_images/sphx_glr_connectivity_002.png differ diff --git a/_images/sphx_glr_connectivity_003.png b/_images/sphx_glr_connectivity_003.png index 4d0e15327..dc226bc92 100644 Binary files a/_images/sphx_glr_connectivity_003.png and b/_images/sphx_glr_connectivity_003.png differ diff --git a/_images/sphx_glr_connectivity_thumb.png b/_images/sphx_glr_connectivity_thumb.png index 459021612..b4a6e9c66 100644 Binary files a/_images/sphx_glr_connectivity_thumb.png and b/_images/sphx_glr_connectivity_thumb.png differ diff --git a/_images/sphx_glr_disk_001.png b/_images/sphx_glr_disk_001.png index 3964a735f..db51d5444 100644 Binary files a/_images/sphx_glr_disk_001.png and b/_images/sphx_glr_disk_001.png differ diff --git a/_images/sphx_glr_disk_thumb.png b/_images/sphx_glr_disk_thumb.png index b41ae8ea1..24a425dca 100644 Binary files a/_images/sphx_glr_disk_thumb.png and b/_images/sphx_glr_disk_thumb.png differ diff --git a/_images/sphx_glr_plotting_001.png b/_images/sphx_glr_plotting_001.png index 1d9eb6f36..13fc0e7c1 100644 Binary files a/_images/sphx_glr_plotting_001.png and b/_images/sphx_glr_plotting_001.png differ diff --git a/_images/sphx_glr_plotting_003.png b/_images/sphx_glr_plotting_003.png index 0d85e2227..ce3abb2cf 100644 Binary files a/_images/sphx_glr_plotting_003.png and b/_images/sphx_glr_plotting_003.png differ diff --git a/_images/sphx_glr_plotting_004.png b/_images/sphx_glr_plotting_004.png index 4cd568bec..8a43b5666 100644 Binary files a/_images/sphx_glr_plotting_004.png and b/_images/sphx_glr_plotting_004.png differ diff --git a/_images/sphx_glr_plotting_005.png b/_images/sphx_glr_plotting_005.png index 4e552f35f..af0ba489e 100644 Binary files a/_images/sphx_glr_plotting_005.png and b/_images/sphx_glr_plotting_005.png differ diff --git a/_images/sphx_glr_plotting_006.png b/_images/sphx_glr_plotting_006.png index 35a7ddae1..edb9efec9 100644 Binary files a/_images/sphx_glr_plotting_006.png and b/_images/sphx_glr_plotting_006.png differ diff --git a/_images/sphx_glr_plotting_007.png b/_images/sphx_glr_plotting_007.png index 293e01a73..9443b2690 100644 Binary files a/_images/sphx_glr_plotting_007.png and b/_images/sphx_glr_plotting_007.png differ diff --git a/_images/sphx_glr_plotting_008.png b/_images/sphx_glr_plotting_008.png index 17547a2b8..0e78b2cce 100644 Binary files a/_images/sphx_glr_plotting_008.png and b/_images/sphx_glr_plotting_008.png differ diff --git a/_images/sphx_glr_plotting_009.png b/_images/sphx_glr_plotting_009.png index 1d9eb6f36..13fc0e7c1 100644 Binary files a/_images/sphx_glr_plotting_009.png and b/_images/sphx_glr_plotting_009.png differ diff --git a/_images/sphx_glr_plotting_thumb.png b/_images/sphx_glr_plotting_thumb.png index 3b3e2d84d..122edec18 100644 Binary files a/_images/sphx_glr_plotting_thumb.png and b/_images/sphx_glr_plotting_thumb.png differ diff --git a/_images/sphx_glr_quick_overview_002.png b/_images/sphx_glr_quick_overview_002.png index 055adb595..bdc9fdb2d 100644 Binary files a/_images/sphx_glr_quick_overview_002.png and b/_images/sphx_glr_quick_overview_002.png differ diff --git a/_images/sphx_glr_voronoi_001.png b/_images/sphx_glr_voronoi_001.png index c671a7116..2dacf1daf 100644 Binary files a/_images/sphx_glr_voronoi_001.png and b/_images/sphx_glr_voronoi_001.png differ diff --git a/_images/sphx_glr_voronoi_002.png b/_images/sphx_glr_voronoi_002.png index fa242733e..b872b265e 100644 Binary files a/_images/sphx_glr_voronoi_002.png and b/_images/sphx_glr_voronoi_002.png differ diff --git a/_images/sphx_glr_voronoi_003.png b/_images/sphx_glr_voronoi_003.png index 87bf0d16d..2ed879a32 100644 Binary files a/_images/sphx_glr_voronoi_003.png and b/_images/sphx_glr_voronoi_003.png differ diff --git a/_images/sphx_glr_voronoi_004.png b/_images/sphx_glr_voronoi_004.png index ae70a3f78..7b8e83159 100644 Binary files a/_images/sphx_glr_voronoi_004.png and b/_images/sphx_glr_voronoi_004.png differ diff --git a/_images/sphx_glr_voronoi_005.png b/_images/sphx_glr_voronoi_005.png index e15b954c0..4239f7e6c 100644 Binary files a/_images/sphx_glr_voronoi_005.png and b/_images/sphx_glr_voronoi_005.png differ diff --git a/_images/sphx_glr_voronoi_006.png b/_images/sphx_glr_voronoi_006.png index bd2adcfa0..2e5fcae54 100644 Binary files a/_images/sphx_glr_voronoi_006.png and b/_images/sphx_glr_voronoi_006.png differ diff --git a/_images/sphx_glr_voronoi_007.png b/_images/sphx_glr_voronoi_007.png index b36ea561c..17ffda316 100644 Binary files a/_images/sphx_glr_voronoi_007.png and b/_images/sphx_glr_voronoi_007.png differ diff --git a/_images/sphx_glr_voronoi_thumb.png b/_images/sphx_glr_voronoi_thumb.png index cfaf410b5..8a95fed3b 100644 Binary files a/_images/sphx_glr_voronoi_thumb.png and b/_images/sphx_glr_voronoi_thumb.png differ diff --git a/_modules/xugrid/regrid/regridder.html b/_modules/xugrid/regrid/regridder.html index 45393c57d..3b139e8e6 100644 --- a/_modules/xugrid/regrid/regridder.html +++ b/_modules/xugrid/regrid/regridder.html @@ -393,11 +393,9 @@

Source code for xugrid.regrid.regridder

 
     DaskArray = dask.array.Array
     DaskRechunk = dask.array.rechunk
-    DaskReshape = dask.array.reshape
 except ImportError:
     DaskArray = ()
     DaskRechunk = ()
-    DaskReshape = ()
 
 import xugrid
 from xugrid.constants import FloatArray
@@ -525,8 +523,6 @@ 
Source code for xugrid.regrid.regridder
         source = source.reshape((-1, source_grid.size))
 
         size = self._target.size
-        # E.g.: sizes of ("time", "layer") + ("y", "x")
-        out_shape = first_dims_shape + self._target.shape
 
         if isinstance(source, DaskArray):
             # for DaskArray's from multiple partitions, rechunk first to single size per dimension
@@ -542,16 +538,19 @@ 
Source code for xugrid.regrid.regridder
                 chunks=chunks,
                 meta=np.array((), dtype=source.dtype),
             )
-            out = out.compute().reshape(out_shape)
+            # 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)
-            out = out.reshape(out_shape)
         else:
             raise TypeError(
                 "Expected dask.array.Array or numpy.ndarray. Received: "
                 f"{type(source).__name__}"
             )
-        return out
+        # E.g.: sizes of ("time", "layer") + ("y", "x")
+        out_shape = first_dims_shape + self._target.shape
+        return out.reshape(out_shape)
 
     def regrid_dataarray(self, source: xr.DataArray, source_dims: Tuple[str]):
         # Do not set vectorize=True: numba will run the for loop more
diff --git a/_sources/examples-dev/sg_execution_times.rst.txt b/_sources/examples-dev/sg_execution_times.rst.txt
index cd4a7e107..6b7e21d9f 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:02.366** total execution time for **examples-dev** files:
+**00:01.786** total execution time for **examples-dev** files:
 
 +----------------------------------------------------------+-----------+--------+
-| :ref:`sphx_glr_examples-dev_voronoi.py` (``voronoi.py``) | 00:02.366 | 0.0 MB |
+| :ref:`sphx_glr_examples-dev_voronoi.py` (``voronoi.py``) | 00:01.786 | 0.0 MB |
 +----------------------------------------------------------+-----------+--------+
diff --git a/_sources/examples-dev/voronoi.rst.txt b/_sources/examples-dev/voronoi.rst.txt
index 9c4040792..1d74f20fd 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  2.366 seconds)
+   **Total running time of the script:** ( 0 minutes  1.786 seconds)
 
 
 .. _sphx_glr_download_examples-dev_voronoi.py:
diff --git a/_sources/examples/connectivity.rst.txt b/_sources/examples/connectivity.rst.txt
index 06d985a39..22a5d53e3 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  2.422 seconds)
+   **Total running time of the script:** ( 0 minutes  1.835 seconds)
 
 
 .. _sphx_glr_download_examples_connectivity.py:
diff --git a/_sources/examples/overlap_regridder.rst.txt b/_sources/examples/overlap_regridder.rst.txt
index 8485c90c4..370cb3cd8 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  7.128 seconds)
+   **Total running time of the script:** ( 0 minutes  5.416 seconds)
 
 
 .. _sphx_glr_download_examples_overlap_regridder.py:
diff --git a/_sources/examples/partitioning.rst.txt b/_sources/examples/partitioning.rst.txt
index b3ae61b74..1f9845638 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 7.472 seconds) + **Total running time of the script:** ( 0 minutes 5.430 seconds) .. _sphx_glr_download_examples_partitioning.py: diff --git a/_sources/examples/plotting.rst.txt b/_sources/examples/plotting.rst.txt index 6fa7f7772..b12f6bfa6 100644 --- a/_sources/examples/plotting.rst.txt +++ b/_sources/examples/plotting.rst.txt @@ -450,13 +450,13 @@ faces. 
<xarray.Dataset>
     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_nEdges  (mesh2d_nEdges) int64 0 1 2 3 4 5 ... 594 595 596 597 598 599
     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


    • @@ -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 19.724 seconds) + **Total running time of the script:** ( 0 minutes 15.472 seconds) .. _sphx_glr_download_examples_plotting.py: diff --git a/_sources/examples/quick_overview.rst.txt b/_sources/examples/quick_overview.rst.txt index fb8616bd9..67119e60d 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

    @@ -3116,13 +3116,13 @@ grid (nodes, faces, edges). 
    <xarray.Dataset>
     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_nEdges  (mesh2d_nEdges) int64 0 1 2 3 4 5 ... 594 595 596 597 598 599
     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_nFaces
      PandasIndex
      PandasIndex(RangeIndex(start=0, stop=384, step=1, name='mesh2d_nFaces'))
    • mesh2d_nNodes
      PandasIndex
      PandasIndex(RangeIndex(start=0, stop=217, step=1, name='mesh2d_nNodes'))


    • @@ -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.988 seconds) + **Total running time of the script:** ( 0 minutes 0.739 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 a97f1475f..1b9b96f3f 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 13.383 seconds) + **Total running time of the script:** ( 0 minutes 10.605 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 652f70057..81d81ea94 100644 --- a/_sources/examples/sg_execution_times.rst.txt +++ b/_sources/examples/sg_execution_times.rst.txt @@ -6,18 +6,18 @@ Computation times ================= -**00:51.117** total execution time for **examples** files: +**00:39.496** total execution time for **examples** files: +----------------------------------------------------------------------------+-----------+--------+ -| :ref:`sphx_glr_examples_plotting.py` (``plotting.py``) | 00:19.724 | 0.0 MB | +| :ref:`sphx_glr_examples_plotting.py` (``plotting.py``) | 00:15.472 | 0.0 MB | +----------------------------------------------------------------------------+-----------+--------+ -| :ref:`sphx_glr_examples_regridder_overview.py` (``regridder_overview.py``) | 00:13.383 | 0.0 MB | +| :ref:`sphx_glr_examples_regridder_overview.py` (``regridder_overview.py``) | 00:10.605 | 0.0 MB | +----------------------------------------------------------------------------+-----------+--------+ -| :ref:`sphx_glr_examples_partitioning.py` (``partitioning.py``) | 00:07.472 | 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:07.128 | 0.0 MB | +| :ref:`sphx_glr_examples_overlap_regridder.py` (``overlap_regridder.py``) | 00:05.416 | 0.0 MB | +----------------------------------------------------------------------------+-----------+--------+ -| :ref:`sphx_glr_examples_connectivity.py` (``connectivity.py``) | 00:02.422 | 0.0 MB | +| :ref:`sphx_glr_examples_connectivity.py` (``connectivity.py``) | 00:01.835 | 0.0 MB | +----------------------------------------------------------------------------+-----------+--------+ -| :ref:`sphx_glr_examples_quick_overview.py` (``quick_overview.py``) | 00:00.988 | 0.0 MB | +| :ref:`sphx_glr_examples_quick_overview.py` (``quick_overview.py``) | 00:00.739 | 0.0 MB | +----------------------------------------------------------------------------+-----------+--------+ diff --git a/_sources/sample_data/adh_san_diego.rst.txt b/_sources/sample_data/adh_san_diego.rst.txt index fc8cc3e4b..b3f0ec72b 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.575 seconds) + **Total running time of the script:** ( 0 minutes 0.451 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 bc6697123..f76dcb5e8 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.283 seconds) + **Total running time of the script:** ( 0 minutes 0.214 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 28fcda899..345c12de8 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.261 seconds) + **Total running time of the script:** ( 0 minutes 1.009 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 e52e7f155..be18181cf 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:02.228** total execution time for **sample_data** files: +**00:01.759** total execution time for **sample_data** files: +---------------------------------------------------------------------+-----------+--------+ -| :ref:`sphx_glr_sample_data_elevation_nl.py` (``elevation_nl.py``) | 00:01.261 | 0.0 MB | +| :ref:`sphx_glr_sample_data_elevation_nl.py` (``elevation_nl.py``) | 00:01.009 | 0.0 MB | +---------------------------------------------------------------------+-----------+--------+ -| :ref:`sphx_glr_sample_data_adh_san_diego.py` (``adh_san_diego.py``) | 00:00.575 | 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_disk.py` (``disk.py``) | 00:00.283 | 0.0 MB | +| :ref:`sphx_glr_sample_data_disk.py` (``disk.py``) | 00:00.214 | 0.0 MB | +---------------------------------------------------------------------+-----------+--------+ -| :ref:`sphx_glr_sample_data_xoxo.py` (``xoxo.py``) | 00:00.109 | 0.0 MB | +| :ref:`sphx_glr_sample_data_xoxo.py` (``xoxo.py``) | 00:00.085 | 0.0 MB | +---------------------------------------------------------------------+-----------+--------+ diff --git a/_sources/sample_data/xoxo.rst.txt b/_sources/sample_data/xoxo.rst.txt index c9c36b4bf..9d109e370 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.109 seconds) + **Total running time of the script:** ( 0 minutes 0.085 seconds) .. _sphx_glr_download_sample_data_xoxo.py: diff --git a/examples-dev/sg_execution_times.html b/examples-dev/sg_execution_times.html index 7ea27bb81..48b19cea2 100644 --- a/examples-dev/sg_execution_times.html +++ b/examples-dev/sg_execution_times.html @@ -378,11 +378,11 @@

    Computation times#

    -

    00:02.366 total execution time for examples-dev files:

    +

    00:01.786 total execution time for examples-dev files:

    - + diff --git a/examples-dev/voronoi.html b/examples-dev/voronoi.html index 5dad1559c..ecaf3d46d 100644 --- a/examples-dev/voronoi.html +++ b/examples-dev/voronoi.html @@ -783,7 +783,7 @@

    Infinite rays
    (-1.5, 1.5)
    -

    Total running time of the script: ( 0 minutes 2.366 seconds)

    +

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

     -connectivity
    <matplotlib.collections.PolyCollection object at 0x7f6064be7b80>
+connectivity
    <matplotlib.collections.PolyCollection object at 0x7ff7e21e1bb0>
 
    
 
    
 
    By default, the border value for binary dilation is also set to
@@ -496,7 +496,7 @@ 
    Binary erosion and dilationuda.ugrid.plot()
    -connectivity
    <matplotlib.collections.PolyCollection object at 0x7f60653e87c0>
+connectivity
    <matplotlib.collections.PolyCollection object at 0x7ff7e3adb430>
 
    
 
    
 
    Now let’s run two dilations: one with the default border, and one with the
@@ -509,7 +509,7 @@ 
    Binary erosion and dilationiter1_boundary.ugrid.plot(ax=ax1)
    -connectivity
    <matplotlib.collections.PolyCollection object at 0x7f6064b6f5e0>
+connectivity
    <matplotlib.collections.PolyCollection object at 0x7ff7e31103d0>
 
    
 
    
 
@@ -525,7 +525,7 @@ 
    Connected Componentslabeled.ugrid.plot(cmap="RdBu")
    -connectivity
    <matplotlib.collections.PolyCollection object at 0x7f606517ff10>
+connectivity
    <matplotlib.collections.PolyCollection object at 0x7ff7e2d2bfd0>
 
    
 
    
 
@@ -537,7 +537,7 @@ 
    Centroidal Voronoi Tesselationxugrid.plot.line(voronoi_grid, color="black")
    -connectivity
    <matplotlib.collections.LineCollection object at 0x7f606450b400>
+connectivity
    <matplotlib.collections.LineCollection object at 0x7ff7e31cdfd0>
 
    
 
    
 
    There are two alternative flavors to consider. We can fully ignore the
@@ -558,7 +558,7 @@ 
    Centroidal Voronoi Tesselationxugrid.plot.line(convex_exterior, ax=ax1, color="black")
    -connectivity
    <matplotlib.collections.LineCollection object at 0x7f6063422880>
+connectivity
    <matplotlib.collections.LineCollection object at 0x7ff7e3bee940>
 
    
 
    
 
@@ -574,7 +574,7 @@ 
    Triangulationxugrid.plot.line(triangulation, ax=ax1, color="black")
    -connectivity
    <matplotlib.collections.LineCollection object at 0x7f606e0efaf0>
+connectivity
    <matplotlib.collections.LineCollection object at 0x7ff7e34b5bb0>
 
    
 
    
 
@@ -605,7 +605,7 @@ 
    Laplace interpolationuda.ugrid.plot.line(ax=ax, color="black")
    -connectivity
    <matplotlib.collections.LineCollection object at 0x7f606e31ab50>
+connectivity
    <matplotlib.collections.LineCollection object at 0x7ff7e2c6cc10>
 
    
 
    
 
    We can now use Laplace interpolation to fill the gaps in the grid.
    
@@ -613,7 +613,7 @@ 
    Laplace interpolationfilled.ugrid.plot(cmap="gist_rainbow", vmin=2.5, vmax=7.5)
    -connectivity
    <matplotlib.collections.PolyCollection object at 0x7f60652c52b0>
+connectivity
    <matplotlib.collections.PolyCollection object at 0x7ff7e2fd5370>
 
    
 
    
 
@@ -631,7 +631,7 @@ 
    Reverse-Cuthill McKeeax.imshow(connectivity, cmap="Greys")
    -connectivity
    <matplotlib.image.AxesImage object at 0x7f606df68ca0>
+connectivity
    <matplotlib.image.AxesImage object at 0x7ff7ec8e2d60>
 
    
 
    
 
    The bandwidth of this matrix is poor. Connections are all over the place: low
@@ -645,10 +645,10 @@ 
    Reverse-Cuthill McKeeax.imshow(connectivity, cmap="Greys")
    -connectivity
    <matplotlib.image.AxesImage object at 0x7f60648f2c10>
+connectivity
    <matplotlib.image.AxesImage object at 0x7ff7e3275940>
 
    
 
    
-
    Total running time of the script: ( 0 minutes  2.422 seconds)
    
+
    Total running time of the script: ( 0 minutes  1.835 seconds)
    -overlap regridder
    <matplotlib.collections.LineCollection object at 0x7f60646cf970>
+overlap regridder
    <matplotlib.collections.LineCollection object at 0x7ff7e2dd4cd0>
 
    
 
    
 
    
@@ -507,7 +507,7 @@ 
    Relative overlapresult.ugrid.plot()
    -overlap regridder
    <matplotlib.collections.PolyCollection object at 0x7f60633e3af0>
+overlap regridder
    <matplotlib.collections.PolyCollection object at 0x7ff7e2316b80>
 
    
 
    
 
@@ -549,7 +549,7 @@ 
    Custom reductionsresult.ugrid.plot(vmin=-20, vmax=90, cmap="terrain")
    -overlap regridder
    <matplotlib.collections.PolyCollection object at 0x7f60636cad60>
+overlap regridder
    <matplotlib.collections.PolyCollection object at 0x7ff7e3a67e20>
 
    
 
    
 
    Not every reduction uses the weights argument. For example, computing an
@@ -566,10 +566,10 @@ 
    Custom reductionsresult.ugrid.plot(vmin=-20, vmax=90, cmap="terrain")
    -overlap regridder
    <matplotlib.collections.PolyCollection object at 0x7f6065212cd0>
+overlap regridder
    <matplotlib.collections.PolyCollection object at 0x7ff7e3ccd910>
 
    
 
    
-
    Total running time of the script: ( 0 minutes  7.128 seconds)
    
+
    Total running time of the script: ( 0 minutes  5.416 seconds)
    -partitioning
    <matplotlib.collections.PolyCollection object at 0x7f6065d81790>
+partitioning
    <matplotlib.collections.PolyCollection object at 0x7ff7e46947c0>
 
    
 
    
 
    Let’s start by dividing the grid into four parts:
    
@@ -458,7 +458,7 @@ 
    Partition the gridlabels.ugrid.plot()
    -partitioning
    <matplotlib.collections.PolyCollection object at 0x7f6064b8a190>
+partitioning
    <matplotlib.collections.PolyCollection object at 0x7ff7e3504280>
 
    
 
    
 
    Not quite the twelve provinces of the Netherlands!
    
@@ -483,7 +483,7 @@ 
    Merging partitionsmerged.ugrid.plot(vmin=-20, vmax=90, cmap="terrain")
    -partitioning
    <matplotlib.collections.PolyCollection object at 0x7f60636c4130>
+partitioning
    <matplotlib.collections.PolyCollection object at 0x7ff7e2051220>
 
    
 
    
 
@@ -504,7 +504,7 @@ 
    Partitioning grids without datamerged_grid.plot()
    -partitioning
    <matplotlib.collections.LineCollection object at 0x7f60650f69a0>
+partitioning
    <matplotlib.collections.LineCollection object at 0x7ff7e3a6fa90>
 
    
 
    
 
@@ -881,7 +881,7 @@ 
    Preserving orderTotal running time of the script: ( 0 minutes  7.472 seconds)
    
+
    Total running time of the script: ( 0 minutes  5.430 seconds)
    -plotting
    <matplotlib.collections.PolyCollection object at 0x7f606512f070>
+plotting
    <matplotlib.collections.PolyCollection object at 0x7ff7e3aa82b0>
 
    
 
    
 
    Like Xarray, the axes and the colorbar are labeled automatically using the
@@ -962,7 +962,7 @@ 
    UgridDataArray
    ds["edge_z"].ugrid.plot()
    -plotting
    <matplotlib.collections.LineCollection object at 0x7f606e3f66a0>
+plotting
    <matplotlib.collections.LineCollection object at 0x7ff7ecd6d5e0>
 
    
 
    
 
    The method called by default depends on the type of the data:
    
@@ -991,7 +991,7 @@ 
    UgridDataArrayds["node_z"].ugrid.plot(ax=ax2)
    -plotting
    <matplotlib.collections.PolyCollection object at 0x7f6064be7850>
+plotting
    <matplotlib.collections.PolyCollection object at 0x7ff7e35f9130>
 
    
 
    
 
    We can also exactly control the type of plot we want. For example, to plot
@@ -999,7 +999,7 @@ 
    UgridDataArray
    ds["face_z"].ugrid.plot.contourf()
    -plotting
    <matplotlib.tri._tricontour.TriContourSet object at 0x7f6065de7850>
+plotting
    <matplotlib.tri._tricontour.TriContourSet object at 0x7ff7e3c7c7f0>
 
    
 
    
 
    We can also overlay this data with the edges:
    
@@ -1008,7 +1008,7 @@ 
    UgridDataArrayds["face_z"].ugrid.plot.line(color="black")
    -plotting
    <matplotlib.collections.LineCollection object at 0x7f6065221220>
+plotting
    <matplotlib.collections.LineCollection object at 0x7ff7e3b7e2e0>
 
    
 
    
 
    In general, there has to be data associated with the mesh topology before a
@@ -1059,7 +1059,7 @@ 
    Other types of plotds["node_z"].ugrid.plot.scatter(ax=axes[4, 2])
    -plotting
    <matplotlib.collections.PathCollection object at 0x7f6065d815b0>
+plotting
    <matplotlib.collections.PathCollection object at 0x7ff7e4733f40>
 
    
 
    
 
    The surface methods generate 3D surface plots:
    
@@ -1070,7 +1070,7 @@ 
    Other types of plotds["node_z"].ugrid.plot.surface(ax=ax1)
    -plotting
    <mpl_toolkits.mplot3d.art3d.Poly3DCollection object at 0x7f606df36730>
+plotting
    <mpl_toolkits.mplot3d.art3d.Poly3DCollection object at 0x7ff7e2dae7f0>
 
    
 
    
 
@@ -1082,7 +1082,7 @@ 
    Additional Arguments
    ds["face_z"].ugrid.plot(cmap="RdBu", levels=8, yincrease=False)
    -plotting
    <matplotlib.collections.PolyCollection object at 0x7f6064594280>
+plotting
    <matplotlib.collections.PolyCollection object at 0x7ff7e2f1d340>
 
    
 
    
 
@@ -1096,7 +1096,7 @@ 
    As a functionxugrid.plot.pcolormesh(grid, da)
    -plotting
    <matplotlib.collections.PolyCollection object at 0x7f60633eba00>
+plotting
    <matplotlib.collections.PolyCollection object at 0x7ff7e3bb8ac0>
 
    
 
    
 
@@ -1110,10 +1110,10 @@ 
    Xarray DataArray plotsdepth.isel(node=1000).plot()
    -node = 1000, node_x = 4.84e+05, node_y = 3.614e+06
    [<matplotlib.lines.Line2D object at 0x7f60633bfe80>]
+node = 1000, node_x = 4.84e+05, node_y = 3.614e+06
    [<matplotlib.lines.Line2D object at 0x7ff7e3bcbf40>]
 
    
 
    
-
    Total running time of the script: ( 0 minutes  19.724 seconds)
    
+
    Total running time of the script: ( 0 minutes  15.472 seconds)

    Centroid Voronoi Tesselation (CVT) (voronoi.py)

    00:02.366

    00:01.786

    0.0 MB
    - + - + - + - + - + - + diff --git a/sample_data/adh_san_diego.html b/sample_data/adh_san_diego.html index 3c8e4557a..791cd58cb 100644 --- a/sample_data/adh_san_diego.html +++ b/sample_data/adh_san_diego.html @@ -418,7 +418,7 @@

    This is small dataset containing the output of a hydraulic simulation.

    It contains a static dataset (bed elevation) and a time varying dataset (water depth).

    -time = 2000-01-01
    <matplotlib.collections.PolyCollection object at 0x7f6063954d00>
+time = 2000-01-01
    <matplotlib.collections.PolyCollection object at 0x7ff7e316f6a0>
 
    
 
    
 
    
@@ -442,7 +442,7 @@
 )
    -

    Total running time of the script: ( 0 minutes 0.575 seconds)

    +

    Total running time of the script: ( 0 minutes 0.451 seconds)

    Plot unstructured mesh data (plotting.py)

    00:19.724

    00:15.472

    0.0 MB

    Regridding overview (regridder_overview.py)

    00:13.383

    00:10.605

    0.0 MB

    Partitioning (partitioning.py)

    00:07.472

    00:05.430

    0.0 MB

    OverlapRegridder (overlap_regridder.py)

    00:07.128

    00:05.416

    0.0 MB

    Connectivity (connectivity.py)

    00:02.422

    00:01.835

    0.0 MB

    Quick overview (quick_overview.py)

    00:00.988

    00:00.739

    0.0 MB
    - + - + - + - + diff --git a/sample_data/xoxo.html b/sample_data/xoxo.html index e2de3bd7f..42b428e77 100644 --- a/sample_data/xoxo.html +++ b/sample_data/xoxo.html @@ -431,7 +431,7 @@ ax.set_aspect(1) -

    Total running time of the script: ( 0 minutes 0.109 seconds)

    +

    Total running time of the script: ( 0 minutes 0.085 seconds)

    Elevation NL (elevation_nl.py)

    00:01.261

    00:01.009

    0.0 MB

    ADH San Diego (adh_san_diego.py)

    00:00.575

    00:00.451

    0.0 MB

    Disk (disk.py)

    00:00.283

    00:00.214

    0.0 MB

    Xoxo (xoxo.py)

    00:00.109

    00:00.085

    0.0 MB