From cba7f37e3f98b6e3ca9d2d62b12a88a5435b3ed3 Mon Sep 17 00:00:00 2001
From: unknown <olivier.delaigue@ANPI1430.antony.irstea.priv>
Date: Thu, 26 Oct 2017 10:15:09 +0200
Subject: [PATCH] v1.0.9.53 minor revision of Calibration_Michel
---
DESCRIPTION | 4 ++--
NEWS.rmd | 2 +-
R/Calibration_Michel.R | 7 +------
3 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 45fdd768..3dd58968 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,8 +1,8 @@
Package: airGR
Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
-Version: 1.0.9.52
-Date: 2017-10-23
+Version: 1.0.9.53
+Date: 2017-10-26
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl")),
person("Charles", "Perrin", role = c("aut", "ths")),
diff --git a/NEWS.rmd b/NEWS.rmd
index f06bc248..49112002 100644
--- 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
diff --git a/R/Calibration_Michel.R b/R/Calibration_Michel.R
index 581c2d9e..f5433f50 100644
--- 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]
- }
- if (VectPace[iC] == 0) {
- PaceDiag[iC] <- CLG*PaceDiag[iC]
- }
+ PaceDiag[iC] <- CLG * PaceDiag[iC] + (1-CLG) * VectPace[iC]
}
}
} else {
--
GitLab