From ac25044a87bbc2b6e943d3e777e52ae5fa897473 Mon Sep 17 00:00:00 2001
From: unknown <olivier.delaigue@ANPI1430.antony.irstea.priv>
Date: Fri, 20 Jan 2017 18:14:01 +0100
Subject: [PATCH] v1.0.5.10 RunModel_CemaNeige now returns air temperature for
each elevation layer
---
DESCRIPTION | 2 +-
NEWS | 4 ++--
R/RunModel_CemaNeige.R | 2 +-
man/RunModel_CemaNeige.Rd | 1 +
man/plot.OutputsModel.Rd | 4 ++--
5 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 55e2bf39..4741ff14 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.5.8
+Version: 1.0.5.10
Date: 2017-01-20
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl")),
diff --git a/NEWS b/NEWS
index 9185f209..236868df 100644
--- a/NEWS
+++ b/NEWS
@@ -2,7 +2,7 @@
RELEASE HISTORY OF THE airGR PACKAGE
-#### 1.0.5.6 RELEASE NOTES ###########################
+#### 1.0.5.10 RELEASE NOTES ###########################
- Bug fixed in DataAltiExtrapolation_Valery(). The elevation gradients for air temperature returned by CreateInputsModel() are improved.
@@ -13,7 +13,7 @@ RELEASE HISTORY OF THE airGR PACKAGE
#### 1.0.4 RELEASE NOTES ###########################
-- RunModel_CemaNeigeGR4J, RunModel_CemaNeigeGR5J() and RunModel_CemaNeigeGR6J() now return air temperature for each elevation layer.
+- RunModel_CemaNeige, RunModel_CemaNeigeGR4J, RunModel_CemaNeigeGR5J() and RunModel_CemaNeigeGR6J() now return air temperature for each elevation layer.
- S3 plot method defined for OutputsModel objects. It means that the plot_OutputsModel() function is deprecated and his use has been replaced by the use of plot.OutputsModel() or plot().
diff --git a/R/RunModel_CemaNeige.R b/R/RunModel_CemaNeige.R
index f3f95247..24245d9f 100644
--- a/R/RunModel_CemaNeige.R
+++ b/R/RunModel_CemaNeige.R
@@ -1,7 +1,7 @@
RunModel_CemaNeige <- function(InputsModel,RunOptions,Param){
NParam <- 2;
- FortranOutputsCemaNeige <- c("Pliq","Psol","SnowPack","ThermalState","Gratio","PotMelt","Melt","PliqAndMelt");
+ FortranOutputsCemaNeige <- c("Pliq","Psol","SnowPack","ThermalState","Gratio","PotMelt","Melt","PliqAndMelt", "Temp");
##Arguments_check
if(inherits(InputsModel,"InputsModel")==FALSE){ stop("InputsModel must be of class 'InputsModel' \n"); return(NULL); }
diff --git a/man/RunModel_CemaNeige.Rd b/man/RunModel_CemaNeige.Rd
index fa72567f..8cba0b94 100644
--- a/man/RunModel_CemaNeige.Rd
+++ b/man/RunModel_CemaNeige.Rd
@@ -29,6 +29,7 @@ CemaNeige X2 \tab degree-day melt coefficient [mm/°C/d] \
\emph{$CemaNeigeLayers[[iLayer]]$PotMelt } \tab [numeric] series of potential snow melt [mm] \cr
\emph{$CemaNeigeLayers[[iLayer]]$Melt } \tab [numeric] series of actual snow melt [mm] \cr
\emph{$CemaNeigeLayers[[iLayer]]$PliqAndMelt } \tab [numeric] series of liquid precip. + actual snow melt [mm] \cr
+ \emph{$CemaNeigeLayers[[iLayer]]$Temp } \tab [numeric] series of air temperature [°C] \cr
\emph{$StateEnd} \tab [numeric] states at the end of the run: 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/plot.OutputsModel.Rd b/man/plot.OutputsModel.Rd
index 22e6268d..036b1119 100644
--- a/man/plot.OutputsModel.Rd
+++ b/man/plot.OutputsModel.Rd
@@ -33,8 +33,8 @@ Function which creates a screen plot giving an overview of the model outputs
\details{
Dashboard of results including various graphs (depending on the model):\cr
(1) time series of total precipitation\cr
- (2) time series of temperature (plotted only if CemaNeige ise used)\cr
- (3) time series of snow pack (plotted only if CemaNeige ise used)\cr
+ (2) time series of temperature (plotted only if CemaNeige is used)\cr
+ (3) time series of snow pack (plotted only if CemaNeige is used)\cr
(4) time series of simulated flows (and observed flows if provided)\cr
(5) interannual median monthly simulated flow (and observed flows if provided)\cr
(6) correlation plot between simulated and observed flows (if observed flows provided)\cr
--
GitLab