diff --git a/DESCRIPTION b/DESCRIPTION index 5e98fec584e7d9d0bd555e24794e4d141005ef7e..0bece03ff05b4d5d8b8cde650aeb56337d0ad2d7 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.3.28 +Version: 1.6.3.29 Date: 2020-11-06 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 e88e01cacac0a03fe32ebfd14be8fb6e043ebe9b..46059769afa8bacd37a9acec63b31f0165394fb5 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,7 +4,7 @@ -### 1.6.3.27 Release Notes (2020-11-06) +### 1.6.3.29 Release Notes (2020-11-06) #### New features diff --git a/R/RunModel_GR1A.R b/R/RunModel_GR1A.R index 609b6ae2943b4c3e783f70c8e9099b609518939a..432a1eaa9e22c1a51ef9c97faffd7e82298c6730 100644 --- a/R/RunModel_GR1A.R +++ b/R/RunModel_GR1A.R @@ -3,6 +3,7 @@ RunModel_GR1A <- function(InputsModel, RunOptions, Param) { NParam <- 1 FortranOutputs <- .FortranOutputs(GR = "GR1A")$GR + ## Arguments_check if (!inherits(InputsModel, "InputsModel")) { stop("'InputsModel' must be of class 'InputsModel'") @@ -29,7 +30,7 @@ RunModel_GR1A <- function(InputsModel, RunOptions, Param) { ## Input data preparation - if (identical(RunOptions$IndPeriod_WarmUp, as.integer(0))) { + if (identical(RunOptions$IndPeriod_WarmUp, 0L)) { RunOptions$IndPeriod_WarmUp <- NULL } IndPeriod1 <- c(RunOptions$IndPeriod_WarmUp, RunOptions$IndPeriod_Run) @@ -40,11 +41,13 @@ RunModel_GR1A <- function(InputsModel, RunOptions, Param) { IndOutputs <- which(FortranOutputs %in% RunOptions$Outputs_Sim) } + ## Output data preparation IndPeriod2 <- (length(RunOptions$IndPeriod_WarmUp) + 1):LInputSeries ExportDatesR <- "DatesR" %in% RunOptions$Outputs_Sim ExportStateEnd <- "StateEnd" %in% RunOptions$Outputs_Sim + ## Call_fortan RESULTS <- .Fortran("frun_gr1a", PACKAGE = "airGR", ## inputs @@ -93,7 +96,6 @@ RunModel_GR1A <- function(InputsModel, RunOptions, Param) { ## End - rm(RESULTS) class(OutputsModel) <- c("OutputsModel", "yearly", "GR") return(OutputsModel)