Commit a77758fb authored by unknown's avatar unknown
Browse files

v0.1.1.3 SimGR now also returns the OptionsCrit value

parent 472ef2e3
Package: airGRteaching
Type: Package
Title: Tools to Simplify the Use of the airGR Hydrological package for Education (including a Shiny Application)
Version: 0.1.1.2
Date: 2017-01-25
Title: Tools to Simplify the Use of the airGR Hydrological Package for Education (including a Shiny Application)
Version: 0.1.1.3
Date: 2017-02-16
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")))
Depends: airGR (>= 1.0.5.4)
Imports: xts, dygraphs, shiny, plotrix
Description: It provides 3 functions which allows to run very simply the airGR hydrological modelling steps. It also provides plotting function to help student to explore observed data and to interprete the results of calibration and simulation of the GR hydrological models.
Description: Providing 3 functions which allows to run very simply the airGR hydrological modelling steps. Also providing plotting function to help student to explore observed data and to interprete the results of calibration and simulation of the GR hydrological models.
License: GPL-2
NeedsCompilation: no
URL: https://webgr.irstea.fr/airGR/?lang=en
......
......@@ -70,10 +70,10 @@ SimGR <- function(ObsGR, CalGR = NULL, Param = NULL, EffCrit = c("NSE", "KGE", "
CRT <- ErrorCrit(InputsCrit = MOD_crt, OutputsModel = SIM, FUN_CRIT = FUN_CRIT, verbose = verbose)
SimGR <- list(OptionsSimul = MOD_opt, OutputsModel = SIM, Qobs = ObsGR$Qobs[SimInd],
SimGR <- list(OptionsSimul = MOD_opt, OptionsCrit = MOD_crt, OutputsModel = SIM, Qobs = ObsGR$Qobs[SimInd],
TypeModel = ObsGR$TypeModel,
CalCrit = CalGR$CalCrit, EffCrit = CRT,
PeriodModel = list(WarmUp = as.POSIXct(ObsGR$InputsModel$DatesR[range(MOD_opt$IndPeriod_WarmUp)]),
PeriodModel = list(WarmUp = as.POSIXct(ObsGR$InputsModel$DatesR[range(MOD_opt$IndPeriod_WarmUp)]),
Run = SimPer))
class(SimGR) <- c("SimGR", "GR")
return(SimGR)
......
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