diff --git a/DESCRIPTION b/DESCRIPTION index cd1e15e4f4c346ba67cae51418e55547df30e758..9fce7ceab5525a0ef4135fc375672fefb14a6e32 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.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")), diff --git a/NEWS.rmd b/NEWS.rmd index b13505062306e5d0235732740bc8dc37aa044b8b..0692e5a1fb71f6a3dd6536c3b8f6d91e64ee30ef 100644 --- a/NEWS.rmd +++ b/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) diff --git a/R/RunModel_CemaNeige.R b/R/RunModel_CemaNeige.R index b8f91324664bc65d48fdfaaf7206e65c055e8d2b..d58e93dfe7ab82ea697605597c029f9e92f84b67 100644 --- a/R/RunModel_CemaNeige.R +++ b/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 diff --git a/R/RunModel_CemaNeigeGR4J.R b/R/RunModel_CemaNeigeGR4J.R index d656a43644de423fee26b47dbd3044312bc3b553..6c79f9bc7f2f48aea16e3b10e972acb9fc2878a9 100644 --- a/R/RunModel_CemaNeigeGR4J.R +++ b/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 diff --git a/R/RunModel_CemaNeigeGR5J.R b/R/RunModel_CemaNeigeGR5J.R index 70b254c128ad9a6a5e3a63bf7026cac6d97e71fb..9ae4c341327ad5fff5f1015b98ba4b1d7a946af0 100644 --- a/R/RunModel_CemaNeigeGR5J.R +++ b/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 diff --git a/R/RunModel_CemaNeigeGR6J.R b/R/RunModel_CemaNeigeGR6J.R index 1e1fce32bba71aa4bc0261bdd96df99db0ed98ec..db28275a9949e4a48ad3edf19addd7f1181b75e5 100644 --- a/R/RunModel_CemaNeigeGR6J.R +++ b/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