From c22f1a6ea3cbdaa2b93a3901a20c1b0e972f36b7 Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.priv>
Date: Wed, 30 Jan 2019 14:33:23 +0100
Subject: [PATCH] v1.2.1.0 NEW: add GthrCemaNeigeLayers and
GlocmaxCemaNeigeLayers argiments to CreateIniStates to use hysteresis in
CemaNeige #5252
---
DESCRIPTION | 2 +-
NEWS.rmd | 2 +-
R/CreateIniStates.R | 12 ++++++++++--
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 72d3f086..c996b284 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 ad0d42a1..02ba8a25 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 85bd8ad6..afac0acc 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)
--
GitLab