v1.3.0.14 BUG: StateEnd values of UH1 are now right in RunModel_CemaNeigeGR4H

76a06239 · Delaigue Olivier · ff6a2962 · 76a06239 · 76a06239 · 76a06239
Commit 76a06239 authored 5 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.3.0.13
+Version: 1.3.0.14
 Date: 2019-05-20
 Authors@R: c(
  person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),

--- a/NEWS.rmd
+++ b/NEWS.rmd
@@ -14,7 +14,7 @@ output:



-### 1.3.0.13 Release Notes (2019-05-20)
+### 1.3.0.14 Release Notes (2019-05-20)


 #### New features

--- a/R/RunModel_CemaNeigeGR4H.R
+++ b/R/RunModel_CemaNeigeGR4H.R
@@ -131,9 +131,9 @@ RunModel_CemaNeigeGR4H <- function(InputsModel,RunOptions,Param){
      RESULTS$StateEnd[round(RESULTS$StateEnd,3)==(-999.999)] <- NA;
      if (ExportStateEnd) {
        idNStates <- seq_len(NStates*NLayers) %% NStates
-        RESULTS$StateEnd <- CreateIniStates(FUN_MOD = RunModel_CemaNeigeGR4J, InputsModel = InputsModel, IsHyst = IsHyst,
+        RESULTS$StateEnd <- CreateIniStates(FUN_MOD = RunModel_CemaNeigeGR4H, InputsModel = InputsModel, IsHyst = IsHyst,
                                            ProdStore = RESULTS$StateEnd[1L], RoutStore = RESULTS$StateEnd[2L], ExpStore = NULL,
-                                            UH1 = RESULTS$StateEnd[(1:20)+7], UH2 = RESULTS$StateEnd[(1:40)+(7+20)],
+                                            UH1 = RESULTS$StateEnd[(1:(20*24))+7], UH2 = RESULTS$StateEnd[(1:(40*24))+(7+20*24)],
                                            GCemaNeigeLayers       = CemaNeigeStateEnd[seq_len(NStates*NLayers)[idNStates == 3]],
                                            eTGCemaNeigeLayers     = CemaNeigeStateEnd[seq_len(NStates*NLayers)[idNStates == 2]],
                                            GthrCemaNeigeLayers    = CemaNeigeStateEnd[seq_len(NStates*NLayers)[idNStates == 1]],