bug fix: model_input was not accessible from with output_fun-function…

…. Now it works.

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: LWFBrook90R
 Title: Run the LWF-Brook90 Hydrological Model in R
-Version: 0.3.1
+Version: 0.3.2
 Authors@R: c(person("Paul", "Schmidt-Walter", , "[email protected]", role = c("aut", "cre")),
              person("Volodymyr", "Trotsiuk", , "[email protected]", role = c("aut")),
              person("Klaus", "Hammel", , ,role = c("aut")),

R/runLWFB90.R

@@ -297,9 +297,8 @@ runLWFB90 <- function(project.dir = "runLWFB90/",
       names(simout) <- list.files(".", pattern = ".ASC")
 
       # append results
-      if (rtrn.output) {
-        simres[names(simout)] <- simout
-      }
+      simres[names(simout)] <- simout
+
 
       # ---- apply functions on simulation output -------------------------------
       if (!is.null(output_fun)) {
@@ -310,7 +309,7 @@ runLWFB90 <- function(project.dir = "runLWFB90/",
           output_fun <- list(output_fun)
         }
 
-        outfunargs <- list(x = simout,...)
+        outfunargs <- list(x = simres,...)
 
         outfunargsnms <- lapply(output_fun, FUN = function(x,argsnms) {
           match.arg(methods::formalArgs(x),
@@ -329,6 +328,12 @@ runLWFB90 <- function(project.dir = "runLWFB90/",
         warning = function(wrn){return(wrn)},
         error = function(err){return(err)})
       }
+
+      # remove the basic results again if they are not required
+      if (!rtrn.output) {
+        simres <- simres[-which(names(simres) %in% names(simout))]
+      }
+
     }
 
   } else {

dev/README.Rmd

@@ -18,7 +18,7 @@ knitr::opts_chunk$set(
 
 ------
 
-Run the [LWF-BROOK90](https://www.lwf.bayern.de/boden-klima/wasserhaushalt/index.php) hydrological model from within R
+Run the [LWF-BROOK90](https://www.lwf.bayern.de/boden-klima/wasserhaushalt/index.php) hydrological model in R
 
 ## Installation