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
airGRteaching
Commits
78445a15
Commit
78445a15
authored
Nov 28, 2017
by
unknown
Browse files
v0.1.8.7 minor typo revisions in several functions
parent
557ffdb5
Changes
4
Hide whitespace changes
Inline
Side-by-side
DESCRIPTION
View file @
78445a15
Package: airGRteaching
Type: Package
Title: Tools to Simplify the Use of the airGR Hydrological Package for Education (Including a Shiny Interface)
Version: 0.1.8.
6
Date: 2017-11-2
7
Version: 0.1.8.
7
Date: 2017-11-2
8
Authors@R: c(person("Olivier", "Delaigue", role = c("aut", "cre"), email = "airGR@irstea.fr"), person("Laurent", "Coron", role = c("aut")), person("Pierre", "Brigode", role = c("aut")), person("Guillaume", "Thirel", role = c("ctb")))
Depends: airGR (>= 1.0.9.43)
Imports: xts, dygraphs (>= 1.1.1.4), shiny, shinyjs, plotrix, markdown
...
...
R/CalGR.R
View file @
78445a15
...
...
@@ -48,8 +48,8 @@ CalGR <- function(ObsGR, CalCrit = c("NSE", "KGE", "KGE2", "RMSE"),
IndPeriod_WarmUp
=
WupInd
,
IndPeriod_Run
=
CalInd
,
verbose
=
FALSE
)
MOD_crt
<-
CreateInputsCrit
(
FUN_CRIT
=
FUN_CRIT
,
InputsModel
=
ObsGR
$
InputsModel
,
RunOptions
=
MOD_opt
,
Qobs
=
ObsGR
$
Qobs
[
CalInd
],
transfo
=
transfo
)
MOD_crt
<-
CreateInputsCrit
(
FUN_CRIT
=
FUN_CRIT
,
InputsModel
=
ObsGR
$
InputsModel
,
RunOptions
=
MOD_opt
,
Qobs
=
ObsGR
$
Qobs
[
CalInd
],
transfo
=
transfo
)
CAL_opt
<-
CreateCalibOptions
(
FUN_MOD
=
get
(
ObsGR
$
TypeModel
),
FUN_CALIB
=
Calibration_Michel
)
...
...
R/ShinyGR.R
View file @
78445a15
ShinyGR
<-
function
(
ObsBV
=
NULL
,
DatesR
=
NULL
,
Precip
=
NULL
,
PotEvap
=
NULL
,
Qobs
=
NULL
,
TempMean
=
NULL
,
ZInputs
=
NULL
,
HypsoData
=
NULL
,
NLayers
=
5
,
SimPer
=
NULL
,
theme
=
"RStudio"
)
{
.GlobalEnv
$
.ShinyGR.hist
<-
list
(
list
())
#list(Param = list(), TypeModel = lsit(), Crit = list(), Qsim = list())
.GlobalEnv
$
.ShinyGR.args
<-
list
(
ObsBV
=
as.list
(
ObsBV
),
DatesR
=
DatesR
,
Precip
=
Precip
,
PotEvap
=
PotEvap
,
Qobs
=
Qobs
,
TempMean
=
TempMean
,
...
...
R/SimGR.R
View file @
78445a15
...
...
@@ -59,8 +59,8 @@ SimGR <- function(ObsGR, CalGR = NULL, Param = NULL, EffCrit = c("NSE", "KGE", "
IndPeriod_WarmUp
=
WupInd
,
IndPeriod_Run
=
SimInd
,
verbose
=
verbose
)
MOD_crt
<-
CreateInputsCrit
(
FUN_CRIT
=
FUN_CRIT
,
InputsModel
=
ObsGR
$
InputsModel
,
RunOptions
=
MOD_opt
,
Qobs
=
ObsGR
$
Qobs
[
SimInd
],
transfo
=
transfo
)
MOD_crt
<-
CreateInputsCrit
(
FUN_CRIT
=
FUN_CRIT
,
InputsModel
=
ObsGR
$
InputsModel
,
RunOptions
=
MOD_opt
,
Qobs
=
ObsGR
$
Qobs
[
SimInd
],
transfo
=
transfo
)
SIM
<-
RunModel
(
InputsModel
=
ObsGR
$
InputsModel
,
RunOptions
=
MOD_opt
,
...
...
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