Commit 1967f070 authored by Delaigue Olivier's avatar Delaigue Olivier
Browse files

v1.2.7.5 CLEAN: typo revisions and prints removed

parent 035fca61
Package: airGR Package: airGR
Type: Package Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
Version: 1.2.7.4 Version: 1.2.7.5
Date: 2019-03-04 Date: 2019-03-04
Authors@R: c( Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")), person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
......
...@@ -13,7 +13,7 @@ output: ...@@ -13,7 +13,7 @@ output:
### 1.2.7.4 Release Notes (2019-03-04) ### 1.2.7.5 Release Notes (2019-03-04)
......
...@@ -182,7 +182,7 @@ CreateIniStates <- function(FUN_MOD, InputsModel, ...@@ -182,7 +182,7 @@ CreateIniStates <- function(FUN_MOD, InputsModel,
if (is.null(GlocmaxCemaNeigeLayers)) { if (is.null(GlocmaxCemaNeigeLayers)) {
GlocmaxCemaNeigeLayers <- rep(Inf, NLayers) GlocmaxCemaNeigeLayers <- rep(Inf, NLayers)
} }
cat(GCemaNeigeLayers)
# check negative values # check negative values
if (any(ProdStore < 0) | any(RoutStore < 0) | if (any(ProdStore < 0) | any(RoutStore < 0) |
......
...@@ -313,14 +313,13 @@ CreateRunOptions <- function(FUN_MOD, InputsModel, IndPeriod_WarmUp = NULL, IndP ...@@ -313,14 +313,13 @@ CreateRunOptions <- function(FUN_MOD, InputsModel, IndPeriod_WarmUp = NULL, IndP
Outputs_Cal <- c("DatesR", Outputs_all, "StateEnd") Outputs_Cal <- c("DatesR", Outputs_all, "StateEnd")
} }
Test <- Test <- which(Outputs_Cal %in% c("DatesR", Outputs_all, "StateEnd") == FALSE)
which(Outputs_Cal %in% c("DatesR", Outputs_all, "StateEnd") == FALSE)
if (length(Test) != 0) { if (length(Test) != 0) {
stop(paste0("'Outputs_Cal' is incorrectly defined: ", stop(paste0("'Outputs_Cal' is incorrectly defined: ",
paste(Outputs_Cal[Test], collapse = ", "), " not found")) paste(Outputs_Cal[Test], collapse = ", "), " not found"))
} }
Outputs_Cal <- Outputs_Cal[!duplicated(Outputs_Cal)] 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_Cal)
print(Outputs_Calxxx) print(Outputs_Calxxx)
......
...@@ -11,7 +11,7 @@ RunModel_CemaNeige <- function(InputsModel, RunOptions, Param, IsHyst = FALSE) { ...@@ -11,7 +11,7 @@ RunModel_CemaNeige <- function(InputsModel, RunOptions, Param, IsHyst = FALSE) {
NParam <- ifelse(IsHyst, 4L, 2L) NParam <- ifelse(IsHyst, 4L, 2L)
NStates <- 4L NStates <- 4L
FortranOutputsCemaNeige <- .FortranOutputs(GR = NULL, isCN = TRUE)$CN FortranOutputsCemaNeige <- .FortranOutputs(GR = NULL, isCN = TRUE)$CN
print(FortranOutputsCemaNeige)
## Arguments_check ## Arguments_check
if (!inherits(InputsModel, "InputsModel")) { if (!inherits(InputsModel, "InputsModel")) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment