diff --git a/DESCRIPTION b/DESCRIPTION index f50ab11d9975eca42c70f1e8a34ccf6a2442ce86..6182864cc51216ba56fefb41ad2a831c5c39f339 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 2043fe2c9f8e2b9ccdf2c995a7107cd1208f3a90..43f308e1dafbb0f41483ae2f3acecf83e5c8e607 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 caae17a173f22a446e063b6b48fdfd8c8da14df9..873921ba0ee0ee45dfd7837ab3e3f1c6c4264ad3 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); }