Skip to content
GitLab
Commit 7fb10e94 authored by Delaigue Olivier's avatar Delaigue Olivier
Browse files

v1.6.3.60 style: simplify the condition tests (FALSE) in the RunModel_GR* functions 

Refs #14
parent 7dc82d29
dev 115-add-pcict-date-format-managment 118-plot-outputsmodel-remove-case-sensitivity-to-the-which-argument 136-decreased-performance-of-calibration-execution-time 161-runmodel_lag-proposal-for-a-better-transformation-and-screening-of-the-parameters 165-add-missing-isintstore-argument-in-createcaliboptions 171-check-error-direct-call-of-as-data-frame-posixct-is-deprecated-use-as-data-frame-vector-or-as 191-speed-up-runmodel_lag-when-it-is-used-alone 33-merge-airgr-and-airgrplus-functions 60-migrate-transfoparam-functions-and-createcaliboptions-to-s3-methods 96-parallelize-the-grid-screening-step-during-calibration master rmOptions CRAN_v1.7.6 CRAN_v1.7.5 CRAN_v1.7.4 CRAN_v1.7.3 CRAN_v1.7.2 CRAN_v1.7.1 CRAN_v1.7.0 CRAN_v1.6.12 CRAN_v1.6.11 CRAN_v1.6.10.4 CRAN_v1.6.9.27 CRAN_v1.6.9.24 CRAN_v1.6.9.23 CRAN_v1.6.9.21
2 merge requests!26CRAN v1.6.9.21,!17Resolve "Clean the RunModel functions"
Pipeline #17587 passed with stages
in 11 minutes and 10 seconds
Hide whitespace changes
Inline Side-by-side
Showing
with 50 additions and 50 deletions
+50 -50
DESCRIPTION
+ 1
− 1
View file @ 7fb10e94
Package: airGR
Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
Version: 1.6.3.59
Version: 1.6.3.60
Date: 2020-11-16
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
......
NEWS.md
+ 1
− 1
View file @ 7fb10e94
......@@ -4,7 +4,7 @@
### 1.6.3.59 Release Notes (2020-11-16)
### 1.6.3.60 Release Notes (2020-11-16)
#### New features
......
R/RunModel_GR2M.R
+ 8
− 8
View file @ 7fb10e94
......@@ -7,19 +7,19 @@ RunModel_GR2M <- function(InputsModel, RunOptions, Param) {
## Arguments_check
if (inherits(InputsModel, "InputsModel") == FALSE) {
if (!inherits(InputsModel, "InputsModel")) {
stop("'InputsModel' must be of class 'InputsModel'")
}
if (inherits(InputsModel, "monthly" ) == FALSE) {
if (!inherits(InputsModel, "monthly" )) {
stop("'InputsModel' must be of class 'monthly' ")
}
if (inherits(InputsModel, "GR" ) == FALSE) {
if (!inherits(InputsModel, "GR" )) {
stop("'InputsModel' must be of class 'GR' ")
}
if (inherits(RunOptions, "RunOptions" ) == FALSE) {
if (!inherits(RunOptions, "RunOptions" )) {
stop("'RunOptions' must be of class 'RunOptions' ")
}
if (inherits(RunOptions, "GR" ) == FALSE) {
if (!inherits(RunOptions, "GR" )) {
stop("'RunOptions' must be of class 'GR' ")
}
if (!is.vector(Param) | !is.numeric(Param)) {
......@@ -92,18 +92,18 @@ RunModel_GR2M <- function(InputsModel, RunOptions, Param) {
## Output_data_preparation
## OutputsModel_only
if (ExportDatesR == FALSE & ExportStateEnd == FALSE) {
if (!ExportDatesR & !ExportStateEnd) {
OutputsModel <- lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i])
names(OutputsModel) <- FortranOutputs[IndOutputs]
}
## DatesR_and_OutputsModel_only
if (ExportDatesR & ExportStateEnd == FALSE) {
if (ExportDatesR & !ExportStateEnd) {
OutputsModel <- c(list(InputsModel$DatesR[RunOptions$IndPeriod_Run]),
lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]))
names(OutputsModel) <- c("DatesR", FortranOutputs[IndOutputs])
}
## OutputsModel_and_SateEnd_only
if (ExportDatesR == FALSE & ExportStateEnd) {
if (!ExportDatesR & ExportStateEnd) {
OutputsModel <- c(lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]),
list(RESULTS$StateEnd))
names(OutputsModel) <- c(FortranOutputs[IndOutputs], "StateEnd")
......
R/RunModel_GR4H.R
+ 8
− 8
View file @ 7fb10e94
......@@ -7,19 +7,19 @@ RunModel_GR4H <- function(InputsModel, RunOptions, Param) {
## Arguments_check
if (inherits(InputsModel, "InputsModel") == FALSE) {
if (!inherits(InputsModel, "InputsModel")) {
stop("'InputsModel' must be of class 'InputsModel'")
}
if (inherits(InputsModel, "hourly" ) == FALSE) {
if (!inherits(InputsModel, "hourly" )) {
stop("'InputsModel' must be of class 'hourly' ")
}
if (inherits(InputsModel, "GR" ) == FALSE) {
if (!inherits(InputsModel, "GR" )) {
stop("'InputsModel' must be of class 'GR' ")
}
if (inherits(RunOptions, "RunOptions" ) == FALSE) {
if (!inherits(RunOptions, "RunOptions" )) {
stop("'RunOptions' must be of class 'RunOptions' ")
}
if (inherits(RunOptions, "GR" ) == FALSE) {
if (!inherits(RunOptions, "GR" )) {
stop("'RunOptions' must be of class 'GR' ")
}
if (!is.vector(Param) | !is.numeric(Param)) {
......@@ -97,18 +97,18 @@ RunModel_GR4H <- function(InputsModel, RunOptions, Param) {
## Output_data_preparation
## OutputsModel_only
if (ExportDatesR == FALSE & ExportStateEnd == FALSE) {
if (!ExportDatesR & !ExportStateEnd) {
OutputsModel <- lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i])
names(OutputsModel) <- FortranOutputs[IndOutputs]
}
## DatesR_and_OutputsModel_only
if (ExportDatesR & ExportStateEnd == FALSE) {
if (ExportDatesR & !ExportStateEnd) {
OutputsModel <- c(list(InputsModel$DatesR[RunOptions$IndPeriod_Run]),
lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]))
names(OutputsModel) <- c("DatesR", FortranOutputs[IndOutputs])
}
## OutputsModel_and_SateEnd_only
if (ExportDatesR == FALSE & ExportStateEnd) {
if (!ExportDatesR & ExportStateEnd) {
OutputsModel <- c(lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]),
list(RESULTS$StateEnd))
names(OutputsModel) <- c(FortranOutputs[IndOutputs], "StateEnd")
......
R/RunModel_GR4J.R
+ 8
− 8
View file @ 7fb10e94
......@@ -7,19 +7,19 @@ RunModel_GR4J <- function(InputsModel, RunOptions, Param) {
## Arguments_check
if (inherits(InputsModel, "InputsModel") == FALSE) {
if (!inherits(InputsModel, "InputsModel")) {
stop("'InputsModel' must be of class 'InputsModel'")
}
if (inherits(InputsModel, "daily" ) == FALSE) {
if (!inherits(InputsModel, "daily" )) {
stop("'InputsModel' must be of class 'daily' ")
}
if (inherits(InputsModel, "GR" ) == FALSE) {
if (!inherits(InputsModel, "GR" )) {
stop("'InputsModel' must be of class 'GR' ")
}
if (inherits(RunOptions, "RunOptions" ) == FALSE) {
if (!inherits(RunOptions, "RunOptions" )) {
stop("'RunOptions' must be of class 'RunOptions' ")
}
if (inherits(RunOptions, "GR" ) == FALSE) {
if (!inherits(RunOptions, "GR" )) {
stop("'RunOptions' must be of class 'GR' ")
}
if (!is.vector(Param) | !is.numeric(Param)) {
......@@ -96,18 +96,18 @@ RunModel_GR4J <- function(InputsModel, RunOptions, Param) {
## Output_data_preparation
## OutputsModel_only
if (ExportDatesR == FALSE & ExportStateEnd == FALSE) {
if (!ExportDatesR & !ExportStateEnd) {
OutputsModel <- lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i])
names(OutputsModel) <- FortranOutputs[IndOutputs]
}
## DatesR_and_OutputsModel_only
if (ExportDatesR & ExportStateEnd == FALSE) {
if (ExportDatesR & !ExportStateEnd) {
OutputsModel <- c(list(InputsModel$DatesR[RunOptions$IndPeriod_Run]),
lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]))
names(OutputsModel) <- c("DatesR", FortranOutputs[IndOutputs])
}
## OutputsModel_and_StateEnd_only
if (ExportDatesR == FALSE & ExportStateEnd) {
if (!ExportDatesR & ExportStateEnd) {
OutputsModel <- c(lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]),
list(RESULTS$StateEnd))
names(OutputsModel) <- c(FortranOutputs[IndOutputs], "StateEnd")
......
R/RunModel_GR5H.R
+ 8
− 8
View file @ 7fb10e94
......@@ -13,19 +13,19 @@ RunModel_GR5H <- function(InputsModel, RunOptions, Param) {
## Arguments_check
if (inherits(InputsModel, "InputsModel") == FALSE) {
if (!inherits(InputsModel, "InputsModel")) {
stop("'InputsModel' must be of class 'InputsModel'")
}
if (inherits(InputsModel, "hourly" ) == FALSE) {
if (!inherits(InputsModel, "hourly" )) {
stop("'InputsModel' must be of class 'hourly' ")
}
if (inherits(InputsModel, "GR" ) == FALSE) {
if (!inherits(InputsModel, "GR" )) {
stop("'InputsModel' must be of class 'GR' ")
}
if (inherits(RunOptions, "RunOptions" ) == FALSE) {
if (!inherits(RunOptions, "RunOptions" )) {
stop("'RunOptions' must be of class 'RunOptions' ")
}
if (inherits(RunOptions, "GR" ) == FALSE) {
if (!inherits(RunOptions, "GR" )) {
stop("'RunOptions' must be of class 'GR' ")
}
if (!is.vector(Param) | !is.numeric(Param)) {
......@@ -107,18 +107,18 @@ RunModel_GR5H <- function(InputsModel, RunOptions, Param) {
## Output_data_preparation
## OutputsModel_only
if (ExportDatesR == FALSE & ExportStateEnd == FALSE) {
if (!ExportDatesR & !ExportStateEnd) {
OutputsModel <- lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i])
names(OutputsModel) <- FortranOutputs[IndOutputs]
}
## DatesR_and_OutputsModel_only
if (ExportDatesR & ExportStateEnd == FALSE) {
if (ExportDatesR & !ExportStateEnd) {
OutputsModel <- c(list(InputsModel$DatesR[RunOptions$IndPeriod_Run]),
lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]))
names(OutputsModel) <- c("DatesR", FortranOutputs[IndOutputs])
}
## OutputsModel_and_StateEnd_only
if (ExportDatesR == FALSE & ExportStateEnd) {
if (!ExportDatesR & ExportStateEnd) {
OutputsModel <- c(lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]),
list(RESULTS$StateEnd))
names(OutputsModel) <- c(FortranOutputs[IndOutputs], "StateEnd")
......
R/RunModel_GR5J.R
+ 8
− 8
View file @ 7fb10e94
......@@ -7,19 +7,19 @@ RunModel_GR5J <- function(InputsModel, RunOptions, Param) {
## Arguments_check
if (inherits(InputsModel, "InputsModel") == FALSE) {
if (!inherits(InputsModel, "InputsModel")) {
stop("'InputsModel' must be of class 'InputsModel'")
}
if (inherits(InputsModel, "daily" ) == FALSE) {
if (!inherits(InputsModel, "daily" )) {
stop("'InputsModel' must be of class 'daily' ")
}
if (inherits(InputsModel, "GR" ) == FALSE) {
if (!inherits(InputsModel, "GR" )) {
stop("'InputsModel' must be of class 'GR' ")
}
if (inherits(RunOptions, "RunOptions" ) == FALSE) {
if (!inherits(RunOptions, "RunOptions" )) {
stop("'RunOptions' must be of class 'RunOptions' ")
}
if (inherits(RunOptions, "GR" ) == FALSE) {
if (!inherits(RunOptions, "GR" )) {
stop("'RunOptions' must be of class 'GR' ")
}
if (!is.vector(Param) | !is.numeric(Param)) {
......@@ -97,18 +97,18 @@ RunModel_GR5J <- function(InputsModel, RunOptions, Param) {
## Output_data_preparation
## OutputsModel_only
if (ExportDatesR == FALSE & ExportStateEnd == FALSE) {
if (!ExportDatesR & !ExportStateEnd) {
OutputsModel <- lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i])
names(OutputsModel) <- FortranOutputs[IndOutputs]
}
## DatesR_and_OutputsModel_only
if (ExportDatesR & ExportStateEnd == FALSE) {
if (ExportDatesR & !ExportStateEnd) {
OutputsModel <- c(list(InputsModel$DatesR[RunOptions$IndPeriod_Run]),
lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]))
names(OutputsModel) <- c("DatesR", FortranOutputs[IndOutputs])
}
## OutputsModel_and_SateEnd_only
if (ExportDatesR == FALSE & ExportStateEnd) {
if (!ExportDatesR & ExportStateEnd) {
OutputsModel <- c(lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]),
list(RESULTS$StateEnd))
names(OutputsModel) <- c(FortranOutputs[IndOutputs], "StateEnd")
......
R/RunModel_GR6J.R
+ 8
− 8
View file @ 7fb10e94
......@@ -7,19 +7,19 @@ RunModel_GR6J <- function(InputsModel, RunOptions, Param) {
## Arguments_check
if (inherits(InputsModel, "InputsModel") == FALSE) {
if (!inherits(InputsModel, "InputsModel")) {
stop("'InputsModel' must be of class 'InputsModel'")
}
if (inherits(InputsModel, "daily" ) == FALSE) {
if (!inherits(InputsModel, "daily" )) {
stop("'InputsModel' must be of class 'daily' ")
}
if (inherits(InputsModel, "GR" ) == FALSE) {
if (!inherits(InputsModel, "GR" )) {
stop("'InputsModel' must be of class 'GR' ")
}
if (inherits(RunOptions, "RunOptions" ) == FALSE) {
if (!inherits(RunOptions, "RunOptions" )) {
stop("'RunOptions' must be of class 'RunOptions' ")
}
if (inherits(RunOptions, "GR" ) == FALSE) {
if (!inherits(RunOptions, "GR" )) {
stop("'RunOptions' must be of class 'GR' ")
}
if (!is.vector(Param) | !is.numeric(Param)) {
......@@ -102,18 +102,18 @@ RunModel_GR6J <- function(InputsModel, RunOptions, Param) {
## Output_data_preparation
## OutputsModel_only
if (ExportDatesR == FALSE & ExportStateEnd == FALSE) {
if (!ExportDatesR & !ExportStateEnd) {
OutputsModel <- lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i])
names(OutputsModel) <- FortranOutputs[IndOutputs]
}
## DatesR_and_OutputsModel_only
if (ExportDatesR & ExportStateEnd == FALSE) {
if (ExportDatesR & !ExportStateEnd) {
OutputsModel <- c(list(InputsModel$DatesR[RunOptions$IndPeriod_Run]),
lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]))
names(OutputsModel) <- c("DatesR", FortranOutputs[IndOutputs])
}
## OutputsModel_and_SateEnd_only
if (ExportDatesR == FALSE & ExportStateEnd) {
if (!ExportDatesR & ExportStateEnd) {
OutputsModel <- c(lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2, i]),
list(RESULTS$StateEnd))
names(OutputsModel) <- c(FortranOutputs[IndOutputs], "StateEnd")
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment