Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
HYCAR-Hydro
airGR
Commits
86994e53
Commit
86994e53
authored
Jul 12, 2017
by
unknown
Browse files
v1.0.9.13 bug fixed when St(2) < 0 in frun_GR4H
parent
47d39630
Changes
3
Hide whitespace changes
Inline
Side-by-side
DESCRIPTION
View file @
86994e53
Package: airGR
Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
Version: 1.0.9.1
2
Version: 1.0.9.1
3
Date: 2017-07-11
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl")),
...
...
R/Calibration_Michel.R
View file @
86994e53
...
...
@@ -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
...
...
src/frun_GR4H.f
View file @
86994e53
...
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment