diff --git a/DESCRIPTION b/DESCRIPTION index 72d3f0868d1b3fdeed34fbd76a66ee94c5d4e6e8..c996b284eb220b83711ffcc46219a946f055c26c 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.0.4 +Version: 1.2.1.0 Date: 2019-01-30 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 ad0d42a1ef0ccc68be4889f499177ef465dfd927..02ba8a250f5327ba8142fbee8352b5cd0690a1f5 100644 --- a/NEWS.rmd +++ b/NEWS.rmd @@ -13,7 +13,7 @@ output: -### 1.2.0.4 Release Notes (2019-01-30) +### 1.2.1.0 Release Notes (2019-01-30) diff --git a/R/CreateIniStates.R b/R/CreateIniStates.R index 85bd8ad6f2075fff7968bb3429fc2543d607950f..afac0acc82619d45fb74856dbe339aeb0eda2a38 100644 --- a/R/CreateIniStates.R +++ b/R/CreateIniStates.R @@ -2,6 +2,7 @@ CreateIniStates <- function(FUN_MOD, InputsModel, ProdStore = 350, RoutStore = 90, ExpStore = NULL, UH1 = NULL, UH2 = NULL, GCemaNeigeLayers = NULL, eTGCemaNeigeLayers = NULL, + GthrCemaNeigeLayers = NULL, GlocmaxCemaNeigeLayers = NULL, verbose = TRUE) { @@ -181,7 +182,13 @@ CreateIniStates <- function(FUN_MOD, InputsModel, if (is.null(eTGCemaNeigeLayers)) { eTGCemaNeigeLayers <- rep(Inf, NLayers) } - + if (is.null(GthrCemaNeigeLayers)) { + GthrCemaNeigeLayers <- rep(Inf, NLayers) + } + if (is.null(GlocmaxCemaNeigeLayers)) { + GlocmaxCemaNeigeLayers <- rep(Inf, NLayers) + } + cat(GCemaNeigeLayers) # check negative values if (any(ProdStore < 0) | any(RoutStore < 0) | @@ -225,7 +232,8 @@ CreateIniStates <- function(FUN_MOD, InputsModel, ## format output IniStates <- list(Store = list(Prod = ProdStore, Rout = RoutStore, Exp = ExpStore), UH = list(UH1 = UH1, UH2 = UH2), - CemaNeigeLayers = list(G = GCemaNeigeLayers, eTG = eTGCemaNeigeLayers)) + CemaNeigeLayers = list(G = GCemaNeigeLayers, eTG = eTGCemaNeigeLayers, + Gthr = GthrCemaNeigeLayers, Glocmax = GlocmaxCemaNeigeLayers)) IniStatesNA <- unlist(IniStates) IniStatesNA[is.infinite(IniStatesNA)] <- NA IniStatesNA <- relist(IniStatesNA, skeleton = IniStates)