From b10618e137b40c751087b6e61bca6aa87dd22b3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20Sch=C3=BCrz?= <christoph.schuerz@ufz.de>
Date: Fri, 24 Feb 2023 10:01:07 +0100
Subject: [PATCH] Fix error case for model run
---
DESCRIPTION | 2 +-
R/run_swat_verify.R | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index fc44054..88bbd9e 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
Package: SWATdoctR
Type: Package
Title: Finding the right diagnoses and treatments for SWAT+ models
-Version: 0.1.5
+Version: 0.1.6
Author: c(person("Svajunas", "Plunge",
email = "svajunas_plunge@sggw.edu.pl",
role = c("aut")),
diff --git a/R/run_swat_verify.R b/R/run_swat_verify.R
index 9b30a32..a2bdfd3 100644
--- a/R/run_swat_verify.R
+++ b/R/run_swat_verify.R
@@ -61,11 +61,11 @@ run_swat_verification <- function(project_path, outputs = c('wb', 'mgt', 'plt'),
msg <- run(run_os(swat_exe, os), wd = run_path,
error_on_status = FALSE)
- if(msg$timeout) {
+ if(nchar(msg$stderr) > 0) {
out_msg <- str_split(msg$stdout, '\r\n|\r|\n', simplify = TRUE) %>%
.[max(1, length(.) - 10):length(.)]
- err_msg <- c(paste0('Simulation timed out after ', time_out, ' sec'),
- 'Simulation run:', out_msg)
+ err_msg <- str_split(msg$stderr, '\r\n|\r|\n', simplify = TRUE)
+ err_msg <- c('Last output:', out_msg, 'Error:', err_msg)
model_output <- err_msg
} else if(nchar(msg$stderr) == 0) {
model_output <- list()
--
GitLab