v1.3.0.4 UPDATE: Calibration_Michel modified to take into account RunModel_CemaNeigeGR4H

f040501b · Delaigue Olivier · 024d41af · f040501b · f040501b · f040501b
Commit f040501b authored 5 years ago by Delaigue Olivier
Hide whitespace changes
Inline Side-by-side

Showing

with 7 additions and 3 deletions
+7 -3
--- a/DESCRIPTION
+++ b/DESCRIPTION
 Package: airGR
 Type: Package
 Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
-Version: 1.3.0.3
+Version: 1.3.0.4
 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.3 Release Notes (2019-05-20)
+### 1.3.0.4 Release Notes (2019-05-20)
 #### New features

--- a/R/Calibration_Michel.R
+++ b/R/Calibration_Michel.R
@@ -82,7 +82,11 @@ Calibration_Michel <- function(InputsModel,
        FUN_TRANSFO <- TransfoParam_CemaNeige
      }
    }
-    if (identical(FUN_MOD, RunModel_CemaNeigeGR4J) | identical(FUN_MOD, RunModel_CemaNeigeGR5J) | identical(FUN_MOD, RunModel_CemaNeigeGR6J)) {
+    if (identical(FUN_MOD, RunModel_CemaNeigeGR4H) |
+        identical(FUN_MOD, RunModel_CemaNeigeGR4J) | identical(FUN_MOD, RunModel_CemaNeigeGR5J) | identical(FUN_MOD, RunModel_CemaNeigeGR6J)) {
+      if (identical(FUN_MOD, RunModel_CemaNeigeGR4H)) {
+        FUN1 <- TransfoParam_GR4H
+      }
      if (identical(FUN_MOD, RunModel_CemaNeigeGR4J)) {
        FUN1 <- TransfoParam_GR4J
      }