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
19392ea3
Commit
19392ea3
authored
Mar 06, 2019
by
Delaigue Olivier
Browse files
v1.2.8.4 BUG: groupLayer replaced by idLayer in ErrorCrit_*
parent
bf370bdb
Changes
6
Hide whitespace changes
Inline
Side-by-side
DESCRIPTION
View file @
19392ea3
Package: airGR
Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
Version: 1.2.8.
3
Version: 1.2.8.
4
Date: 2019-03-06
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
...
...
NEWS.rmd
View file @
19392ea3
...
...
@@ -13,7 +13,7 @@ output:
### 1.2.8.
3
Release Notes (2019-03-06)
### 1.2.8.
4
Release Notes (2019-03-06)
...
...
R/ErrorCrit_KGE.R
View file @
19392ea3
...
...
@@ -45,10 +45,10 @@ ErrorCrit_KGE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T
VarSim
<-
OutputsModel
$
Qsim
}
if
(
InputsCrit
$
varObs
==
"SCA"
)
{
VarSim
<-
rowMeans
(
sapply
(
OutputsModel
$
CemaNeigeLayers
[
InputsCrit
$
group
Layer
],
FUN
=
"[["
,
"Gratio"
))
VarSim
<-
rowMeans
(
sapply
(
OutputsModel
$
CemaNeigeLayers
[
InputsCrit
$
id
Layer
],
FUN
=
"[["
,
"Gratio"
))
}
if
(
InputsCrit
$
varObs
==
"SWE"
)
{
VarSim
<-
rowMeans
(
sapply
(
OutputsModel
$
CemaNeigeLayers
[
InputsCrit
$
group
Layer
],
FUN
=
"[["
,
"SnowPack"
))
VarSim
<-
rowMeans
(
sapply
(
OutputsModel
$
CemaNeigeLayers
[
InputsCrit
$
id
Layer
],
FUN
=
"[["
,
"SnowPack"
))
}
VarSim
[
!
InputsCrit
$
BoolCrit
]
<-
NA
...
...
R/ErrorCrit_KGE2.R
View file @
19392ea3
...
...
@@ -45,10 +45,10 @@ ErrorCrit_KGE2 <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose =
VarSim
<-
OutputsModel
$
Qsim
}
if
(
InputsCrit
$
varObs
==
"SCA"
)
{
VarSim
<-
rowMeans
(
sapply
(
OutputsModel
$
CemaNeigeLayers
[
InputsCrit
$
group
Layer
],
FUN
=
"[["
,
"Gratio"
))
VarSim
<-
rowMeans
(
sapply
(
OutputsModel
$
CemaNeigeLayers
[
InputsCrit
$
id
Layer
],
FUN
=
"[["
,
"Gratio"
))
}
if
(
InputsCrit
$
varObs
==
"SWE"
)
{
VarSim
<-
rowMeans
(
sapply
(
OutputsModel
$
CemaNeigeLayers
[
InputsCrit
$
group
Layer
],
FUN
=
"[["
,
"SnowPack"
))
VarSim
<-
rowMeans
(
sapply
(
OutputsModel
$
CemaNeigeLayers
[
InputsCrit
$
id
Layer
],
FUN
=
"[["
,
"SnowPack"
))
}
VarSim
[
!
InputsCrit
$
BoolCrit
]
<-
NA
...
...
R/ErrorCrit_NSE.R
View file @
19392ea3
...
...
@@ -45,10 +45,10 @@ ErrorCrit_NSE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose = T
VarSim
<-
OutputsModel
$
Qsim
}
if
(
InputsCrit
$
varObs
==
"SCA"
)
{
VarSim
<-
rowMeans
(
sapply
(
OutputsModel
$
CemaNeigeLayers
[
InputsCrit
$
group
Layer
],
FUN
=
"[["
,
"Gratio"
))
VarSim
<-
rowMeans
(
sapply
(
OutputsModel
$
CemaNeigeLayers
[
InputsCrit
$
id
Layer
],
FUN
=
"[["
,
"Gratio"
))
}
if
(
InputsCrit
$
varObs
==
"SWE"
)
{
VarSim
<-
rowMeans
(
sapply
(
OutputsModel
$
CemaNeigeLayers
[
InputsCrit
$
group
Layer
],
FUN
=
"[["
,
"SnowPack"
))
VarSim
<-
rowMeans
(
sapply
(
OutputsModel
$
CemaNeigeLayers
[
InputsCrit
$
id
Layer
],
FUN
=
"[["
,
"SnowPack"
))
}
VarSim
[
!
InputsCrit
$
BoolCrit
]
<-
NA
...
...
R/ErrorCrit_RMSE.R
View file @
19392ea3
...
...
@@ -45,10 +45,10 @@ ErrorCrit_RMSE <- function(InputsCrit, OutputsModel, warnings = TRUE, verbose =
VarSim
<-
OutputsModel
$
Qsim
}
if
(
InputsCrit
$
varObs
==
"SCA"
)
{
VarSim
<-
rowMeans
(
sapply
(
OutputsModel
$
CemaNeigeLayers
[
InputsCrit
$
group
Layer
],
FUN
=
"[["
,
"Gratio"
))
VarSim
<-
rowMeans
(
sapply
(
OutputsModel
$
CemaNeigeLayers
[
InputsCrit
$
id
Layer
],
FUN
=
"[["
,
"Gratio"
))
}
if
(
InputsCrit
$
varObs
==
"SWE"
)
{
VarSim
<-
rowMeans
(
sapply
(
OutputsModel
$
CemaNeigeLayers
[
InputsCrit
$
group
Layer
],
FUN
=
"[["
,
"SnowPack"
))
VarSim
<-
rowMeans
(
sapply
(
OutputsModel
$
CemaNeigeLayers
[
InputsCrit
$
id
Layer
],
FUN
=
"[["
,
"SnowPack"
))
}
VarSim
[
!
InputsCrit
$
BoolCrit
]
<-
NA
...
...
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