diff --git a/DESCRIPTION b/DESCRIPTION index c996b284eb220b83711ffcc46219a946f055c26c..03632ab6fa8d50290cb4bf94e388afea856d836e 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 02ba8a250f5327ba8142fbee8352b5cd0690a1f5..448d57e4ccf4b72f2525d72c7d3b22c7374a5c0c 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 bf3d5ebbb44668423356a39043be45bc92bb7d63..b01041181219206e56feccffb86dd79d8e7a026f 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