Commit 073e8a03 authored by Delaigue Olivier's avatar Delaigue Olivier
Browse files

v1.2.12.31 DOC: varObs changed into VarObs and weights changed into Weights in...

v1.2.12.31 DOC: varObs changed into VarObs and weights changed into Weights in CemaNeige hysteresis vignette
parent 0eeea886
Package: airGR Package: airGR
Type: Package Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
Version: 1.2.12.30 Version: 1.2.12.31
Date: 2019-04-01 Date: 2019-04-01
Authors@R: c( Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")), person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
......
...@@ -13,7 +13,7 @@ output: ...@@ -13,7 +13,7 @@ output:
### 1.2.12.30 Release Notes (2019-04-01) ### 1.2.12.31 Release Notes (2019-04-01)
......
...@@ -107,8 +107,8 @@ InputsCrit_Cal <- CreateInputsCrit(FUN_CRIT = rep("ErrorCrit_KGE2", 6), ...@@ -107,8 +107,8 @@ InputsCrit_Cal <- CreateInputsCrit(FUN_CRIT = rep("ErrorCrit_KGE2", 6),
BasinObs$SCA3[Ind_Cal], BasinObs$SCA3[Ind_Cal],
BasinObs$SCA4[Ind_Cal], BasinObs$SCA4[Ind_Cal],
BasinObs$SCA5[Ind_Cal]), BasinObs$SCA5[Ind_Cal]),
varObs = list("Q", "SCA", "SCA", "SCA", "SCA", "SCA"), VarObs = list("Q", "SCA", "SCA", "SCA", "SCA", "SCA"),
weights = list(0.75, 0.05, 0.05, 0.05, 0.05, 0.05)) Weights = list(0.75, 0.05, 0.05, 0.05, 0.05, 0.05))
InputsCrit_Val <- CreateInputsCrit(FUN_CRIT = rep("ErrorCrit_KGE2", 6), InputsCrit_Val <- CreateInputsCrit(FUN_CRIT = rep("ErrorCrit_KGE2", 6),
InputsModel = InputsModel, RunOptions = RunOptions_Val, InputsModel = InputsModel, RunOptions = RunOptions_Val,
...@@ -118,8 +118,8 @@ InputsCrit_Val <- CreateInputsCrit(FUN_CRIT = rep("ErrorCrit_KGE2", 6), ...@@ -118,8 +118,8 @@ InputsCrit_Val <- CreateInputsCrit(FUN_CRIT = rep("ErrorCrit_KGE2", 6),
BasinObs$SCA3[Ind_Val], BasinObs$SCA3[Ind_Val],
BasinObs$SCA4[Ind_Val], BasinObs$SCA4[Ind_Val],
BasinObs$SCA5[Ind_Val]), BasinObs$SCA5[Ind_Val]),
varObs = list("Q", "SCA", "SCA", "SCA", "SCA", "SCA"), VarObs = list("Q", "SCA", "SCA", "SCA", "SCA", "SCA"),
weights = list(0.75, 0.05, 0.05, 0.05, 0.05, 0.05)) Weights = list(0.75, 0.05, 0.05, 0.05, 0.05, 0.05))
``` ```
We can now calibrate the model. We can now calibrate the model.
...@@ -191,7 +191,7 @@ RunOptions_Val_NoHyst <- CreateRunOptions(FUN_MOD = RunModel_CemaNeigeGR4J, ...@@ -191,7 +191,7 @@ RunOptions_Val_NoHyst <- CreateRunOptions(FUN_MOD = RunModel_CemaNeigeGR4J,
InputsCrit_Cal_NoHyst <- CreateInputsCrit(FUN_CRIT = ErrorCrit_KGE2, InputsCrit_Cal_NoHyst <- CreateInputsCrit(FUN_CRIT = ErrorCrit_KGE2,
InputsModel = InputsModel, InputsModel = InputsModel,
RunOptions = RunOptions_Cal_NoHyst, RunOptions = RunOptions_Cal_NoHyst,
Obs = BasinObs$Qmm[Ind_Cal], varObs = "Q") Obs = BasinObs$Qmm[Ind_Cal], VarObs = "Q")
## preparation of CalibOptions object ## preparation of CalibOptions object
CalibOptions_NoHyst <- CreateCalibOptions(FUN_MOD = RunModel_CemaNeigeGR4J, CalibOptions_NoHyst <- CreateCalibOptions(FUN_MOD = RunModel_CemaNeigeGR4J,
......
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