Issue #1188 Update the numba_celltree package (#1189)

Fixes #1188

# Description
In the numba_celltree package a change has been made that changes the
behavior of the locate_points method.

In structured grids the behavior is that when a point lies on the left
or bottom edge it is considered to be in the cell.
When the point lies on the right or top edge its considered outside of
the cell

This kind of logic doesn't work for unstructured grids because the
orientation of the cell can be anything.
However there are unit tests that do assume that this applies for
unstructured grids as well. And those are the tests that are failing
right now.

To solve this the bahavior has changed such that when a point lies on a
cell edge its is considered to be in the cell. This also applies to
structred grids.


This was

# Checklist
<!---
Before requesting review, please go through this checklist:
-->

- [ ] Links to correct issue
- [ ] Update changelog, if changes affect users
- [ ] PR title starts with ``Issue #nr``, e.g. ``Issue #737``
- [ ] Unit tests were added
- [ ] **If feature added**: Added/extended example

Author: Manangka

imod/select/points.py

@@ -112,7 +112,7 @@ def points_in_bounds(da, **points):
         da_x = da.coords[key]
         _, xmin, xmax = imod.util.spatial.coord_reference(da_x)
         # Inplace bitwise operator
-        in_bounds &= (x >= xmin) & (x < xmax)
+        in_bounds &= (x >= xmin) & (x <= xmax)
 
     return in_bounds
 

imod/tests/test_select/test_select_points.py

@@ -78,10 +78,10 @@ def test_in_bounds(test_da_nonequidistant, test_uda):
         actual = imod.select.points_in_bounds(case, x=x, y=y)
         assert (expected == actual).all()
 
-        # Upper exclusive
+        # Upper inclusive
         x = 4.0
         y = 3.0
-        expected = np.array([False])
+        expected = np.array([True])
         actual = imod.select.points_in_bounds(case, x=x, y=y)
         assert (expected == actual).all()
 
@@ -107,11 +107,12 @@ def test_get_indices__nonequidistant(test_da_nonequidistant):
     actual = imod.select.points_indices(test_da_nonequidistant, x=x, y=y)
     assert expected == xy_indices(actual)
 
-    # Upper exclusive
+    # Upper inclusive
     x = 4.0
     y = 2.5
-    with pytest.raises(ValueError):
-        actual = imod.select.points_indices(test_da_nonequidistant, x=x, y=y)
+    expected = (np.array([0]), np.array([4]))
+    actual = imod.select.points_indices(test_da_nonequidistant, x=x, y=y)
+    assert expected == xy_indices(actual)
 
     # Arrays
     x = [3.0, 0.0]
@@ -123,11 +124,15 @@ def test_get_indices__nonequidistant(test_da_nonequidistant):
     assert (rr_e == rr_a).all()
     assert (cc_e == cc_a).all()
 
-    # Arrays; upper exclusive
+    # Arrays; upper inclusive
     x = [4.0, 0.0]
     y = [2.5, 0.0]
-    with pytest.raises(ValueError):
+    rr_e, cc_e = (np.array([0, 2]), np.array([4, 0]))
+    rr_a, cc_a = xy_indices(
         imod.select.points_indices(test_da_nonequidistant, x=x, y=y)
+    )
+    assert (rr_e == rr_a).all()
+    assert (cc_e == cc_a).all()
 
 
 def test_get_indices__equidistant(test_da):
@@ -141,22 +146,24 @@ def test_get_indices__equidistant(test_da):
 def test_get_indices__unstructured(test_uda):
     x = 3.0
     y = 2.5
-    expected = np.array([3])
+    expected = np.array([2])
     indices = imod.select.points_indices(test_uda, x=x, y=y)
     actual = indices["mesh2d_nFaces"].values
     assert expected == actual
 
-    # Upper exclusive
+    # Upper inclusive
     x = 4.0
     y = 2.5
-    with pytest.raises(ValueError):
-        actual = imod.select.points_indices(test_uda, x=x, y=y)
+    expected = np.array([3])
+    indices = imod.select.points_indices(test_uda, x=x, y=y)
+    actual = indices["mesh2d_nFaces"].values
+    assert expected == actual
 
 
 def test_get_values__unstructured(test_uda):
     x = 3.0
     y = 2.5
-    expected = np.array([3])
+    expected = np.array([2])
     indices = imod.select.points_values(test_uda, x=x, y=y)
     actual = indices["mesh2d_nFaces"].values
     assert expected == actual

pixi.lock

@@ -68,7 +68,6 @@ matplotlib = "*"
 mypy = "*"
 netcdf4 = "*"
 numba = ">=0.50"
-numba_celltree = "<0.2" # The 0.2 version breaks the following test: test_in_bounds, test_get_indices__unstructured, test_get_values__unstructured
 numpy = "*"
 pandamesh = "*"
 pandas = "*"