rename + file restructure

VForWaTer · Aug 7, 2024 · 0600d91 · 0600d91
1 parent 63c8c51
commit 0600d91
Show file tree

Hide file tree

Showing 13 changed files with 3 additions and 210 deletions.
diff --git a/in/geoprocessing/aspect.tif → in/aspect.tif b/in/geoprocessing/aspect.tif → in/aspect.tif
diff --git a/in/climadat.csv b/in/climadat.csv
diff --git a/in/geoprocessing/dist2riv.tif → in/distance.tif b/in/geoprocessing/dist2riv.tif → in/distance.tif
diff --git a/in/geoprocessing/elev2riv.tif → in/elevation.tif b/in/geoprocessing/elev2riv.tif → in/elevation.tif
diff --git a/in/fac.dat b/in/fac.dat
diff --git a/in/geoprocessing/dem.tif → in/fill_DEM.tif b/in/geoprocessing/dem.tif → in/fill_DEM.tif
diff --git a/in/geoprocessing/flow_acccumulation.tif → in/flow_accumulation.tif b/in/geoprocessing/flow_acccumulation.tif → in/flow_accumulation.tif
diff --git a/in/geoprocessing/basin.tif → in/hillslope.tif b/in/geoprocessing/basin.tif → in/hillslope.tif
diff --git a/in/make_geometry_out/geom.Rds b/in/make_geometry_out/geom.Rds
diff --git a/in/raindat.csv b/in/raindat.csv
diff --git a/in/geoprocessing/river_id.tif → in/streams.tif b/in/geoprocessing/river_id.tif → in/streams.tif
diff --git a/src/hillslope_method.R b/src/hillslope_method.R
@@ -35,7 +35,8 @@ hillslope_tool <- function(hillslope_nr, li_spatial, plot_2d_catena=FALSE, plot_
   # safty check if hillslope_nr is set to zero
   if(hillslope_nr == 0) stop("---Do not use hillslope_nr = 0---")
 
-  hill <- hillslope_as_pts[hillslope_as_pts[,3]==hillslope_nr,]
+  if(hillslope_nr == -1) hill <- hillslope_as_pts # Untested - Ashish 06.08.2024
+  else hill <- hillslope_as_pts[hillslope_as_pts[,3]==hillslope_nr,]
 
   #extract number of cells and area of hillslope
   number_of_cells <- length(hill[,1])

diff --git a/src/run.R b/src/run.R
@@ -16,11 +16,10 @@ toolname <- tolower(Sys.getenv("TOOL_RUN"))
 # make functions from Catflow-R-Package available
 source("catlib.R")
 
-
 # Switch for the different tools available in this package
 if (toolname == "make_representative_hillslope") {
     make_geometry_representative_hillslope(params,data_paths)
 } else {
     # in any other case, the tool was invalid or not configured
-    print(paste("[", Sys.time(), "] Either no TOOL_RUN environment variable available, or '", toolname, "' is not valid.\n", sep = ""))
+    print(paste("[", Sys.time(), "] Either no TOOL_RUN environment variable available, or '", toolname, "' is not valid.\n", sep = "")) # nolint: line_length_linter.
 }