diff --git a/DESCRIPTION b/DESCRIPTION index 278b364f528915e7a00581c4dad336c2513d6833..4c3e121e20cbd43e7b310e79c06d80ba2f929e6e 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: airGR Type: Package Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling -Version: 1.2.9.27 +Version: 1.2.9.28 Date: 2019-03-20 Authors@R: c( person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")), diff --git a/NEWS.rmd b/NEWS.rmd index be6c52c9f6cb17a36f420df34e27d6fe55c298b1..77629e896dfe714e142476be3fe63053a0e0d262 100644 --- a/NEWS.rmd +++ b/NEWS.rmd @@ -13,7 +13,7 @@ output: -### 1.2.9.27 Release Notes (2019-03-20) +### 1.2.9.28 Release Notes (2019-03-20) diff --git a/man/RunModel.Rd b/man/RunModel.Rd index 551969610092bed5a3585ac69d64168d9a38ed7b..d57cf3a03b1fa6aa7e4cf31f0c3562321f16ce1b 100644 --- a/man/RunModel.Rd +++ b/man/RunModel.Rd @@ -60,7 +60,7 @@ plot(OutputsModel, Qobs = BasinObs$Qmm[Ind_Run]) ## efficiency criterion: Nash-Sutcliffe Efficiency InputsCrit <- CreateInputsCrit(FUN_CRIT = ErrorCrit_NSE, InputsModel = InputsModel, - RunOptions = RunOptions, Qobs = BasinObs$Qmm[Ind_Run]) + RunOptions = RunOptions, obs = BasinObs$Qmm[Ind_Run], varObs = "Q") OutputsCrit <- ErrorCrit_NSE(InputsCrit = InputsCrit, OutputsModel = OutputsModel) } diff --git a/man/RunModel_GR1A.Rd b/man/RunModel_GR1A.Rd index e0ed69157136aa23979433214b31e1b9ceadb4ad..efe22a375e913062d959494d2468282a991d8e7e 100644 --- a/man/RunModel_GR1A.Rd +++ b/man/RunModel_GR1A.Rd @@ -20,7 +20,7 @@ RunModel_GR1A(InputsModel, RunOptions, Param) \item{Param}{[numeric] vector of 1 parameter \tabular{ll}{ -GR1A X1 \tab model parameter [-] \cr +GR1A X1 \tab model parameter [-] \cr }} } @@ -28,11 +28,11 @@ GR1A X1 \tab model parameter [-] \cr \value{ [list] list containing the function outputs organised as follows: \tabular{ll}{ - \emph{$DatesR } \tab [POSIXlt] series of dates \cr - \emph{$PotEvap } \tab [numeric] series of input potential evapotranspiration [mm/y] \cr - \emph{$Precip } \tab [numeric] series of input total precipitation [mm/y] \cr - \emph{$Qsim } \tab [numeric] series of simulated discharge [mm/y] \cr - \emph{$StateEnd} \tab [numeric] states at the end of the run (NULL) [-] \cr + \emph{$DatesR } \tab [POSIXlt] series of dates \cr + \emph{$PotEvap } \tab [numeric] series of input potential evapotranspiration [mm/y] \cr + \emph{$Precip } \tab [numeric] series of input total precipitation [mm/y] \cr + \emph{$Qsim } \tab [numeric] series of simulated discharge [mm/y] \cr + \emph{$StateEnd} \tab [numeric] states at the end of the run (NULL) [-] \cr } (refer to the provided references or to the package source code for further details on these model outputs) } @@ -88,7 +88,7 @@ plot(OutputsModel, Qobs = BasinObs$Qmm[Ind_Run]) ## efficiency criterion: Nash-Sutcliffe Efficiency InputsCrit <- CreateInputsCrit(FUN_CRIT = ErrorCrit_NSE, InputsModel = InputsModel, - RunOptions = RunOptions, Qobs = BasinObs$Qmm[Ind_Run]) + RunOptions = RunOptions, obs = BasinObs$Qmm[Ind_Run], varObs = "Q") OutputsCrit <- ErrorCrit_NSE(InputsCrit = InputsCrit, OutputsModel = OutputsModel) } diff --git a/man/RunModel_GR2M.Rd b/man/RunModel_GR2M.Rd index 891e314eebce2fcc6a46920270c3fce77d6fd003..4f1b341d9e0ff2856ce1d364ff70f0d0a7b9f89e 100644 --- a/man/RunModel_GR2M.Rd +++ b/man/RunModel_GR2M.Rd @@ -20,8 +20,8 @@ RunModel_GR2M(InputsModel, RunOptions, Param) \item{Param}{[numeric] vector of 2 parameters \tabular{ll}{ -GR2M X1 \tab production store capacity [mm] \cr -GR2M X2 \tab groundwater exchange coefficient [-] \cr +GR2M X1 \tab production store capacity [mm] \cr +GR2M X2 \tab groundwater exchange coefficient [-] \cr }} } @@ -29,17 +29,17 @@ GR2M X2 \tab groundwater exchange coefficient [-] \cr \value{ [list] list containing the function outputs organised as follows: \tabular{ll}{ - \emph{$DatesR } \tab [POSIXlt] series of dates \cr - \emph{$PotEvap } \tab [numeric] series of input potential evapotranspiration [mm/month] \cr - \emph{$Precip } \tab [numeric] series of input total precipitation [mm/month] \cr - \emph{$AE } \tab [numeric] series of actual evapotranspiration [mm/month] \cr - \emph{$Pn } \tab [numeric] series of net rainfall (P1) [mm/month] \cr - \emph{$Perc } \tab [numeric] series of percolation (P2) [mm/month] \cr - \emph{$PR } \tab [numeric] series of PR=Pn+Perc (P3) [mm/month] \cr - \emph{$Exch } \tab [numeric] series of potential exchange between catchments [mm/month] \cr - \emph{$Prod } \tab [numeric] series of production store level [mm] \cr - \emph{$Rout } \tab [numeric] series of routing store level [mm] \cr - \emph{$Qsim } \tab [numeric] series of simulated discharge [mm/month] \cr + \emph{$DatesR } \tab [POSIXlt] series of dates \cr + \emph{$PotEvap } \tab [numeric] series of input potential evapotranspiration [mm/month] \cr + \emph{$Precip } \tab [numeric] series of input total precipitation [mm/month] \cr + \emph{$AE } \tab [numeric] series of actual evapotranspiration [mm/month] \cr + \emph{$Pn } \tab [numeric] series of net rainfall (P1) [mm/month] \cr + \emph{$Perc } \tab [numeric] series of percolation (P2) [mm/month] \cr + \emph{$PR } \tab [numeric] series of PR=Pn+Perc (P3) [mm/month] \cr + \emph{$Exch } \tab [numeric] series of potential exchange between catchments [mm/month] \cr + \emph{$Prod } \tab [numeric] series of production store level [mm] \cr + \emph{$Rout } \tab [numeric] series of routing store level [mm] \cr + \emph{$Qsim } \tab [numeric] series of simulated discharge [mm/month] \cr \emph{$StateEnd} \tab [numeric] states at the end of the run (production store level and routing store level) [mm], \cr\tab see \code{\link{CreateIniStates}} for more details \cr } (refer to the provided references or to the package source code for further details on these model outputs) @@ -94,7 +94,7 @@ plot(OutputsModel, Qobs = BasinObs$Qmm[Ind_Run]) ## efficiency criterion: Nash-Sutcliffe Efficiency InputsCrit <- CreateInputsCrit(FUN_CRIT = ErrorCrit_NSE, InputsModel = InputsModel, - RunOptions = RunOptions, Qobs = BasinObs$Qmm[Ind_Run]) + RunOptions = RunOptions, obs = BasinObs$Qmm[Ind_Run], varObs = "Q") OutputsCrit <- ErrorCrit_NSE(InputsCrit = InputsCrit, OutputsModel = OutputsModel) } diff --git a/man/RunModel_GR4H.Rd b/man/RunModel_GR4H.Rd index a3a4497638d1e13e90cfdc16e003cd3ea38e59e8..f1225b3e1d7883cda097bde10d690d13bb58a238 100644 --- a/man/RunModel_GR4H.Rd +++ b/man/RunModel_GR4H.Rd @@ -20,10 +20,10 @@ RunModel_GR4H(InputsModel, RunOptions, Param) \item{Param}{[numeric] vector of 4 parameters \tabular{ll}{ -GR4H X1 \tab production store capacity [mm] \cr -GR4H X2 \tab groundwater exchange coefficient [mm/h] \cr -GR4H X3 \tab routing store capacity [mm] \cr -GR4H X4 \tab unit hydrograph time constant [h] \cr +GR4H X1 \tab production store capacity [mm] \cr +GR4H X2 \tab groundwater exchange coefficient [mm/h] \cr +GR4H X3 \tab routing store capacity [mm] \cr +GR4H X4 \tab unit hydrograph time constant [h] \cr }} } @@ -31,22 +31,22 @@ GR4H X4 \tab unit hydrograph time constant [h] \value{ [list] list containing the function outputs organised as follows: \tabular{ll}{ - \emph{$DatesR } \tab [POSIXlt] series of dates \cr - \emph{$PotEvap } \tab [numeric] series of input potential evapotranspiration [mm/h] \cr - \emph{$Precip } \tab [numeric] series of input total precipitation [mm/h] \cr - \emph{$Prod } \tab [numeric] series of production store level [mm] \cr - \emph{$AE } \tab [numeric] series of actual evapotranspiration [mm/h] \cr - \emph{$Perc } \tab [numeric] series of percolation (PERC) [mm/h] \cr - \emph{$PR } \tab [numeric] series of PR=Pn-Ps+Perc [mm/h] \cr - \emph{$Q9 } \tab [numeric] series of UH1 outflow (Q9) [mm/h] \cr - \emph{$Q1 } \tab [numeric] series of UH2 outflow (Q1) [mm/h] \cr - \emph{$Rout } \tab [numeric] series of routing store level [mm] \cr - \emph{$Exch } \tab [numeric] series of potential semi-exchange between catchments [mm/h] \cr - \emph{$AExch } \tab [numeric] series of actual exchange between catchments (1+2) [mm/h] \cr - \emph{$QR } \tab [numeric] series of routing store outflow (QR) [mm/h] \cr - \emph{$QD } \tab [numeric] series of direct flow from UH2 after exchange (QD) [mm/h] \cr - \emph{$Qsim } \tab [numeric] series of simulated discharge [mm/h] \cr - \emph{$StateEnd} \tab [numeric] states at the end of the run (res. levels, UH1 levels, UH2 levels) [mm], see \code{\link{CreateIniStates}} for more details \cr + \emph{$DatesR } \tab [POSIXlt] series of dates \cr + \emph{$PotEvap } \tab [numeric] series of input potential evapotranspiration [mm/h] \cr + \emph{$Precip } \tab [numeric] series of input total precipitation [mm/h] \cr + \emph{$Prod } \tab [numeric] series of production store level [mm] \cr + \emph{$AE } \tab [numeric] series of actual evapotranspiration [mm/h] \cr + \emph{$Perc } \tab [numeric] series of percolation (PERC) [mm/h] \cr + \emph{$PR } \tab [numeric] series of PR=Pn-Ps+Perc [mm/h] \cr + \emph{$Q9 } \tab [numeric] series of UH1 outflow (Q9) [mm/h] \cr + \emph{$Q1 } \tab [numeric] series of UH2 outflow (Q1) [mm/h] \cr + \emph{$Rout } \tab [numeric] series of routing store level [mm] \cr + \emph{$Exch } \tab [numeric] series of potential semi-exchange between catchments [mm/h] \cr + \emph{$AExch } \tab [numeric] series of actual exchange between catchments (1+2) [mm/h] \cr + \emph{$QR } \tab [numeric] series of routing store outflow (QR) [mm/h] \cr + \emph{$QD } \tab [numeric] series of direct flow from UH2 after exchange (QD) [mm/h] \cr + \emph{$Qsim } \tab [numeric] series of simulated discharge [mm/h] \cr + \emph{$StateEnd} \tab [numeric] states at the end of the run (res. levels, UH1 levels, UH2 levels) [mm], see \code{\link{CreateIniStates}} for more details \cr } (refer to the provided references or to the package source code for further details on these model outputs) } @@ -90,7 +90,7 @@ plot(OutputsModel, Qobs = BasinObs$Qmm[Ind_Run]) ## efficiency criterion: Nash-Sutcliffe Efficiency InputsCrit <- CreateInputsCrit(FUN_CRIT = ErrorCrit_NSE, InputsModel = InputsModel, - RunOptions = RunOptions, Qobs = BasinObs$Qmm[Ind_Run]) + RunOptions = RunOptions, obs = BasinObs$Qmm[Ind_Run], varObs = "Q") OutputsCrit <- ErrorCrit_NSE(InputsCrit = InputsCrit, OutputsModel = OutputsModel) } diff --git a/man/RunModel_GR4J.Rd b/man/RunModel_GR4J.Rd index f67b0f7296b5e93b62ae870e7da5bd50789097e6..78f6d0a58d4d1d038b4c2bb5bdcd5aa473c75e16 100644 --- a/man/RunModel_GR4J.Rd +++ b/man/RunModel_GR4J.Rd @@ -98,7 +98,7 @@ plot(OutputsModel, Qobs = BasinObs$Qmm[Ind_Run]) ## efficiency criterion: Nash-Sutcliffe Efficiency InputsCrit <- CreateInputsCrit(FUN_CRIT = ErrorCrit_NSE, InputsModel = InputsModel, - RunOptions = RunOptions, Qobs = BasinObs$Qmm[Ind_Run]) + RunOptions = RunOptions, obs = BasinObs$Qmm[Ind_Run], varObs = "Q") OutputsCrit <- ErrorCrit_NSE(InputsCrit = InputsCrit, OutputsModel = OutputsModel) } diff --git a/man/RunModel_GR5J.Rd b/man/RunModel_GR5J.Rd index f6079fffce9c23bc023b3b3103b51a60f282462e..b4bd93d2758650a55d879b0d205f4be5b250feab 100644 --- a/man/RunModel_GR5J.Rd +++ b/man/RunModel_GR5J.Rd @@ -20,11 +20,11 @@ RunModel_GR5J(InputsModel, RunOptions, Param) \item{Param}{[numeric] vector of 5 parameters \tabular{ll}{ -GR5J X1 \tab production store capacity [mm] \cr -GR5J X2 \tab intercatchment exchange coefficient [mm/d] \cr -GR5J X3 \tab routing store capacity [mm] \cr -GR5J X4 \tab unit hydrograph time constant [d] \cr -GR5J X5 \tab intercatchment exchange threshold [-] \cr +GR5J X1 \tab production store capacity [mm] \cr +GR5J X2 \tab intercatchment exchange coefficient [mm/d] \cr +GR5J X3 \tab routing store capacity [mm] \cr +GR5J X4 \tab unit hydrograph time constant [d] \cr +GR5J X5 \tab intercatchment exchange threshold [-] \cr }} } @@ -32,26 +32,26 @@ GR5J X5 \tab intercatchment exchange threshold [-] \cr \value{ [list] list containing the function outputs organised as follows: \tabular{ll}{ - \emph{$DatesR } \tab [POSIXlt] series of dates \cr - \emph{$PotEvap } \tab [numeric] series of input potential evapotranspiration [mm/d] \cr - \emph{$Precip } \tab [numeric] series of input total precipitation [mm/d] \cr - \emph{$Prod } \tab [numeric] series of production store level [mm] \cr - \emph{$Pn } \tab [numeric] series of net rainfall [mm/d] \cr - \emph{$Ps } \tab [numeric] series of the part of Pn filling the production store [mm/d] \cr - \emph{$AE } \tab [numeric] series of actual evapotranspiration [mm/d] \cr - \emph{$Perc } \tab [numeric] series of percolation (PERC) [mm/d] \cr - \emph{$PR } \tab [numeric] series of PR=Pn-Ps+Perc [mm/d] \cr - \emph{$Q9 } \tab [numeric] series of UH1 outflow (Q9) [mm/d] \cr - \emph{$Q1 } \tab [numeric] series of UH2 outflow (Q1) [mm/d] \cr - \emph{$Rout } \tab [numeric] series of routing store level [mm] \cr - \emph{$Exch } \tab [numeric] series of potential semi-exchange between catchments [mm/d] \cr - \emph{$AExch1 } \tab [numeric] series of actual exchange between catchments for branch 1 [mm/d] \cr - \emph{$AExch2 } \tab [numeric] series of actual exchange between catchments for branch 2 [mm/d] \cr - \emph{$AExch } \tab [numeric] series of actual exchange between catchments (1+2) [mm/d] \cr - \emph{$QR } \tab [numeric] series of routing store outflow (QR) [mm/d] \cr - \emph{$QD } \tab [numeric] series of direct flow from UH2 after exchange (QD) [mm/d] \cr - \emph{$Qsim } \tab [numeric] series of simulated discharge [mm/d] \cr - \emph{$StateEnd} \tab [numeric] states at the end of the run (res. levels, UH1 levels, UH2 levels) [mm], \cr\tab see \code{\link{CreateIniStates}} for more details \cr + \emph{$DatesR } \tab [POSIXlt] series of dates \cr + \emph{$PotEvap } \tab [numeric] series of input potential evapotranspiration [mm/d] \cr + \emph{$Precip } \tab [numeric] series of input total precipitation [mm/d] \cr + \emph{$Prod } \tab [numeric] series of production store level [mm] \cr + \emph{$Pn } \tab [numeric] series of net rainfall [mm/d] \cr + \emph{$Ps } \tab [numeric] series of the part of Pn filling the production store [mm/d] \cr + \emph{$AE } \tab [numeric] series of actual evapotranspiration [mm/d] \cr + \emph{$Perc } \tab [numeric] series of percolation (PERC) [mm/d] \cr + \emph{$PR } \tab [numeric] series of PR=Pn-Ps+Perc [mm/d] \cr + \emph{$Q9 } \tab [numeric] series of UH1 outflow (Q9) [mm/d] \cr + \emph{$Q1 } \tab [numeric] series of UH2 outflow (Q1) [mm/d] \cr + \emph{$Rout } \tab [numeric] series of routing store level [mm] \cr + \emph{$Exch } \tab [numeric] series of potential semi-exchange between catchments [mm/d] \cr + \emph{$AExch1 } \tab [numeric] series of actual exchange between catchments for branch 1 [mm/d] \cr + \emph{$AExch2 } \tab [numeric] series of actual exchange between catchments for branch 2 [mm/d] \cr + \emph{$AExch } \tab [numeric] series of actual exchange between catchments (1+2) [mm/d] \cr + \emph{$QR } \tab [numeric] series of routing store outflow (QR) [mm/d] \cr + \emph{$QD } \tab [numeric] series of direct flow from UH2 after exchange (QD) [mm/d] \cr + \emph{$Qsim } \tab [numeric] series of simulated discharge [mm/d] \cr + \emph{$StateEnd} \tab [numeric] states at the end of the run (res. levels, UH1 levels, UH2 levels) [mm], \cr\tab see \code{\link{CreateIniStates}} for more details \cr } (refer to the provided references or to the package source code for further details on these model outputs) } @@ -100,7 +100,7 @@ plot(OutputsModel, Qobs = BasinObs$Qmm[Ind_Run]) ## efficiency criterion: Nash-Sutcliffe Efficiency InputsCrit <- CreateInputsCrit(FUN_CRIT = ErrorCrit_NSE, InputsModel = InputsModel, - RunOptions = RunOptions, Qobs = BasinObs$Qmm[Ind_Run]) + RunOptions = RunOptions, obs = BasinObs$Qmm[Ind_Run], varObs = "Q") OutputsCrit <- ErrorCrit_NSE(InputsCrit = InputsCrit, OutputsModel = OutputsModel) } diff --git a/man/RunModel_GR6J.Rd b/man/RunModel_GR6J.Rd index da36a0977c23659e7d11d6171f6f1ee06cb71a0d..cb7e5408ec24fb0cad8b9f4a30a433e8373d12af 100644 --- a/man/RunModel_GR6J.Rd +++ b/man/RunModel_GR6J.Rd @@ -20,12 +20,12 @@ RunModel_GR6J(InputsModel, RunOptions, Param) \item{Param}{[numeric] vector of 6 parameters \tabular{ll}{ -GR6J X1 \tab production store capacity [mm] \cr -GR6J X2 \tab intercatchment exchange coefficient [mm/d] \cr -GR6J X3 \tab routing store capacity [mm] \cr -GR6J X4 \tab unit hydrograph time constant [d] \cr -GR6J X5 \tab intercatchment exchange threshold [-] \cr -GR6J X6 \tab coefficient for emptying exponential store [mm] \cr +GR6J X1 \tab production store capacity [mm] \cr +GR6J X2 \tab intercatchment exchange coefficient [mm/d] \cr +GR6J X3 \tab routing store capacity [mm] \cr +GR6J X4 \tab unit hydrograph time constant [d] \cr +GR6J X5 \tab intercatchment exchange threshold [-] \cr +GR6J X6 \tab coefficient for emptying exponential store [mm] \cr }} } @@ -33,28 +33,28 @@ GR6J X6 \tab coefficient for emptying exponential store [mm] \cr \value{ [list] list containing the function outputs organised as follows: \tabular{ll}{ - \emph{$DatesR } \tab [POSIXlt] series of dates \cr - \emph{$PotEvap } \tab [numeric] series of input potential evapotranspiration [mm/d] \cr - \emph{$Precip } \tab [numeric] series of input total precipitation [mm/d] \cr - \emph{$Prod } \tab [numeric] series of production store level [mm] \cr - \emph{$Pn } \tab [numeric] series of net rainfall [mm/d] \cr - \emph{$Ps } \tab [numeric] series of the part of Pn filling the production store [mm/d] \cr - \emph{$AE } \tab [numeric] series of actual evapotranspiration [mm/d] \cr - \emph{$Perc } \tab [numeric] series of percolation (PERC) [mm/d] \cr - \emph{$PR } \tab [numeric] series of PR=Pn-Ps+Perc [mm/d] \cr - \emph{$Q9 } \tab [numeric] series of UH1 outflow (Q9) [mm/d] \cr - \emph{$Q1 } \tab [numeric] series of UH2 outflow (Q1) [mm/d] \cr - \emph{$Rout } \tab [numeric] series of routing store level [mm] \cr - \emph{$Exch } \tab [numeric] series of potential semi-exchange between catchments [mm/d] \cr - \emph{$AExch1 } \tab [numeric] series of actual exchange between catchments for branch 1 [mm/d] \cr - \emph{$AExch2 } \tab [numeric] series of actual exchange between catchments for branch 2 [mm/d] \cr - \emph{$AExch } \tab [numeric] series of actual exchange between catchments (1+2) [mm/d] \cr - \emph{$QR } \tab [numeric] series of routing store outflow (QR) [mm/d] \cr - \emph{$QRExp } \tab [numeric] series of exponential store outflow (QRExp) [mm/d] \cr - \emph{$Exp } \tab [numeric] series of exponential store level (negative) [mm] \cr - \emph{$QD } \tab [numeric] series of direct flow from UH2 after exchange (QD) [mm/d] \cr - \emph{$Qsim } \tab [numeric] series of Qsim [mm/d] \cr - \emph{$StateEnd} \tab [numeric] states at the end of the run (res. levels, UH1 levels, UH2 levels) [mm], \cr\tab see \code{\link{CreateIniStates}} for more details \cr + \emph{$DatesR } \tab [POSIXlt] series of dates \cr + \emph{$PotEvap } \tab [numeric] series of input potential evapotranspiration [mm/d] \cr + \emph{$Precip } \tab [numeric] series of input total precipitation [mm/d] \cr + \emph{$Prod } \tab [numeric] series of production store level [mm] \cr + \emph{$Pn } \tab [numeric] series of net rainfall [mm/d] \cr + \emph{$Ps } \tab [numeric] series of the part of Pn filling the production store [mm/d] \cr + \emph{$AE } \tab [numeric] series of actual evapotranspiration [mm/d] \cr + \emph{$Perc } \tab [numeric] series of percolation (PERC) [mm/d] \cr + \emph{$PR } \tab [numeric] series of PR=Pn-Ps+Perc [mm/d] \cr + \emph{$Q9 } \tab [numeric] series of UH1 outflow (Q9) [mm/d] \cr + \emph{$Q1 } \tab [numeric] series of UH2 outflow (Q1) [mm/d] \cr + \emph{$Rout } \tab [numeric] series of routing store level [mm] \cr + \emph{$Exch } \tab [numeric] series of potential semi-exchange between catchments [mm/d] \cr + \emph{$AExch1 } \tab [numeric] series of actual exchange between catchments for branch 1 [mm/d] \cr + \emph{$AExch2 } \tab [numeric] series of actual exchange between catchments for branch 2 [mm/d] \cr + \emph{$AExch } \tab [numeric] series of actual exchange between catchments (1+2) [mm/d] \cr + \emph{$QR } \tab [numeric] series of routing store outflow (QR) [mm/d] \cr + \emph{$QRExp } \tab [numeric] series of exponential store outflow (QRExp) [mm/d] \cr + \emph{$Exp } \tab [numeric] series of exponential store level (negative) [mm] \cr + \emph{$QD } \tab [numeric] series of direct flow from UH2 after exchange (QD) [mm/d] \cr + \emph{$Qsim } \tab [numeric] series of Qsim [mm/d] \cr + \emph{$StateEnd} \tab [numeric] states at the end of the run (res. levels, UH1 levels, UH2 levels) [mm], \cr\tab see \code{\link{CreateIniStates}} for more details \cr } (refer to the provided references or to the package source code for further details on these model outputs) } @@ -102,7 +102,7 @@ plot(OutputsModel, Qobs = BasinObs$Qmm[Ind_Run]) ## efficiency criterion: Nash-Sutcliffe Efficiency InputsCrit <- CreateInputsCrit(FUN_CRIT = ErrorCrit_NSE, InputsModel = InputsModel, - RunOptions = RunOptions, Qobs = BasinObs$Qmm[Ind_Run]) + RunOptions = RunOptions, obs = BasinObs$Qmm[Ind_Run], varObs = "Q") OutputsCrit <- ErrorCrit_NSE(InputsCrit = InputsCrit, OutputsModel = OutputsModel) }