Commit c99dd008 authored by Delaigue Olivier's avatar Delaigue Olivier
Browse files

v0.2.6.5 UPDATE: CalGR modified to avoid warnings due to the update of airGR...

v0.2.6.5 UPDATE: CalGR modified to avoid warnings due to the update of airGR (Qobs arg modified in Obs in CreateInputsCrit)
parent 728e8330
Package: airGRteaching
Type: Package
Title: Teaching Hydrological Modelling with the GR Rainfall-Runoff Models ('Shiny' Interface Included)
Version: 0.2.6.4
Version: 0.2.6.5
Date: 2019-03-14
Authors@R: c(
person("Olivier", "Delaigue", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-7668-8468"), email = "airGR@irstea.fr"),
......
......@@ -13,12 +13,13 @@ output:
### 0.2.6.3 Release Notes (2019-03-14)
### 0.2.6.5 Release Notes (2019-03-14)
#### CRAN-compatibility updates
- now depends on the latest version (1.2.13.4) of the airGR package
- now depends on the latest version (1.2.13.4) of the airGR package.
<code>CalGR()</code>, <code>SimGR()</code> and <code>ShinyGR()</code> have been updated.
- the htmlwidget package is no longer imported
......
......@@ -55,7 +55,7 @@ CalGR <- function(PrepGR, CalCrit = c("NSE", "KGE", "KGE2", "RMSE"),
MOD_crt <- CreateInputsCrit(FUN_CRIT = FUN_CRIT, InputsModel = PrepGR$InputsModel,
RunOptions = MOD_opt, Qobs = PrepGR$Qobs[CalInd], transfo = transfo)
RunOptions = MOD_opt, Obs = PrepGR$Qobs[CalInd], transfo = transfo)
CAL_opt <- CreateCalibOptions(FUN_MOD = get(PrepGR$TypeModel), FUN_CALIB = Calibration_Michel)
......@@ -71,7 +71,7 @@ CalGR <- function(PrepGR, CalCrit = c("NSE", "KGE", "KGE2", "RMSE"),
Param = CAL$ParamFinalR, FUN_MOD = get(PrepGR$TypeModel))
CalGR <- list(OptionsCalib = MOD_opt, Qobs = PrepGR$Qobs[CalInd],
CalGR <- list(OptionsCalib = MOD_opt, Obs = PrepGR$Qobs[CalInd],
OutputsCalib = CAL, OutputsModel = SIM,
TypeModel = PrepGR$TypeModel, CalCrit = CalCrit,
PeriodModel = list(WarmUp = as.POSIXct(PrepGR$InputsModel$DatesR[range(MOD_opt$IndPeriod_WarmUp)]),
......
This diff is collapsed.
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