From 86994e5396b6709e10a04dc6bf10e80ef11edbcd Mon Sep 17 00:00:00 2001
From: unknown <olivier.delaigue@ANPI1430.antony.irstea.priv>
Date: Wed, 12 Jul 2017 10:40:04 +0200
Subject: [PATCH] v1.0.9.13 bug fixed when St(2) < 0 in frun_GR4H
---
DESCRIPTION | 2 +-
R/Calibration_Michel.R | 2 +-
src/frun_GR4H.f | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 4c7466ce..ca2b3a6e 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
Package: airGR
Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
-Version: 1.0.9.12
+Version: 1.0.9.13
Date: 2017-07-11
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl")),
diff --git a/R/Calibration_Michel.R b/R/Calibration_Michel.R
index 5b2bba5c..581c2d9e 100644
--- a/R/Calibration_Michel.R
+++ b/R/Calibration_Michel.R
@@ -381,7 +381,7 @@ Calibration_Michel <- function(InputsModel, RunOptions, InputsCrit, CalibOptions
Param <- CandidatesParamR[iNew, ]
OutputsModel <- FUN_MOD(InputsModel, RunOptions, Param)
##Calibration_criterion_computation
- OutputsCrit <- FUN_CRIT(InputsCrit, OutputsModel, verbose = FALSE)
+ OutputsCrit <- FUN_CRIT(InputsCrit, OutputsModel, verbose = FALSE)
if (OutputsCrit$CritValue*OutputsCrit$Multiplier < CritOptim) {
CritOptim <- OutputsCrit$CritValue*OutputsCrit$Multiplier
iNewOptim <- iNew
diff --git a/src/frun_GR4H.f b/src/frun_GR4H.f
index c7994982..1dea84f5 100644
--- a/src/frun_GR4H.f
+++ b/src/frun_GR4H.f
@@ -238,7 +238,7 @@ C Routing store
AEXCH1=EXCH
IF((St(2)+StUH1(1)+EXCH).LT.0.) AEXCH1=-St(2)-StUH1(1)
St(2)=St(2)+StUH1(1)+EXCH
- IF(St(2).LT.0.)St(1)=0.
+ IF(St(2).LT.0.)St(2)=0.
! speed-up
Rr = St(2)/Param(3)
--
GitLab