From 1967f0706d6e150f90178e03fe3cd5d2fb681446 Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.priv>
Date: Mon, 4 Mar 2019 13:51:25 +0100
Subject: [PATCH] v1.2.7.5 CLEAN: typo revisions and prints removed
---
DESCRIPTION | 2 +-
NEWS.rmd | 2 +-
R/CreateIniStates.R | 2 +-
R/CreateRunOptions.R | 5 ++---
R/RunModel_CemaNeige.R | 2 +-
5 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index c2c76835..197b5640 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
Package: airGR
Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
-Version: 1.2.7.4
+Version: 1.2.7.5
Date: 2019-03-04
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
diff --git a/NEWS.rmd b/NEWS.rmd
index e7cace17..137d9047 100644
--- a/NEWS.rmd
+++ b/NEWS.rmd
@@ -13,7 +13,7 @@ output:
-### 1.2.7.4 Release Notes (2019-03-04)
+### 1.2.7.5 Release Notes (2019-03-04)
diff --git a/R/CreateIniStates.R b/R/CreateIniStates.R
index be0554e6..92e57660 100644
--- a/R/CreateIniStates.R
+++ b/R/CreateIniStates.R
@@ -182,7 +182,7 @@ CreateIniStates <- function(FUN_MOD, InputsModel,
if (is.null(GlocmaxCemaNeigeLayers)) {
GlocmaxCemaNeigeLayers <- rep(Inf, NLayers)
}
- cat(GCemaNeigeLayers)
+
# check negative values
if (any(ProdStore < 0) | any(RoutStore < 0) |
diff --git a/R/CreateRunOptions.R b/R/CreateRunOptions.R
index 25512811..dd9bfc97 100644
--- a/R/CreateRunOptions.R
+++ b/R/CreateRunOptions.R
@@ -313,14 +313,13 @@ CreateRunOptions <- function(FUN_MOD, InputsModel, IndPeriod_WarmUp = NULL, IndP
Outputs_Cal <- c("DatesR", Outputs_all, "StateEnd")
}
- Test <-
- which(Outputs_Cal %in% c("DatesR", Outputs_all, "StateEnd") == FALSE)
+ Test <- which(Outputs_Cal %in% c("DatesR", Outputs_all, "StateEnd") == FALSE)
if (length(Test) != 0) {
stop(paste0("'Outputs_Cal' is incorrectly defined: ",
paste(Outputs_Cal[Test], collapse = ", "), " not found"))
}
Outputs_Cal <- Outputs_Cal[!duplicated(Outputs_Cal)]
- Outputs_Calxxx <- unique(Outputs_Cal[!duplicated(Outputs_Cal)])
+ Outputs_Calxxx <- unique(Outputs_Cal)
print(Outputs_Cal)
print(Outputs_Calxxx)
diff --git a/R/RunModel_CemaNeige.R b/R/RunModel_CemaNeige.R
index db5f3b5b..ba4d1192 100644
--- a/R/RunModel_CemaNeige.R
+++ b/R/RunModel_CemaNeige.R
@@ -11,7 +11,7 @@ RunModel_CemaNeige <- function(InputsModel, RunOptions, Param, IsHyst = FALSE) {
NParam <- ifelse(IsHyst, 4L, 2L)
NStates <- 4L
FortranOutputsCemaNeige <- .FortranOutputs(GR = NULL, isCN = TRUE)$CN
- print(FortranOutputsCemaNeige)
+
## Arguments_check
if (!inherits(InputsModel, "InputsModel")) {
--
GitLab