From 17a3ee9c63739887a981ab22f763e315dc7af263 Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.fr>
Date: Sun, 5 Apr 2020 09:22:34 +0200
Subject: [PATCH] v1.6.0.1 CLEAN: minor typo revisions in CreatInputsModel #34
---
DESCRIPTION | 2 +-
NEWS.md | 3 ++-
R/CreateInputsModel.R | 16 ++++++++--------
3 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 3ae179d5..8c0e9227 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.6.0.0
+Version: 1.6.0.1
Date: 2020-04-05
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
diff --git a/NEWS.md b/NEWS.md
index 776a9bfa..7be0a1ad 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -2,9 +2,10 @@
-### 1.6.0.0 Release Notes (2020-04-05)
+### 1.6.0.1 Release Notes (2020-04-05)
#### New features
+
- Semi-distributed GR models.
____________________________________________________________________________________
diff --git a/R/CreateInputsModel.R b/R/CreateInputsModel.R
index 0afb9f3e..b1a7d4dd 100644
--- a/R/CreateInputsModel.R
+++ b/R/CreateInputsModel.R
@@ -190,8 +190,8 @@ CreateInputsModel <- function(FUN_MOD,
# olivier: add a check to avoid any missing argument:
# either we have the three of them (then it is SD) or none (then it is lumped)
- if("SD" %in% ObjectClass){
- if (!("daily" %in% ObjectClass) & !("hourly" %in% ObjectClass)){
+ if ("SD" %in% ObjectClass) {
+ if (!("daily" %in% ObjectClass) & !("hourly" %in% ObjectClass)) {
stop("Only daily and hourly time steps can be used in a semi-distributed mode")
}
if (!is.matrix(Q_upstr) | !is.matrix(L_hyd) | !is.matrix(S_basin)) {
@@ -200,16 +200,16 @@ CreateInputsModel <- function(FUN_MOD,
if (!is.numeric(Q_upstr) | !is.numeric(L_hyd) | !is.numeric(S_basin)) {
stop("'Q_upstr', 'L_hyd' and 'S_basin' must be matrices of numeric values")
}
- if (ncol(Q_upstr) != ncol(L_hyd)){
+ if (ncol(Q_upstr) != ncol(L_hyd)) {
stop("'Q_upstr' and 'L_hyd' must have the same number of columns")
}
- if (ncol(Q_upstr)+1 != ncol(S_basin)){
+ if (ncol(Q_upstr)+1 != ncol(S_basin)) {
stop("'S_basin' must have one column more than 'Q_upstr' and 'L_hyd'")
}
- if (nrow(L_hyd) != 1 | nrow(S_basin) != 1){
+ if (nrow(L_hyd) != 1 | nrow(S_basin) != 1) {
stop("'L_hyd' and 'S_basin' must have only one row")
}
- if(any(is.na(Q_upstr))){
+ if(any(is.na(Q_upstr))) {
stop("'Q_upstr' cannot contain any NA value")
}
}
@@ -326,9 +326,9 @@ CreateInputsModel <- function(FUN_MOD,
LayerFracSolidPrecip = RESULT$LayerFracSolidPrecip,
ZLayers = RESULT$ZLayers))
}
- if("SD" %in% ObjectClass){
+ if ("SD" %in% ObjectClass) {
InputsModel <- c(InputsModel, list(Q_upstr = Q_upstr,
- L_hyd=L_hyd,
+ L_hyd = L_hyd,
S_basin = S_basin))
}
--
GitLab