Commit 300fb5d8 authored by unknown's avatar unknown
Browse files

v1.0.5.2 RunModel_CemaNeigeGR5J() and RunModel_CemaNeigeGR6J() now also return...

v1.0.5.2 RunModel_CemaNeigeGR5J() and RunModel_CemaNeigeGR6J() now also return temperature for each layer, as RunModel_CemaNeigeGR4J() (documentation updated) #4490
parent 42b9ab52
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.0.5.1 Version: 1.0.5.2
Date: 2017-01-18 Date: 2017-01-19
Authors@R: c( Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl")), person("Laurent", "Coron", role = c("aut", "trl")),
person("Charles", "Perrin", role = c("aut", "ths")), person("Charles", "Perrin", role = c("aut", "ths")),
......
RunModel_CemaNeigeGR5J <- function(InputsModel,RunOptions,Param){ RunModel_CemaNeigeGR5J <- function(InputsModel,RunOptions,Param){
NParam <- 7; 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"); FortranOutputsMod <- c("PotEvap","Precip","Prod","AE","Perc","PR","Q9","Q1","Rout","Exch","AExch","QR","QD","Qsim");
##Arguments_check ##Arguments_check
......
RunModel_CemaNeigeGR6J <- function(InputsModel,RunOptions,Param){ RunModel_CemaNeigeGR6J <- function(InputsModel,RunOptions,Param){
NParam <- 8; 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"); FortranOutputsMod <- c("PotEvap","Precip","Prod","AE","Perc","PR","Q9","Q1","Rout","Exch","AExch","QR","QR1","Exp","QD","Qsim");
##Arguments_check ##Arguments_check
......
...@@ -18,13 +18,13 @@ citEntry(entry="Manual", ...@@ -18,13 +18,13 @@ citEntry(entry="Manual",
author = personList(as.person("L. Coron"), as.person("C. Perrin"), as.person("C. Michel")), author = personList(as.person("L. Coron"), as.person("C. Perrin"), as.person("C. Michel")),
journal = "R News", journal = "R News",
year = "2017", 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", url = "https://webgr.irstea.fr/airGR/?lang=en",
textVersion = textVersion =
paste("Coron, L., Perrin, C. and Michel, C.", paste("Coron, L., Perrin, C. and Michel, C.",
"(2017).", "(2017).",
"airGR: Suite of GR hydrological models for precipitation-runoff modelling.", "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.", "https://webgr.irstea.fr/airGR/?lang=en.",
sep = " ") sep = " ")
) )
...@@ -47,6 +47,7 @@ CemaNeige X2 \tab degree-day melt coefficient [mm/°C/d] \ ...@@ -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]]$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]]$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]]$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 \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) (refer to the provided references or to the package source code for further details on these model outputs)
......
...@@ -48,6 +48,7 @@ CemaNeige X2 \tab degree-day melt coefficient [mm/°C/d] \ ...@@ -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]]$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]]$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]]$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 \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) (refer to the provided references or to the package source code for further details on these model outputs)
......
...@@ -51,6 +51,7 @@ CemaNeige X2 \tab degree-day melt coefficient [mm/°C/d] \ ...@@ -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]]$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]]$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]]$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 \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) (refer to the provided references or to the package source code for further details on these model outputs)
......
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