From 29d8e36f1e4869c3e0a44cbef4ac7c108580ba48 Mon Sep 17 00:00:00 2001
From: unknown <olivier.delaigue@ANPI1430.antony.irstea.priv>
Date: Thu, 9 Nov 2017 12:01:15 +0100
Subject: [PATCH] v1.0.9.60 minor typo revisions in CreateRunOptions messages
---
DESCRIPTION | 2 +-
NEWS.rmd | 2 +-
R/CreateRunOptions.R | 10 +++++-----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index f50ab11d..6182864c 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.9.59
+Version: 1.0.9.60
Date: 2017-11-09
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl")),
diff --git a/NEWS.rmd b/NEWS.rmd
index 2043fe2c..43f308e1 100644
--- a/NEWS.rmd
+++ b/NEWS.rmd
@@ -14,7 +14,7 @@ output:
-### 1.0.9.59 Release Notes (2017-11-09)
+### 1.0.9.60 Release Notes (2017-11-09)
#### New features
diff --git a/R/CreateRunOptions.R b/R/CreateRunOptions.R
index caae17a1..873921ba 100644
--- a/R/CreateRunOptions.R
+++ b/R/CreateRunOptions.R
@@ -64,11 +64,11 @@ CreateRunOptions <- function(FUN_MOD, InputsModel, IndPeriod_WarmUp = NULL, IndP
##check_IndPeriod_WarmUp
WTxt <- NULL;
if(is.null(IndPeriod_WarmUp)){
- WTxt <- paste(WTxt,"\t Model warm-up period not defined -> default configuration used \n",sep="");
+ WTxt <- paste(WTxt,"\t Model warm up period not defined -> default configuration used \n",sep="");
##If_the_run_period_starts_at_the_very_beginning_of_the_time_series
if(IndPeriod_Run[1]==as.integer(1)){
IndPeriod_WarmUp <- as.integer(0);
- WTxt <- paste(WTxt,"\t No data were found for model warm-up! \n",sep="");
+ WTxt <- paste(WTxt,"\t No data were found for model warm up! \n",sep="");
##We_look_for_the_longest_period_preceeding_the_run_period_with_a_maximum_of_one_year
} else {
TmpDateR <- InputsModel$DatesR[IndPeriod_Run[1]] - 365*24*60*60; ### minimal date to start the warmup
@@ -80,7 +80,7 @@ CreateRunOptions <- function(FUN_MOD, InputsModel, IndPeriod_WarmUp = NULL, IndP
if(length(IndPeriod_WarmUp)*TimeStep/(365*24*60*60)>=1){
WTxt <- paste(WTxt,"\t The year preceding the run period is used \n",sep="");
} else {
- WTxt <- paste(WTxt,"\t Less than a year (without missing values) was found for model warm-up: \n",sep="");
+ WTxt <- paste(WTxt,"\t Less than a year (without missing values) was found for model warm up: \n",sep="");
WTxt <- paste(WTxt,"\t (",length(IndPeriod_WarmUp)," time-steps are used for initialisation) \n",sep="");
}
}
@@ -90,9 +90,9 @@ CreateRunOptions <- function(FUN_MOD, InputsModel, IndPeriod_WarmUp = NULL, IndP
if(!is.numeric(IndPeriod_WarmUp)){ stop("IndPeriod_Run must be a vector of numeric values \n"); return(NULL); }
if(storage.mode(IndPeriod_WarmUp)!="integer"){ stop("IndPeriod_Run should be of type integer \n"); return(NULL); }
if(identical(IndPeriod_WarmUp,as.integer(0))){
- WTxt <- paste(WTxt,"\t No warm-up period is used! \n",sep=""); }
+ WTxt <- paste(WTxt,"\t No warm up period is used! \n",sep=""); }
if((IndPeriod_Run[1]-1)!=tail(IndPeriod_WarmUp,1) & !identical(IndPeriod_WarmUp,as.integer(0))){
- WTxt <- paste(WTxt,"\t Model warm-up period is not directly before the model run period \n",sep=""); }
+ WTxt <- paste(WTxt,"\t Model warm up period is not directly before the model run period \n",sep=""); }
}
if(!is.null(WTxt) & verbose){ warning(WTxt); }
--
GitLab