diff --git a/DESCRIPTION b/DESCRIPTION index 85dc466adf9fab9b895c418abc2e797b91176b9d..0171a3ed53c567710b8827ca44dc305d8d11dda6 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.6.7 +Version: 1.0.6.8 Date: 2017-04-05 Authors@R: c( person("Laurent", "Coron", role = c("aut", "trl")), diff --git a/R/plot.OutputsModel.R b/R/plot.OutputsModel.R index 50677f3de5b314c8e8bdda31351d78a0863efa84..9261b1dd3761aafa3704224dba934ff85363e6a9 100644 --- a/R/plot.OutputsModel.R +++ b/R/plot.OutputsModel.R @@ -142,11 +142,15 @@ plot.OutputsModel <- function(x, Qobs = NULL, IndPeriod_Plot = NULL, BasinArea = } if (!is.null(BasinArea)) { - # function to use switch avoiding a NOTE when the package is check - UNIT_M3S <- function(x) { - return(switch(x, hour = 60*60, day = 24*60*60, month = 365.25/12*24*60*60, year = 365.25*24*60*60)) - } - Factor_UNIT_M3S <- BasinArea/(UNIT_M3S(NameTS)/1e3) + Factor_MMH_M3S <- 60 * 60 + Factor_MMD_M3S <- 60 * 60 * 24 + Factor_MMM_M3S <- 60 * 60 * 24 * 365.25 / 12 + Factor_MMY_M3S <- 60 * 60 * 24 * 365.25 + if (NameTS == "hour" ) Factor_UNIT_M3S <- Factor_MMH_M3S + if (NameTS == "day" ) Factor_UNIT_M3S <- Factor_MMD_M3S + if (NameTS == "month") Factor_UNIT_M3S <- Factor_MMM_M3S + if (NameTS == "year" ) Factor_UNIT_M3S <- Factor_MMY_M3S + Factor_UNIT_M3S <- BasinArea / (Factor_UNIT_M3S / 1000) } }