simplify ind method (#189)

* simplify ind method

* add unittest for index

* bump version to 1.0.4.dev

envs/hydromt-sfincs-dev.yml

@@ -9,7 +9,7 @@ dependencies:
 - descartes
 - ffmpeg
 - geopandas>=0.8
-- hydromt>=0.9.1
+- hydromt>=0.9.1, <0.10
 - jupyterlab
 - matplotlib
 - nbsphinx

hydromt_sfincs/__init__.py

@@ -3,7 +3,7 @@
 from os.path import dirname, join, abspath
 
 
-__version__ = "1.0.3"
+__version__ = "1.0.4.dev"
 
 DATADIR = join(dirname(abspath(__file__)), "data")
 

hydromt_sfincs/regulargrid.py

@@ -103,9 +103,7 @@ def empty_mask(self) -> xr.DataArray:
     def ind(self, mask: np.ndarray) -> np.ndarray:
         """Return indices of active cells in mask."""
         assert mask.shape == (self.nmax, self.mmax)
-        iok = np.where(np.transpose(mask) > 0)
-        iok = (iok[1], iok[0])
-        ind = np.ravel_multi_index(iok, (self.nmax, self.mmax), order="F")
+        ind = np.where(mask.ravel(order="F"))[0]
         return ind
 
     def write_ind(

tests/conftest.py

@@ -3,13 +3,37 @@
 from os.path import abspath, dirname, join
 
 import pytest
+import numpy as np
 
 from hydromt_sfincs.sfincs import SfincsModel
+from hydromt_sfincs.regulargrid import RegularGrid
 
 TESTDATADIR = join(dirname(abspath(__file__)), "data")
 TESTMODELDIR = join(TESTDATADIR, "sfincs_test")
 
 
+@pytest.fixture
+def reggrid():
+    # create a simple regular grid
+    grid = RegularGrid(
+        x0=318650,
+        y0=5040000,
+        dx=150,
+        dy=150,
+        nmax=84,  # height
+        mmax=36,  # width
+    )
+    return grid
+
+
+@pytest.fixture
+def mask(reggrid):
+    # create a simple mask
+    mask = np.zeros((reggrid.nmax, reggrid.mmax), dtype="u1")
+    mask[2:, 3:-1] = 1
+    return mask
+
+
 @pytest.fixture
 def weirs():
     feats = [

tests/test_regulargrid.py

@@ -0,0 +1,8 @@
+import numpy as np
+
+
+def test_ind(reggrid, mask):
+    ind = reggrid.ind(mask)
+    assert ind[0] == 254
+    assert ind[-1] == 2939
+    assert ind.size == np.sum(mask > 0)