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
c4d6d7f4
Commit
c4d6d7f4
authored
Jan 06, 2021
by
Delaigue Olivier
Browse files
v1.6.8.36 refactor: rename variable in CreateCalibOptions
parent
26d137d4
Pipeline
#18869
passed with stages
in 12 minutes and 19 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
DESCRIPTION
View file @
c4d6d7f4
Package: airGR
Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
Version: 1.6.8.3
5
Version: 1.6.8.3
6
Date: 2021-01-05
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
...
...
NEWS.md
View file @
c4d6d7f4
...
...
@@ -2,7 +2,7 @@
### 1.6.8.3
5
Release Notes (2021-01-05)
### 1.6.8.3
6
Release Notes (2021-01-05)
#### New features
...
...
R/CreateCalibOptions.R
View file @
c4d6d7f4
...
...
@@ -142,9 +142,9 @@ CreateCalibOptions <- function(FUN_MOD,
}
##_set_FUN2
if
(
IsHyst
)
{
FUN_
NEIGE
<-
TransfoParam_CemaNeigeHyst
FUN_
SNOW
<-
TransfoParam_CemaNeigeHyst
}
else
{
FUN_
NEIGE
<-
TransfoParam_CemaNeige
FUN_
SNOW
<-
TransfoParam_CemaNeige
}
##_set_FUN_LAG
if
(
IsSD
)
{
...
...
@@ -180,7 +180,7 @@ CreateCalibOptions <- function(FUN_MOD,
ParamOut
<-
NA
*
ParamIn
NParam
<-
ncol
(
ParamIn
)
ParamOut
[,
1
:
(
NParam
-
4
)
]
<-
FUN_GR
(
ParamIn
[,
1
:
(
NParam
-
4
)
],
Direction
)
ParamOut
[,
(
NParam
-
3
)
:
NParam
]
<-
FUN_
NEIGE
(
ParamIn
[,
(
NParam
-
3
)
:
NParam
],
Direction
)
ParamOut
[,
(
NParam
-
3
)
:
NParam
]
<-
FUN_
SNOW
(
ParamIn
[,
(
NParam
-
3
)
:
NParam
],
Direction
)
if
(
!
Bool
)
{
ParamOut
<-
ParamOut
[
1
,
]
}
...
...
@@ -200,7 +200,7 @@ CreateCalibOptions <- function(FUN_MOD,
}
else
{
ParamOut
[,
1
:
(
NParam
-
2
)]
<-
FUN_GR
(
ParamIn
[,
1
:
(
NParam
-
2
)],
Direction
)
}
ParamOut
[,
(
NParam
-
1
)
:
NParam
]
<-
FUN_
NEIGE
(
ParamIn
[,
(
NParam
-
1
)
:
NParam
],
Direction
)
ParamOut
[,
(
NParam
-
1
)
:
NParam
]
<-
FUN_
SNOW
(
ParamIn
[,
(
NParam
-
1
)
:
NParam
],
Direction
)
if
(
!
Bool
)
{
ParamOut
<-
ParamOut
[
1
,
]
}
...
...
@@ -216,7 +216,7 @@ CreateCalibOptions <- function(FUN_MOD,
ParamOut
<-
NA
*
ParamIn
NParam
<-
ncol
(
ParamIn
)
ParamOut
[,
2
:
(
NParam
-
4
)
]
<-
FUN_GR
(
ParamIn
[,
2
:
(
NParam
-
4
)
],
Direction
)
ParamOut
[,
(
NParam
-
3
)
:
NParam
]
<-
FUN_
NEIGE
(
ParamIn
[,
(
NParam
-
3
)
:
NParam
],
Direction
)
ParamOut
[,
(
NParam
-
3
)
:
NParam
]
<-
FUN_
SNOW
(
ParamIn
[,
(
NParam
-
3
)
:
NParam
],
Direction
)
ParamOut
[,
1
]
<-
FUN_LAG
(
as.matrix
(
ParamIn
[,
1
]),
Direction
)
if
(
!
Bool
)
{
ParamOut
<-
ParamOut
[
1
,
]
...
...
@@ -237,8 +237,8 @@ CreateCalibOptions <- function(FUN_MOD,
}
else
{
ParamOut
[,
2
:
(
NParam
-
2
)]
<-
FUN_GR
(
ParamIn
[,
2
:
(
NParam
-
2
)],
Direction
)
}
ParamOut
[,
(
NParam
-
1
)
:
NParam
]
<-
FUN_
NEIGE
(
ParamIn
[,
(
NParam
-
1
)
:
NParam
],
Direction
)
ParamOut
[,
1
]
<-
FUN_LAG
(
as.matrix
(
ParamIn
[,
1
]),
Direction
)
ParamOut
[,
(
NParam
-
1
)
:
NParam
]
<-
FUN_
SNOW
(
ParamIn
[,
(
NParam
-
1
)
:
NParam
],
Direction
)
ParamOut
[,
1
]
<-
FUN_LAG
(
as.matrix
(
ParamIn
[,
1
]),
Direction
)
if
(
!
Bool
)
{
ParamOut
<-
ParamOut
[
1
,
]
}
...
...
@@ -484,4 +484,4 @@ CreateCalibOptions <- function(FUN_MOD,
return
(
CalibOptions
)
}
\ No newline at end of file
}
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