Merge pull request #19 from Cervest/fix/devcontainer

mainly changing function argument type so that runoff of type float c…
Cervest · Feb 6, 2023 · ad14c3c · ad14c3c
2 parents 6642129 + ad2b541
commit ad14c3c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -6,7 +6,12 @@
         "ms-vscode.cmake-tools"
     ],
     "dockerFile": "Dockerfile",
+    "build": {
+        "args": {
+            "BUILDKIT_INLINE_CACHE": "0"
+        }
+    },
     "runArgs": [
-        "--privileged" //this is to allow to run BinaryBuilder inside the container
+        "--privileged" //this is to allow to run BinaryBuilder inside the container 
     ]
 }
diff --git a/.gitignore b/.gitignore
@@ -12,4 +12,5 @@ build/
 *.so
 data/clipped_corrected_DSM_N51_W001_V2_50m.tif
 docs/jl-docs/
-richdem.json
+richdem.json
+data/auckland
diff --git a/src/jlrichdem/depressions/jldepressions.cpp b/src/jlrichdem/depressions/jldepressions.cpp
@@ -115,7 +115,7 @@ JLCXX_MODULE define_depressions_module(jlcxx::Module &mod)
                                          const rd::Array2D<rd::dephier::dh_label_t> &label,
                                          const rd::Array2D<rd::flowdir_t> &flowdirs,
                                          rd::dephier::DepressionHierarchy<float> &deps,
-                                         rd::Array2D<double> &wtd)
+                                         rd::Array2D<float> &wtd)
                { return rd::dephier::FillSpillMerge(topo, label, flowdirs, deps, wtd); });
 
     mod.method("FillSpillMergeDouble", [](const rd::Array2D<double> &topo,

diff --git a/wrappers/pyrichdem/requirements.txt b/wrappers/pyrichdem/requirements.txt
@@ -1,2 +1,2 @@
-numpy>=1.7,<2; python_version > '3.4'
+numpy>=1.22,<2; python_version > '3.4'
 pybind11>=2.9.1,<3