v1.4.1.4 UPDATE: condition tests added to take into account GR5H into Calibration_Michel fun #13

DESCRIPTION

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

NEWS.md

@@ -2,7 +2,7 @@
 
 
 
-### 1.4.1.3 Release Notes (2019-12-05)
+### 1.4.1.4 Release Notes (2019-12-05)
 
 
 #### New features

R/Calibration_Michel.R

@@ -60,6 +60,9 @@ Calibration_Michel <- function(InputsModel,
     if (identical(FUN_MOD, RunModel_GR4H         )) {
       FUN_TRANSFO <- TransfoParam_GR4H
     }
+    if (identical(FUN_MOD, RunModel_GR5H         )) {
+      FUN_TRANSFO <- TransfoParam_G5H
+    }
     if (identical(FUN_MOD, RunModel_GR4J         )) {
       FUN_TRANSFO <- TransfoParam_GR4J
     }
@@ -82,11 +85,14 @@ Calibration_Michel <- function(InputsModel,
         FUN_TRANSFO <- TransfoParam_CemaNeige
       }
     }
-    if (identical(FUN_MOD, RunModel_CemaNeigeGR4H) |
+    if (identical(FUN_MOD, RunModel_CemaNeigeGR4H) | identical(FUN_MOD, RunModel_CemaNeigeGR5H) |
         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_CemaNeigeGR5H)) {
+        FUN1 <- TransfoParam_GR5H
+      }
       if (identical(FUN_MOD, RunModel_CemaNeigeGR4J)) {
         FUN1 <- TransfoParam_GR4J
       }