v1.0.9.53 minor revision of Calibration_Michel

cba7f37e · unknown · 1b62dfdd · cba7f37e · cba7f37e · cba7f37e
Commit cba7f37e authored 7 years ago by unknown
Hide whitespace changes
Inline Side-by-side

Showing

with 4 additions and 9 deletions
+4 -9
--- a/DESCRIPTION
+++ b/DESCRIPTION
 Package: airGR
 Type: Package
 Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
-Version: 1.0.9.52
+Version: 1.0.9.53
-Date: 2017-10-23
+Date: 2017-10-26
 Authors@R: c(
  person("Laurent", "Coron", role = c("aut", "trl")),
  person("Charles", "Perrin", role = c("aut", "ths")),

--- a/NEWS.rmd
+++ b/NEWS.rmd
@@ -14,7 +14,7 @@ output:
-### 1.0.9.52 Release Notes (2017-10-23) 
+### 1.0.9.53 Release Notes (2017-10-26) 
 #### New features

--- a/R/Calibration_Michel.R
+++ b/R/Calibration_Michel.R
@@ -341,12 +341,7 @@ Calibration_Michel <- function(InputsModel, RunOptions, InputsCrit, CalibOptions
      VectPace <- NewParamOptimT-OldParamOptimT
      for (iC in 1:NParam) {
        if (OptimParam[iC]) { 
-          if (VectPace[iC] != 0) {
+          PaceDiag[iC] <- CLG * PaceDiag[iC] + (1-CLG) * VectPace[iC]
-            PaceDiag[iC] <- CLG * PaceDiag[iC] + (1-CLG) * VectPace[iC]
-          }
-          if (VectPace[iC] == 0) {
-            PaceDiag[iC] <- CLG*PaceDiag[iC]
-          }
        }
      }
    } else {