diff --git a/DESCRIPTION b/DESCRIPTION index ce5b638276b604e0a1cafbd0c44434ae2d48bc3e..c1d7a41f7e8d05ce19b31250fc10283c8ea88408 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: airGR Type: Package Title: Suite of GR hydrological models for precipitation-runoff modelling -Version: 1.0.5.1 -Date: 2017-01-18 +Version: 1.0.5.2 +Date: 2017-01-19 Authors@R: c( person("Laurent", "Coron", role = c("aut", "trl")), person("Charles", "Perrin", role = c("aut", "ths")), diff --git a/R/RunModel_CemaNeigeGR5J.R b/R/RunModel_CemaNeigeGR5J.R index a65c664cead6913789076d83f294a1ea8d832b82..3121c8973bcbdeccf8d89bce392d6fe7a2d294a0 100644 --- a/R/RunModel_CemaNeigeGR5J.R +++ b/R/RunModel_CemaNeigeGR5J.R @@ -1,7 +1,7 @@ RunModel_CemaNeigeGR5J <- function(InputsModel,RunOptions,Param){ NParam <- 7; - FortranOutputsCemaNeige <- c("Pliq","Psol","SnowPack","ThermalState","Gratio","PotMelt","Melt","PliqAndMelt"); + FortranOutputsCemaNeige <- c("Pliq","Psol","SnowPack","ThermalState","Gratio","PotMelt","Melt","PliqAndMelt", "Temp"); FortranOutputsMod <- c("PotEvap","Precip","Prod","AE","Perc","PR","Q9","Q1","Rout","Exch","AExch","QR","QD","Qsim"); ##Arguments_check diff --git a/R/RunModel_CemaNeigeGR6J.R b/R/RunModel_CemaNeigeGR6J.R index 73d9e75706216b18a4602eead1f039e7cd6ff098..af07973fe7f1b3b27d19e971b8ba2c5c170e37b4 100644 --- a/R/RunModel_CemaNeigeGR6J.R +++ b/R/RunModel_CemaNeigeGR6J.R @@ -1,7 +1,7 @@ RunModel_CemaNeigeGR6J <- function(InputsModel,RunOptions,Param){ NParam <- 8; - FortranOutputsCemaNeige <- c("Pliq","Psol","SnowPack","ThermalState","Gratio","PotMelt","Melt","PliqAndMelt"); + FortranOutputsCemaNeige <- c("Pliq","Psol","SnowPack","ThermalState","Gratio","PotMelt","Melt","PliqAndMelt", "Temp"); FortranOutputsMod <- c("PotEvap","Precip","Prod","AE","Perc","PR","Q9","Q1","Rout","Exch","AExch","QR","QR1","Exp","QD","Qsim"); ##Arguments_check diff --git a/inst/CITATION b/inst/CITATION index f33701d6f1d7245bec8b40b88136a1e3f9a0646a..e909e2de5d4f134214b0c0fd55d7935e3d95d16e 100644 --- a/inst/CITATION +++ b/inst/CITATION @@ -18,13 +18,13 @@ citEntry(entry="Manual", author = personList(as.person("L. Coron"), as.person("C. Perrin"), as.person("C. Michel")), journal = "R News", year = "2017", - note = "R package version 1.0.4", + note = "R package version 1.0.5.2", url = "https://webgr.irstea.fr/airGR/?lang=en", textVersion = paste("Coron, L., Perrin, C. and Michel, C.", "(2017).", "airGR: Suite of GR hydrological models for precipitation-runoff modelling.", - "R package version 1.0.4.", + "R package version 1.0.5.2.", "https://webgr.irstea.fr/airGR/?lang=en.", sep = " ") ) diff --git a/man/RunModel_CemaNeigeGR4J.Rd b/man/RunModel_CemaNeigeGR4J.Rd index 49f64c7d6095480f5516e84af20304df36c3f5e7..209668421518ddf4c92d401837586a1ce9e8a63b 100644 --- a/man/RunModel_CemaNeigeGR4J.Rd +++ b/man/RunModel_CemaNeigeGR4J.Rd @@ -47,6 +47,7 @@ CemaNeige X2 \tab degree-day melt coefficient [mm/°C/d] \ \emph{$CemaNeigeLayers[[iLayer]]$PotMelt } \tab [numeric] series of potential snow melt [mm/d] \cr \emph{$CemaNeigeLayers[[iLayer]]$Melt } \tab [numeric] series of actual snow melt [mm/d] \cr \emph{$CemaNeigeLayers[[iLayer]]$PliqAndMelt } \tab [numeric] series of liquid precip. + actual snow melt [mm/d] \cr + \emph{$CemaNeigeLayers[[iLayer]]$Temp } \tab [numeric] series of air temperature [°C] \cr \emph{$StateEnd} \tab [numeric] states at the end of the run: \cr\tab store & unit hydrographs levels [mm], CemaNeige states [mm & °C] \cr } (refer to the provided references or to the package source code for further details on these model outputs) diff --git a/man/RunModel_CemaNeigeGR5J.Rd b/man/RunModel_CemaNeigeGR5J.Rd index 1c5b1ec3a041f928c705d8df1c0f64c0a62cd036..28fc22195f0fe5c369079ec2e01ceb89b147f82d 100644 --- a/man/RunModel_CemaNeigeGR5J.Rd +++ b/man/RunModel_CemaNeigeGR5J.Rd @@ -48,6 +48,7 @@ CemaNeige X2 \tab degree-day melt coefficient [mm/°C/d] \ \emph{$CemaNeigeLayers[[iLayer]]$PotMelt } \tab [numeric] series of potential snow melt [mm/d] \cr \emph{$CemaNeigeLayers[[iLayer]]$Melt } \tab [numeric] series of actual snow melt [mm/d] \cr \emph{$CemaNeigeLayers[[iLayer]]$PliqAndMelt } \tab [numeric] series of liquid precip. + actual snow melt [mm/d] \cr + \emph{$CemaNeigeLayers[[iLayer]]$Temp } \tab [numeric] series of air temperature [°C] \cr \emph{$StateEnd} \tab [numeric] states at the end of the run: \cr\tab store & unit hydrographs levels [mm], CemaNeige states [mm & °C] \cr } (refer to the provided references or to the package source code for further details on these model outputs) diff --git a/man/RunModel_CemaNeigeGR6J.Rd b/man/RunModel_CemaNeigeGR6J.Rd index 8fa975cb1c712dac87aebca6abf20c9c8bb4bee6..cd6e80ff1b39d53881681fc28879e5fcf97ae301 100644 --- a/man/RunModel_CemaNeigeGR6J.Rd +++ b/man/RunModel_CemaNeigeGR6J.Rd @@ -51,6 +51,7 @@ CemaNeige X2 \tab degree-day melt coefficient [mm/°C/d] \ \emph{$CemaNeigeLayers[[iLayer]]$PotMelt } \tab [numeric] series of potential snow melt [mm/d] \cr \emph{$CemaNeigeLayers[[iLayer]]$Melt } \tab [numeric] series of actual snow melt [mm/d] \cr \emph{$CemaNeigeLayers[[iLayer]]$PliqAndMelt } \tab [numeric] series of liquid precip. + actual snow melt [mm/d] \cr + \emph{$CemaNeigeLayers[[iLayer]]$Temp } \tab [numeric] series of air temperature [°C] \cr \emph{$StateEnd} \tab [numeric] states at the end of the run: \cr\tab store & unit hydrographs levels [mm], CemaNeige states [mm & °C] \cr } (refer to the provided references or to the package source code for further details on these model outputs)