Merge branch 'main' into plainsmap_optional

r.slopeunits.create/r.slopeunits.create.py

@@ -106,16 +106,33 @@
 # % answer: 20
 # %end
 
+# %option
+# % key: convergence
+# % type: integer
+# % label: Convergence factor for MFD in r.watershed (1-10)
+# % description: 1 = most diverging flow, 10 = most converging flow. Recommended: 5
+# % answer: 5
+# %end
+
 # %flag
 # % key: g
 # % description: Generalize Slope Units vector layer
 # % guisection: flags
 # %end
 
+# %flag
+# % key: s
+# % label: SFD (D8) flow in r.watershed (default is MFD)
+# % description: SFD: single flow direction, MFD: multiple flow direction
+# % guisection: flags
+# %end
+
 # %rules
 # % requires: -g,slumapvect
 # %end
 
+# pylint: disable=C0302 (too-many-lines)
+
 import atexit
 import os
 
@@ -157,6 +174,7 @@ def slope_units(
     cvarmin=-1.0,
     red=-1,
     maxiter=0,
+    convergence=5,
 ):
     """core slope unit calculation"""
 
@@ -250,12 +268,17 @@ def slope_units(
         grass.run_command(
             "g.remove", type="raster", name="slu_r_tmp", flags="f", quiet=True
         )
+        if flags["s"]:
+            rwflags = "abs"
+        else:
+            rwflags = "ab"
         grass.run_command(
             "r.watershed",
             elevation=dem,
             hbasin="slu_r_tmp",
             thresh=thc,
-            flags="ab",
+            convergence=convergence,
+            flags=rwflags,
             quiet=True,
         )
         rm_rasters.append("slu_r_tmp")
@@ -757,6 +780,7 @@ def main():
     cvarmin = float(options["cvmin"])
     red = int(options["rf"])
     maxiter = int(options["maxiteration"])
+    convergence = int(options["convergence"])
 
     slope_units(
         dem,
@@ -769,6 +793,7 @@ def main():
         cvarmin,
         red,
         maxiter,
+        convergence,
     )
     if options["slumapvect"]:
         export_as_vect(slumap, options["slumapvect"])

r.slopeunits.optimize/r.slopeunits.optimize.py

@@ -125,6 +125,20 @@
 # % answer: outdir
 # %end
 
+# %option
+# % key: convergence
+# % type: integer
+# % label: Convergence factor for MFD in r.watershed (1-10)
+# % description: 1 = most diverging flow, 10 = most converging flow. Recommended: 5
+# % answer: 5
+# %end
+
+# %flag
+# % key: s
+# % label: SFD (D8) flow in r.watershed (default is MFD)
+# % description: SFD: single flow direction, MFD: multiple flow direction
+# %end
+
 # pylint: disable=C0302 (too-many-lines)
 
 import atexit
@@ -173,6 +187,7 @@ def run_batch(
     thresh,
     cleansize,
     plainsmap,
+    convergence,
 ):
     """Calls r.slopeunits.create, r.slopeunits.clean and r.slopeunits.metrics"""
     global COUNT_GLOBAL
@@ -201,6 +216,10 @@ def run_batch(
     kwargs = {}
     if plainsmap:
         kwargs["plainsmap"] = plainsmap
+    if flags["s"]:
+        rwflags = "s"
+    else:
+        rwflags = ""
     grass.run_command(
         "r.slopeunits.create",
         demmap=dem,
@@ -210,6 +229,8 @@ def run_batch(
         cvmin=cvmin,
         rf=redf,
         maxiteration=maxiteration,
+        convergence=convergence,
+        flags=rwflags,
         overwrite=True,
         **kwargs,
     )
@@ -278,6 +299,7 @@ def calcola_loop(
     thresh,
     cleansize,
     plainsmap,
+    convergence,
     ico,
     calcd_file,
     current_file,
@@ -313,6 +335,7 @@ def calcola_loop(
             thresh,
             cleansize,
             plainsmap,
+            convergence,
         )
         out1 = f"{float(metrics['v_fin']):16.14f}"
         out2 = f"{float(metrics['i_fin']):16.9f}".strip()
@@ -361,6 +384,7 @@ def calcola_current(
     thresh,
     cleansize,
     plainsmap,
+    convergence,
     calcd_file,
     current_file,
 ):
@@ -387,6 +411,7 @@ def calcola_current(
                 thresh,
                 cleansize,
                 plainsmap,
+                convergence,
                 ico,
                 calcd_file,
                 current_file,
@@ -423,6 +448,7 @@ def calcola_current(
         thresh,
         cleansize,
         plainsmap,
+        convergence,
         ico,
         calcd_file,
         current_file,
@@ -615,6 +641,7 @@ def main():
     ]
     epsilonx = float(options["epsilonx"])
     epsilony = float(options["epsilony"])
+    convergence = int(options["convergence"])
     outdir = os.path.abspath(options["outdir"])
 
     calcd_file = os.path.join(outdir, "calcd.dat")
@@ -668,6 +695,7 @@ def main():
             thresh,
             cleansize,
             plainsmap,
+            convergence,
             calcd_file,
             current_file,
         )