v1.6.1.10 refactor: Calibration_Michel now uses the RunModel function instead...

v1.6.1.10 refactor: Calibration_Michel now uses the RunModel function instead of the FUN_MOD alias #34

v1.6.1.10 refactor: Calibration_Michel now uses the RunModel function instead...
v1.6.1.10 refactor: Calibration_Michel now uses the RunModel function instead of the FUN_MOD alias #34
31352a7b · Delaigue Olivier · 5083d45a · 31352a7b · 31352a7b · 31352a7b
Commit 31352a7b authored 4 years ago by Delaigue Olivier
Hide whitespace changes
Inline Side-by-side

Showing

with 5 additions and 6 deletions
+5 -6
--- a/DESCRIPTION
+++ b/DESCRIPTION
 Package: airGR
 Type: Package
 Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
-Version: 1.6.1.9
+Version: 1.6.1.10
 Date: 2020-04-07
 Authors@R: c(
  person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),

--- a/NEWS.md
+++ b/NEWS.md
@@ -2,7 +2,7 @@



-### 1.6.1.9 Release Notes (2020-04-07)
+### 1.6.1.10 Release Notes (2020-04-07)

 #### New features


--- a/R/Calibration_Michel.R
+++ b/R/Calibration_Michel.R
@@ -276,7 +276,7 @@ Calibration_Michel <- function(InputsModel,
    }
    ##Model_run
    Param <- CandidatesParamR[iNew, ]
-    OutputsModel <- FUN_MOD(InputsModel, RunOptions, Param)
+    OutputsModel <- RunModel(InputsModel, RunOptions, Param, FUN_MOD = FUN_MOD)
    
    ##Calibration_criterion_computation
    OutputsCrit <- ErrorCrit(InputsCrit, OutputsModel, verbose = FALSE)
@@ -425,7 +425,7 @@ Calibration_Michel <- function(InputsModel,
    for (iNew in 1:nrow(CandidatesParamR)) {
      ##Model_run
      Param <- CandidatesParamR[iNew, ]
-      OutputsModel <- FUN_MOD(InputsModel, RunOptions, Param)
+      OutputsModel <- RunModel(InputsModel, RunOptions, Param, FUN_MOD = FUN_MOD)
      ##Calibration_criterion_computation
      OutputsCrit <- ErrorCrit(InputsCrit, OutputsModel, verbose = FALSE)      
      if (!is.na(OutputsCrit$CritValue)) {
@@ -486,7 +486,7 @@ Calibration_Michel <- function(InputsModel,
      CandidatesParamR <- FUN_TRANSFO(CandidatesParamT, "TR")
      ##Model_run
      Param <- CandidatesParamR[iNew, ]
-      OutputsModel <- FUN_MOD(InputsModel, RunOptions, Param)
+      OutputsModel <- RunModel(InputsModel, RunOptions, Param, FUN_MOD = FUN_MOD)
      ##Calibration_criterion_computation
      OutputsCrit <- ErrorCrit(InputsCrit, OutputsModel, verbose = FALSE)
      if (OutputsCrit$CritValue * OutputsCrit$Multiplier < CritOptim) {
@@ -566,4 +566,3 @@ Calibration_Michel <- function(InputsModel,
  
  
 }
-