From 3f60ee8c3fc5b60d7fc21d0804fe5a0d4cc16108 Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.fr>
Date: Mon, 6 Apr 2020 08:28:31 +0200
Subject: [PATCH] v1.4.3.78 UPDATE: deprecated RunSnowModule argument removed
from CreateRunOptions #23
---
DESCRIPTION | 4 ++--
NEWS.md | 8 +++++++-
R/CreateRunOptions.R | 9 +++------
man/CreateRunOptions.Rd | 7 +------
4 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 179e5083..cab58d0c 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.4.3.77
-Date: 2020-04-05
+Version: 1.4.3.78
+Date: 2020-04-06
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
person("Olivier", "Delaigue", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-7668-8468"), email = "airGR@inrae.fr"),
diff --git a/NEWS.md b/NEWS.md
index 5626c62c..7a5b23da 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -4,12 +4,18 @@
-### 1.4.3.77 Release Notes (2020-04-05)
+### 1.4.3.78 Release Notes (2020-04-06)
#### CRAN-compatibility updates
+
- The 'hydroPSO' package is back on CRAN and it is again suggested (cf. the 'param_optim' vignette).
+#### Deprecated and defunct
+
+- The deprecated <code>RunSnowModule</code> argument has been removed from the <code>CreateRunOptions()</code> function.
+
+
#### Minor user-visible changes
- Character argument verification now use partial matching in <code>PE_Oudin()</code> and <code>SeriesAggreg()</code> functions.
diff --git a/R/CreateRunOptions.R b/R/CreateRunOptions.R
index 7ec1ec6e..d7acd329 100644
--- a/R/CreateRunOptions.R
+++ b/R/CreateRunOptions.R
@@ -1,13 +1,10 @@
-CreateRunOptions <- function(FUN_MOD, InputsModel, IndPeriod_WarmUp = NULL, IndPeriod_Run,
+CreateRunOptions <- function(FUN_MOD, InputsModel,
+ IndPeriod_WarmUp = NULL, IndPeriod_Run,
IniStates = NULL, IniResLevels = NULL, Imax = NULL,
Outputs_Cal = NULL, Outputs_Sim = "all",
- RunSnowModule, MeanAnSolidPrecip = NULL,
- IsHyst = FALSE,
+ MeanAnSolidPrecip = NULL, IsHyst = FALSE,
warnings = TRUE, verbose = TRUE) {
- if (!missing(RunSnowModule)) {
- warning("deprecated 'RunSnowModule' argument: please adapt 'FUN_MOD' instead.", call. = FALSE)
- }
if (!is.null(Imax)) {
if (!is.numeric(Imax) | length(Imax) != 1L) {
stop("'Imax' must be a non negative 'numeric' value of length 1")
diff --git a/man/CreateRunOptions.Rd b/man/CreateRunOptions.Rd
index eaa414c7..36c321bf 100644
--- a/man/CreateRunOptions.Rd
+++ b/man/CreateRunOptions.Rd
@@ -18,8 +18,7 @@ CreateRunOptions(FUN_MOD, InputsModel,
IndPeriod_WarmUp = NULL, IndPeriod_Run,
IniStates = NULL, IniResLevels = NULL, Imax = NULL,
Outputs_Cal = NULL, Outputs_Sim = "all",
- RunSnowModule, MeanAnSolidPrecip = NULL,
- IsHyst = FALSE,
+ MeanAnSolidPrecip = NULL, IsHyst = FALSE,
warnings = TRUE, verbose = TRUE)
}
@@ -39,14 +38,10 @@ CreateRunOptions(FUN_MOD, InputsModel,
\item{Imax}{(optional) [numeric] an atomic vector of the maximum capacity of the GR5H interception store [mm]; see \code{\link{RunModel_GR5H}}}
-
\item{Outputs_Cal}{(optional) [character] vector giving the outputs needed for the calibration \cr (e.g. c("Qsim")), the fewer outputs
the faster the calibration}
\item{Outputs_Sim}{(optional) [character] vector giving the requested outputs \cr (e.g. c(\code{"DatesR"}, \code{"Qsim"}, \code{"SnowPack"})), default = \code{"all"}}
-
-\item{RunSnowModule}{(deprecated) [boolean] option indicating whether CemaNeige should be activated. Please adapt \code{FUN_MOD} instead}
-
\item{MeanAnSolidPrecip}{(optional) [numeric] vector giving the annual mean of average solid precipitation for each layer (computed from InputsModel if not defined) [mm/y]}
--
GitLab