Skip to content
GitLab
Commit 088a5ddb authored by Dorchies David's avatar Dorchies David
Browse files

v1.6.1.13 feat: SD LenghtHydro in meters instead of km 

Refs #34 in particular #34 (comment 20648)
parent 65c221ea
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,!10Semi-distributed version of airGR models
Pipeline #13177 passed with stages
in 12 minutes
Hide whitespace changes
Inline Side-by-side
Showing
with 5 additions and 5 deletions
+5 -5
DESCRIPTION
+ 2
− 2
View file @ 088a5ddb
Package: airGR Package: airGR
Type: Package Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
Version: 1.6.1.13 Version: 1.6.1.14
Date: 2020-05-22 Date: 2020-05-27
Authors@R: c( Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")), person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
person("Olivier", "Delaigue", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-7668-8468"), email = "airGR@inrae.fr"), person("Olivier", "Delaigue", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-7668-8468"), email = "airGR@inrae.fr"),
......
R/RunModel.R
+ 1
− 1
View file @ 088a5ddb
...@@ -18,7 +18,7 @@ RunModel <- function (InputsModel, RunOptions, Param, FUN_MOD) { ...@@ -18,7 +18,7 @@ RunModel <- function (InputsModel, RunOptions, Param, FUN_MOD) {
AreaTot <- sum(InputsModel$BasinAreas) AreaTot <- sum(InputsModel$BasinAreas)
# propagation time from upstream meshes to outlet # propagation time from upstream meshes to outlet
PT <- InputsModel$LengthHydro[1, ] * 1000 / Param[length(Param)] / TimeStep PT <- InputsModel$LengthHydro[1, ] / Param[length(Param)] / TimeStep
HUTRANS <- rbind(1 - (PT - floor(PT)), PT - floor(PT)) HUTRANS <- rbind(1 - (PT - floor(PT)), PT - floor(PT))
NbUpBasins <- length(InputsModel$LengthHydro) NbUpBasins <- length(InputsModel$LengthHydro)
......
tests/testthat/test-RunModel_LAG.R
+ 2
− 2
View file @ 088a5ddb
...@@ -42,7 +42,7 @@ InputsModel <- CreateInputsModel( ...@@ -42,7 +42,7 @@ InputsModel <- CreateInputsModel(
Precip = BasinObs$P, Precip = BasinObs$P,
PotEvap = BasinObs$E, PotEvap = BasinObs$E,
QobsUpstr = matrix(QobsUpstr, ncol = 1), QobsUpstr = matrix(QobsUpstr, ncol = 1),
LengthHydro = matrix(c(1), nrow = 1), LengthHydro = matrix(c(1000), nrow = 1),
BasinAreas = matrix(c( BasinAreas = matrix(c(
BasinInfo$BasinArea * 2, BasinInfo$BasinArea BasinInfo$BasinArea * 2, BasinInfo$BasinArea
), nrow = 1) ), nrow = 1)
...@@ -96,7 +96,7 @@ test_that( ...@@ -96,7 +96,7 @@ test_that(
} }
) )
ParamSD = c(Param, InputsModel$LengthHydro * 1000 / (24 * 60 * 60)) ParamSD = c(Param, InputsModel$LengthHydro / (24 * 60 * 60)) # Speed corresponding to one time step delay
OutputsSD <- OutputsSD <-
RunModel(InputsModel, RunOptions, Param = ParamSD, FUN_MOD = RunModel_GR4J) RunModel(InputsModel, RunOptions, Param = ParamSD, FUN_MOD = RunModel_GR4J)
......
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