diff --git a/DESCRIPTION b/DESCRIPTION index 4c7466ce55fdb173e6b3364b8dba520de973c62c..ca2b3a6ef8c78fb8863c09b6ee594975badb9d6d 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 5b2bba5c887b9b4d640fe5086f7160650e4138dc..581c2d9e90228d7356c80be3e64de14001c65d06 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 c79949823bbea847e15b4f1fe996659d53ca545c..1dea84f577cd141b8bf53991b97e5840a3fa4c22 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)