Merge pull request #4895 from NaturalGIS/fix_saga_ltr_catchaments_area

alexbruy · web-flow · commit 7138f639ad04 · 2017-07-20T17:18:04.000+03:00
[processing] fix SAGA LTR Catchment Area tools
diff --git a/python/plugins/processing/algs/saga/description/FlowAccumulation(FlowTracing).txt b/python/plugins/processing/algs/saga/description/FlowAccumulation(FlowTracing).txt
@@ -1,17 +1,18 @@
 Flow Accumulation (Flow Tracing)
 ta_hydrology
 ParameterRaster|ELEVATION|Elevation|False
+ParameterSelection|FLOW_UNIT|Flow Accumulation Units|[0] Number of Cells;[1] Cell Area|1
 ParameterRaster|SINKROUTE|Sink Routes|True
-ParameterRaster|WEIGHT|Weight|True
-ParameterRaster|MATERIAL|Material|True
-ParameterRaster|VAL_INPUT|Input for Mean over Catchment Calculation|True
-ParameterRaster|TARGET|Target|True
+ParameterRaster|WEIGHTS|Weights|True
+ParameterRaster|ACCU_MATERIAL|Material for Accumulation|True
+ParameterRaster|VAL_INPUT|Input for Mean over Catchment|True
+ParameterRaster|ACCU_TARGET|Accumulation Target|True
 ParameterNumber|STEP|Step|None|None|1
 ParameterSelection|METHOD|Method|[0] Rho 8;[1] Kinematic Routing Algorithm;[2] DEMON
 ParameterNumber|MINDQV|DEMON - Min. DQV|None|None|0.0
-ParameterBoolean|CORRECT|Flow Correction|True
+ParameterBoolean|CORRECT|Flow Correction|False
 OutputRaster|FLOW|Flow Accumulation
 OutputRaster|VAL_MEAN|Mean over Catchment
-OutputRaster|ACCU_TOTAL|Total accumulated Material
+OutputRaster|ACCU_TOTAL|Accumulated Material
 OutputRaster|ACCU_LEFT|Accumulated Material from left side
-OutputRaster|ACCU_RIGHT|Accumulated Material from right side
+OutputRaster|ACCU_RIGHT|Accumulated Material from right side
diff --git a/python/plugins/processing/algs/saga/description/FlowAccumulation(Recursive).txt b/python/plugins/processing/algs/saga/description/FlowAccumulation(Recursive).txt
@@ -1,18 +1,21 @@
 Flow Accumulation (Recursive)
 ta_hydrology
 ParameterRaster|ELEVATION|Elevation|False
+ParameterSelection|FLOW_UNIT|Flow Accumulation Units|[0] Number of Cells;[1] Cell Area|1
 ParameterRaster|SINKROUTE|Sink Routes|True
-ParameterRaster|WEIGHT|Weight|True
-ParameterRaster|MATERIAL|Material|True
-ParameterRaster|VAL_INPUT|Input for Mean over Catchment Calculation|True
-ParameterRaster|TARGET|Target|True
+ParameterRaster|WEIGHTS|Weights|True
+ParameterRaster|ACCU_MATERIAL|Material for Accumulation|True
+ParameterRaster|VAL_INPUT|Input for Mean over Catchment|True
+ParameterRaster|ACCU_TARGET|Accumulation Target|True
 ParameterNumber|STEP|Step|None|None|1
 ParameterRaster|TARGETS|Target Areas|True
 ParameterSelection|METHOD|Method|[0] Deterministic 8;[1] Rho 8;[2] Deterministic Infinity;[3] Multiple Flow Direction
 ParameterNumber|CONVERGENCE|Convergence|None|None|1.1
-OutputRaster|CAREA|Catchment Area
+ParameterBoolean|NO_NEGATIVES|Prevent Negative Flow Accumulation|True
+OutputRaster|FLOW|Catchment Area
 OutputRaster|VAL_MEAN|Mean over Catchment
-OutputRaster|ACCU_TOT|Total accumulated Material
+OutputRaster|ACCU_TOTAL|Accumulated Material
 OutputRaster|ACCU_LEFT|Accumulated Material from left side
 OutputRaster|ACCU_RIGHT|Accumulated Material from right side
-OutputRaster|FLOWLEN|Flow Path Length
+OutputRaster|FLOW_LENGTH|Flow Path Length
+OutputRaster|WEIGHT_LOSS|Loss through Negative Weights
diff --git a/python/plugins/processing/algs/saga/description/FlowAccumulation(Top-Down).txt b/python/plugins/processing/algs/saga/description/FlowAccumulation(Top-Down).txt
@@ -2,4 +2,4 @@ Flow Accumulation (Top-Down)
 ta_hydrology
 ParameterRaster|ELEVATION|Elevation|False
 ParameterSelection|METHOD|Method|[0] Deterministic 8;[1] Rho 8;[2] Braunschweiger Reliefmodell;[3] Deterministic Infinity;[4] Multiple Flow Direction;[5] Multiple Triangular Flow Directon
-OutputRaster|CAREA|Catchment Area
+OutputRaster|FLOW|Catchment Area
