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
87487b78
Commit
87487b78
authored
Feb 19, 2019
by
Delaigue Olivier
Browse files
v1.2.2.4 UPDATE: Calibration_Michel can now use TransfoParam_CemaNeigeHyst
parent
813d427d
Changes
3
Hide whitespace changes
Inline
Side-by-side
DESCRIPTION
View file @
87487b78
Package: airGR
Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
Version: 1.2.2.
3
Version: 1.2.2.
4
Date: 2019-02-19
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
...
...
NEWS.rmd
View file @
87487b78
...
...
@@ -13,7 +13,7 @@ output:
### 1.2.2.
3
Release Notes (2019-01-30)
### 1.2.2.
4
Release Notes (2019-01-30)
...
...
R/Calibration_Michel.R
View file @
87487b78
...
...
@@ -54,19 +54,25 @@ Calibration_Michel <- function(InputsModel, RunOptions, InputsCrit, CalibOptions
FUN_TRANSFO
<-
TransfoParam_GR1A
}
if
(
identical
(
FUN_MOD
,
RunModel_CemaNeige
))
{
FUN_TRANSFO
<-
TransfoParam_CemaNeige
if
(
inherits
(
FUN_MOD
,
"hysteresis"
))
{
FUN_TRANSFO
<-
TransfoParam_CemaNeigeHyst
}
else
{
FUN_TRANSFO
<-
TransfoParam_CemaNeige
}
}
if
(
identical
(
FUN_MOD
,
RunModel_CemaNeigeGR4J
)
|
identical
(
FUN_MOD
,
RunModel_CemaNeigeGR5J
)
|
identical
(
FUN_MOD
,
RunModel_CemaNeigeGR6J
))
{
if
(
identical
(
FUN_MOD
,
RunModel_CemaNeigeGR4J
))
{
FUN1
<-
TransfoParam_GR4J
FUN2
<-
TransfoParam_CemaNeige
}
if
(
identical
(
FUN_MOD
,
RunModel_CemaNeigeGR5J
))
{
FUN1
<-
TransfoParam_GR5J
FUN2
<-
TransfoParam_CemaNeige
}
if
(
identical
(
FUN_MOD
,
RunModel_CemaNeigeGR6J
))
{
FUN1
<-
TransfoParam_GR6J
}
if
(
inherits
(
FUN_MOD
,
"hysteresis"
))
{
FUN2
<-
TransfoParam_CemaNeigeHyst
}
else
{
FUN2
<-
TransfoParam_CemaNeige
}
FUN_TRANSFO
<-
function
(
ParamIn
,
Direction
)
{
...
...
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