v1.2.11.12 BUG: add setting parameter values for Gthreshold and Glocalmax when...

v1.2.11.12 BUG: add setting parameter values for Gthreshold and Glocalmax when hysteresis is used in RunModel_CemaNeige* funs #5252

DESCRIPTION

 Package: airGR
 Type: Package
 Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
-Version: 1.2.11.11
+Version: 1.2.11.12
 Date: 2019-03-25
 Authors@R: c(
   person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),

NEWS.rmd

@@ -13,7 +13,7 @@ output:
 
 
 
-### 1.2.11.11 Release Notes (2019-03-25) 
+### 1.2.11.12 Release Notes (2019-03-25) 
 
 
 

R/RunModel_CemaNeige.R

@@ -65,7 +65,12 @@ RunModel_CemaNeige <- function(InputsModel, RunOptions, Param) {
   
   ## Call_DLL_CemaNeige_________________________
   for (iLayer in 1:NLayers) {
-    StateStartCemaNeige <- RunOptions$IniStates[(7 + 20 + 40) + c(iLayer, iLayer + NLayers)]
+    
+    if (!IsHyst) {
+      StateStartCemaNeige <- RunOptions$IniStates[(7 + 20 + 40) + c(iLayer, iLayer+NLayers)]
+    } else {
+      StateStartCemaNeige <- RunOptions$IniStates[(7 + 20 + 40) + c(iLayer, iLayer+NLayers, iLayer+2*NLayers, iLayer+3*NLayers)]
+    }
     RESULTS <- .Fortran("frun_CemaNeige", PACKAGE = "airGR",
                         ## inputs
                         LInputs = as.integer(length(IndPeriod1)),                                       ### length of input and output series

R/RunModel_CemaNeigeGR4J.R

@@ -58,7 +58,11 @@ RunModel_CemaNeigeGR4J <- function(InputsModel,RunOptions,Param){
 
     ##Call_DLL_CemaNeige_________________________
       for(iLayer in 1:NLayers){
-        StateStartCemaNeige <- RunOptions$IniStates[(7+20+40) + c(iLayer, iLayer+NLayers)]
+        if (!IsHyst) {
+          StateStartCemaNeige <- RunOptions$IniStates[(7 + 20 + 40) + c(iLayer, iLayer+NLayers)]
+        } else {
+          StateStartCemaNeige <- RunOptions$IniStates[(7 + 20 + 40) + c(iLayer, iLayer+NLayers, iLayer+2*NLayers, iLayer+3*NLayers)]
+        }
         RESULTS <- .Fortran("frun_CemaNeige",PACKAGE="airGR",
                         ##inputs
                             LInputs=LInputSeries,                                                         ### length of input and output series

R/RunModel_CemaNeigeGR5J.R

@@ -56,7 +56,11 @@ RunModel_CemaNeigeGR5J <- function(InputsModel,RunOptions,Param){
       
     ##Call_DLL_CemaNeige_________________________
       for(iLayer in 1:NLayers){
-        StateStartCemaNeige <- RunOptions$IniStates[(7+20+40) + c(iLayer, iLayer+NLayers)]
+        if (!IsHyst) {
+          StateStartCemaNeige <- RunOptions$IniStates[(7 + 20 + 40) + c(iLayer, iLayer+NLayers)]
+        } else {
+          StateStartCemaNeige <- RunOptions$IniStates[(7 + 20 + 40) + c(iLayer, iLayer+NLayers, iLayer+2*NLayers, iLayer+3*NLayers)]
+        }
         RESULTS <- .Fortran("frun_CemaNeige",PACKAGE="airGR",
                         ##inputs
                             LInputs=LInputSeries,                                                         ### length of input and output series

R/RunModel_CemaNeigeGR6J.R

@@ -60,7 +60,11 @@ RunModel_CemaNeigeGR6J <- function(InputsModel,RunOptions,Param){
       
     ##Call_DLL_CemaNeige_________________________
       for(iLayer in 1:NLayers){
-        StateStartCemaNeige <- RunOptions$IniStates[(7+20+40) + c(iLayer, iLayer+NLayers)]
+        if (!IsHyst) {
+          StateStartCemaNeige <- RunOptions$IniStates[(7 + 20 + 40) + c(iLayer, iLayer+NLayers)]
+        } else {
+          StateStartCemaNeige <- RunOptions$IniStates[(7 + 20 + 40) + c(iLayer, iLayer+NLayers, iLayer+2*NLayers, iLayer+3*NLayers)]
+        }
         RESULTS <- .Fortran("frun_CemaNeige",PACKAGE="airGR",
                         ##inputs
                             LInputs=LInputSeries,                                                          ### length of input and output series