v1.0.9.13 bug fixed when St(2) < 0 in frun_GR4H

86994e53 · unknown · 47d39630 · 86994e53 · 86994e53 · 86994e53
Commit 86994e53 authored 7 years ago by unknown
Hide whitespace changes
Inline Side-by-side

Showing

with 3 additions and 3 deletions
+3 -3
--- a/DESCRIPTION
+++ b/DESCRIPTION
 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")),

--- 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

--- 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)