diff --git a/DESCRIPTION b/DESCRIPTION index c2c76835a59b44d66a2be6d1eab1df8358555fb0..197b564023955b3261afdfff6d1c8ffb9b63c0a3 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 e7cace176129c4d1986af3319fc3a58d15415376..137d90476fe0dc2348e1ee31596d30fbdb7a1664 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 be0554e606c602dfc448deddaf833edd193042ad..92e57660992f62d83bddaeb6f6d0c2f9333ee080 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 2551281164911c3991b9d687378bd9c7071d7109..dd9bfc97656cde7f76477d0e20184ce70cef1fda 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 db5f3b5bd87bb659defc96ab71cf583cfaad5cca..ba4d1192ef553f6d97eb33e154a21951af57b8fb 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")) {