From c588a637ca0ecf7bb0b447ded522f924ffeed6b3 Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.priv>
Date: Wed, 30 Jan 2019 14:39:09 +0100
Subject: [PATCH] v1.2.1.1 NEW: add two states to CreateRunOptions to use
hysteresis in CemaNeige #5252
---
DESCRIPTION | 2 +-
NEWS.rmd | 2 +-
R/CreateRunOptions.R | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index c996b284..03632ab6 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.1.0
+Version: 1.2.1.1
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 02ba8a25..448d57e4 100644
--- a/NEWS.rmd
+++ b/NEWS.rmd
@@ -13,7 +13,7 @@ output:
-### 1.2.1.0 Release Notes (2019-01-30)
+### 1.2.1.1 Release Notes (2019-01-30)
diff --git a/R/CreateRunOptions.R b/R/CreateRunOptions.R
index bf3d5ebb..b0104118 100644
--- a/R/CreateRunOptions.R
+++ b/R/CreateRunOptions.R
@@ -208,7 +208,7 @@ CreateRunOptions <- function(FUN_MOD, InputsModel, IndPeriod_WarmUp = NULL, IndP
NState <- 7 + 3 * 24 * 20
}
if ("daily" %in% ObjectClass) {
- NState <- 7 + 3 * 20 + 2 * NLayers
+ NState <- 7 + 3 * 20 + 4 * NLayers
}
if ("monthly" %in% ObjectClass) {
NState <- 2
@@ -290,7 +290,7 @@ CreateRunOptions <- function(FUN_MOD, InputsModel, IndPeriod_WarmUp = NULL, IndP
Outputs_all <- c(Outputs_all,"PotEvap", "Precip", "Qsim")
}
if ("CemaNeige" %in% ObjectClass) {
- Outputs_all <- c(Outputs_all,"Pliq", "Psol", "SnowPack", "ThermalState", "Gratio", "PotMelt", "Melt", "PliqAndMelt", "Temp")
+ Outputs_all <- c(Outputs_all,"Pliq", "Psol", "SnowPack", "ThermalState", "Gratio", "PotMelt", "Melt", "PliqAndMelt", "Temp", "Gthreshold", "Glocalmax")
}
##check_Outputs_Sim
--
GitLab