Commit 29d64e4e authored by Delaigue Olivier's avatar Delaigue Olivier
Browse files

v1.6.3.51 fix: add line of code unintentionally removed from the RunModel_GR2M function

Refs 4453a6fa, #14
parent 4453a6fa
Pipeline #17484 passed with stages
in 11 minutes and 22 seconds
Package: airGR
Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
Version: 1.6.3.50
Version: 1.6.3.51
Date: 2020-11-11
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
......
......@@ -4,7 +4,7 @@
### 1.6.3.50 Release Notes (2020-11-11)
### 1.6.3.51 Release Notes (2020-11-11)
#### New features
......
......@@ -73,20 +73,21 @@ RunModel_GR2M <- function(InputsModel,RunOptions,Param) {
## Output_data_preparation
## OutputsModel_only
if (ExportDatesR==FALSE & ExportStateEnd==FALSE) {
if (ExportDatesR == FALSE & ExportStateEnd == FALSE) {
OutputsModel <- lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2,i]);
names(OutputsModel) <- FortranOutputs[IndOutputs]; }
## DatesR_and_OutputsModel_only
if (ExportDatesR==TRUE & ExportStateEnd==FALSE) {
if (ExportDatesR == TRUE & ExportStateEnd == FALSE) {
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==TRUE) {
if (ExportDatesR == FALSE & ExportStateEnd == TRUE) {
OutputsModel <- c( lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2,i]),
list(RESULTS$StateEnd) );
names(OutputsModel) <- c(FortranOutputs[IndOutputs],"StateEnd"); }
## DatesR_and_OutputsModel_and_SateEnd
if ((ExportDatesR==TRUE & ExportStateEnd==TRUE) | "all" %in% RunOptions$Outputs_Sim) {
OutputsModel <- c( list(InputsModel$DatesR[RunOptions$IndPeriod_Run]),
lapply(seq_len(RESULTS$NOutputs), function(i) RESULTS$Outputs[IndPeriod2,i]),
list(RESULTS$StateEnd) );
......
Markdown is supported
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