Commit 78445a15 authored by unknown's avatar unknown
Browse files

v0.1.8.7 minor typo revisions in several functions

parent 557ffdb5
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-27
Version: 0.1.8.7
Date: 2017-11-28
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
......
......@@ -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)
......
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,
......
......@@ -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,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment