diff --git a/R/CreateRunOptions.R b/R/CreateRunOptions.R index 04fe0c818e49977fbbef106844ece8e996d1c1e4..fd1694e271d03e1af37623eaf1f31dc2a8bb8a20 100644 --- a/R/CreateRunOptions.R +++ b/R/CreateRunOptions.R @@ -337,8 +337,7 @@ CreateRunOptions <- function(FUN_MOD, InputsModel, if ("CemaNeige" %in% ObjectClass) { Outputs_Cal <- c("PliqAndMelt", Outputs_Cal) } - } - if ("CemaNeige" %in% ObjectClass) { + } else if ("CemaNeige" %in% ObjectClass) { Outputs_Cal <- c("all") } } else { diff --git a/tests/scheduled_tests/benchmarkRunmodel.R b/tests/scheduled_tests/benchmarkRunmodel.R index 1ff3e100854751a531e37654fd4e927c8d511a7b..922fa5a839aa12cd626a11e9c1e88cbc7865c422 100644 --- a/tests/scheduled_tests/benchmarkRunmodel.R +++ b/tests/scheduled_tests/benchmarkRunmodel.R @@ -25,9 +25,10 @@ dfBM <- cbind(version = as.character(packageVersion('airGR')), dfBM) file <- "tests/tmp/benchmark.txt" +dir.create("tests/tmp", showWarnings = FALSE) write.table(dfBM, file = file, row.names = FALSE, col.names = !file.exists(file), quote = FALSE, - sep = "\t", append = TRUE) + sep = "\t", append = file.exists(file)) df <- read.table(file = file, sep = "\t", header = TRUE) if(length(unique(df$version)) > 1) { @@ -39,7 +40,7 @@ if(length(unique(df$version)) > 1) { dfMean <- cbind(model = sModelNames, as.data.frame(t(do.call(rbind, lV)))) dfMean$evolution <- (dfMean[,3] - dfMean[,2]) / dfMean[,2] write.table(dfMean, "tests/tmp/mean_execution_time.txt", row.names = FALSE, quote = F, sep = "\t") - res <- testthat::test_file("tests/testthat/benchmark_RunModel.R") + res <- testthat::test_file("tests/testthat/benchmarkRunModel.R") dRes <- as.data.frame(res) if (any(dRes[, "failed"] > 0) | any(dRes[, "error"])) { quit(status = 1)