v1.2.1.1 NEW: add two states to CreateRunOptions to use hysteresis in CemaNeige #5252

c588a637 · Delaigue Olivier · c22f1a6e · c588a637 · c588a637 · c588a637
Commit c588a637 authored 6 years ago by Delaigue Olivier
Hide whitespace changes
Inline Side-by-side

Showing

with 4 additions and 4 deletions
+4 -4
--- a/DESCRIPTION
+++ b/DESCRIPTION
 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")),

--- 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) 




--- 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