changes

VForWaTer · Nov 4, 2024 · 80de5e9 · 80de5e9
1 parent caf5dfc
commit 80de5e9
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 10 deletions.
diff --git a/in/input.json b/in/input.json
@@ -3,9 +3,19 @@
         "parameters":{ 
             "hillslope_id" : -1,
             "no_flow_area" : 0.30,
-            "min_cells:" : 10,
+            "min_cells" : 10,
             "hill_type" : "constant",
-            "depth:" : 2.1
-        }  
+            "depth" : 2.1
+        },
+        "data":{ 
+            "flow_accumulation" : "/in/flow_accumulation.tif",
+            "hillslopes" : "/in/hillslope.tif",
+            "elev2river" : "/in/elevation.tif",
+            "dist2river" : "/in/distance.tif",
+            "filled_dem" : "/in/fill_DEM.tif",
+            "aspect" : "/in/aspect.tif",
+            "river_id" : "/in/streams.tif"
+        } 
+
     }
 }
diff --git a/src/docker_commands.txt b/src/docker_commands.txt
@@ -0,0 +1,6 @@
+This is a docker commands file used only for development and testing - AMJ
+docker ps
+docker build -t catflow .
+docker run --rm -it -v /home/hiwi/development/tool_catflow/in:/in -v /home/hiwi/development/tool_catflow/src:/src -v /home/hiwi/development/tool_catflow/out:/out  catflow bash
+export TOOL_RUN=make_representative_hillslope
+Rscipt run.r
diff --git a/src/tool.yml b/src/tool.yml
@@ -41,29 +41,29 @@ tools:
       data:
         flow_accumulation:
           example: /in/flow_accumulation.tif
-          extension: tiff
+          extension: .tif
           description: Flow accumulation .tif file.
         hillslopes:
           example: /in/hillslope.tif
-          extension: tiff
+          extension: .tif
           description: .tif file for hillslopes.
         elev2river:
           example: /in/elevation.tif
-          extension: tiff
+          extension: .tif
           description: .tif file for elevation to river.
         dist2river:
           example: /in/distance.tif
-          extension: tiff
+          extension: .tif
           description: .tif file for the distance to river.
         filled_dem:
           example: /in/fill_DEM.tif
-          extension: tiff
+          extension: .tif
           description: Filled Digital elevation model (DEM).
         aspect:
           example: /in/aspect.tif
-          extension: tiff
+          extension: .tif
           description: .tif file for aspect.
         river_id:
           example: /in/streams.tif
-          extension: tiff
+          extension: .tif
           description: .tif file for river network.