diff --git a/DESCRIPTION b/DESCRIPTION index 6dcf9055bbeb1c7a6f0b2217429fd1205ab38b9b..5b9d5f680e4c0fddf1e86ecb850b30f21865fa1a 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.0.10.1 +Version: 1.0.10.2 Date: 2018-05-22 Authors@R: c( person("Laurent", "Coron", role = c("aut", "trl")), diff --git a/NEWS.rmd b/NEWS.rmd index 26be15f8176a8091977e978bc5d6a7722321df9d..a33e27cd50cdf72b112ccf7c9216ed47e5f063fc 100644 --- a/NEWS.rmd +++ b/NEWS.rmd @@ -14,7 +14,7 @@ output: -### 1.0.10.1 Release Notes (2018-05-22) +### 1.0.10.2 Release Notes (2018-05-22) ____________________________________________________________________________________ diff --git a/man/RunModel_GR4J.Rd b/man/RunModel_GR4J.Rd index 24ae1c81a0c1d4ff1d59c4d574b4ba504cea5dba..a59e0f9068b845b6ddcec1ce97da8f79cddd2c3e 100644 --- a/man/RunModel_GR4J.Rd +++ b/man/RunModel_GR4J.Rd @@ -20,10 +20,10 @@ RunModel_GR4J(InputsModel, RunOptions, Param) \item{Param}{[numeric] vector of 4 parameters \tabular{ll}{ -GR4J X1 \tab production store capacity [mm] \cr -GR4J X2 \tab intercatchment exchange coefficient [mm/d] \cr -GR4J X3 \tab routing store capacity [mm] \cr -GR4J X4 \tab unit hydrograph time constant [d] \cr + GR4J X1 \tab production store capacity [mm] \cr + GR4J X2 \tab intercatchment exchange coefficient [mm/d] \cr + GR4J X3 \tab routing store capacity [mm] \cr + GR4J X4 \tab unit hydrograph time constant [d] \cr }} } @@ -31,26 +31,26 @@ GR4J X4 \tab unit hydrograph time constant [d] \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) } diff --git a/src/frun_GR4J.f b/src/frun_GR4J.f index 14339005e87c34950b814f745677df0a9b768433..4d28237be84c00d34da929e5381e5eee4983031a 100644 --- a/src/frun_GR4J.f +++ b/src/frun_GR4J.f @@ -264,7 +264,7 @@ C Variables storage MISC(10)=StUH2(1) ! Q1 ! outflow from UH2 (Q1) [mm/day] MISC(11)=St(2) ! Rout ! routing store level (St(2)) [mm] MISC(12)=EXCH ! Exch ! potential semi-exchange between catchments (EXCH) [mm/day] - MISC(13)=AEXCH1 ! AExch1 ! actual exchange between catchments from branch 1 (AEXCH1) [mm/day] + MISC(13)=AEXCH1 ! AExch1 ! actual exchange between catchments from branch 1 (AEXCH1) [mm/day] MISC(14)=AEXCH2 ! AExch2 ! actual exchange between catchments from branch 2 (AEXCH2) [mm/day] MISC(15)=AEXCH1+AEXCH2 ! AExch ! actual total exchange between catchments (AEXCH1+AEXCH2) [mm/day] MISC(16)=QR ! QR ! outflow from routing store (QR) [mm/day]