disable non-ASCII paths in taudem_exec

lucarraro · Apr 24, 2024 · f3fc067 · f3fc067
1 parent 2e2542e
commit f3fc067
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 26 deletions.
diff --git a/R/aread8.R b/R/aread8.R
@@ -62,11 +62,6 @@ taudem_aread8 <- function(input_d8flowdir_grid,
     rlang::abort("outlet_layer_name and outlet_layer_number must not both be specified.")
   }
 
-  if (grepl("[^ -~]", input_d8flowdir_grid) | grepl("[^ -~]", output_contributing_area_grid)){
-    rlang::abort("The path file and/or the working directory contain(s) non-ASCII
-                 characters, which are not supported by MPI.")
-  }
-
   args <- c(
     "-p", input_d8flowdir_grid,
     "-ad8", output_contributing_area_grid

diff --git a/R/d8flowdir.R b/R/d8flowdir.R
@@ -45,11 +45,6 @@ taudem_d8flowdir <- function(input_elevation_grid,
     output_d8slopes_grid <- sprintf("%s.tif", output_d8slopes_grid_file)
   }
 
-  if (grepl("[^ -~]", input_elevation_grid) | grepl("[^ -~]", output_d8flowdir_grid)){
-    rlang::abort("The path file and/or the working directory contain(s) non-ASCII
-                 characters, which are not supported by MPI.")
-  }
-
   args <- c(
     "-fel", input_elevation_grid,
     "-p", output_d8flowdir_grid,

diff --git a/R/moveoutletstostrm.R b/R/moveoutletstostrm.R
@@ -58,12 +58,6 @@ taudem_moveoutletstostream <- function(input_d8flowdir_grid,
     "moveoutletstostrm"
   }
 
-  if (grepl("[^ -~]", input_d8flowdir_grid) | grepl("[^ -~]", input_stream_raster_grid) |
-      grepl("[^ -~]",output_moved_outlets_file)){
-    rlang::abort("The path file and/or the working directory contain(s) non-ASCII
-                 characters, which are not supported by MPI.")
-  }
-
   args <- c(
     "-p", input_d8flowdir_grid,
     "-src", input_stream_raster_grid,

diff --git a/R/pitremove.R b/R/pitremove.R
@@ -42,11 +42,6 @@ taudem_pitremove <- function(input_elevation_grid,
     rlang::abort(sprintf("Can't find file %s (depmask)", depmask))
   }
 
-  if (grepl("[^ -~]", input_elevation_grid) | grepl("[^ -~]", output_elevation_grid)){
-    rlang::abort("The path file and/or the working directory contain(s) non-ASCII
-                 characters, which are not supported by MPI.")
-  }
-
   args <- c(
     "-z", input_elevation_grid,
     "-fel", output_elevation_grid

diff --git a/R/taudem-exec.R b/R/taudem-exec.R
@@ -45,6 +45,11 @@ taudem_exec <- function(program, args, ..., n_processes = getOption("traudem.n_p
   }
   register_taudem()
 
+  if (grepl("[^ -~]", getwd())){
+    rlang::abort("The working directory contain(s) non-ASCII characters,
+                 which are not supported by MPI.")
+  }
+
   if (!is.null(n_processes)) {
     cmd <- "mpiexec"
     args <- c("-n", n_processes, program, args)

diff --git a/R/threshold.R b/R/threshold.R
@@ -48,11 +48,6 @@ taudem_threshold <- function(input_area_grid,
     rlang::abort(sprintf("Can't find file %s (mask_file)", mask_file))
   }
 
-  if (grepl("[^ -~]", input_area_grid) | grepl("[^ -~]", output_stream_raster_grid)){
-    rlang::abort("The path file and/or the working directory contain(s) non-ASCII
-                 characters, which are not supported by MPI.")
-  }
-
   args <- c(
     "-ssa", input_area_grid,
     "-src", output_stream_raster_grid,