From b4287b289235acdf0d18c46ee932f82fb359120e Mon Sep 17 00:00:00 2001 From: Delaigue Olivier <olivier.delaigue@irstea.fr> Date: Wed, 14 Oct 2020 16:52:27 +0200 Subject: [PATCH] v1.6.3.7 style: RunModel_LAG renamed into RunModel_Lag Refs #34 --- DESCRIPTION | 2 +- NAMESPACE | 2 +- NEWS.md | 2 +- R/RunModel_LAG.R | 2 +- man/RunModel_LAG.Rd | 18 +++++++++--------- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 2b880025..6e942cbb 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.6 +Version: 1.6.3.7 Date: 2020-10-14 Authors@R: c( person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")), diff --git a/NAMESPACE b/NAMESPACE index 2842ced5..8f28e154 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -45,7 +45,7 @@ export(RunModel_GR5H) export(RunModel_GR4J) export(RunModel_GR5J) export(RunModel_GR6J) -export(RunModel_LAG) +export(RunModel_Lag) export(SeriesAggreg) export(TransfoParam) export(TransfoParam_CemaNeige) diff --git a/NEWS.md b/NEWS.md index e355d94f..112f7140 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,6 @@ ## Release History of the airGR Package -### 1.6.3.6 Release Notes (2020-10-14) +### 1.6.3.7 Release Notes (2020-10-14) #### New features diff --git a/R/RunModel_LAG.R b/R/RunModel_LAG.R index db073e78..29f7a475 100644 --- a/R/RunModel_LAG.R +++ b/R/RunModel_LAG.R @@ -1,4 +1,4 @@ -RunModel_LAG <- function(InputsModel, RunOptions, Param) { +RunModel_Lag <- function(InputsModel, RunOptions, Param) { NParam <- 1 diff --git a/man/RunModel_LAG.Rd b/man/RunModel_LAG.Rd index fb3a5008..c601dc08 100644 --- a/man/RunModel_LAG.Rd +++ b/man/RunModel_LAG.Rd @@ -1,20 +1,20 @@ \encoding{UTF-8} -\name{RunModel_LAG} -\alias{RunModel_LAG} +\name{RunModel_Lag} +\alias{RunModel_Lag} -\title{Run with the LAG model} +\title{Run with the Lag model} \description{ -Function which performs a single run for the LAG model over the test period. +Function which performs a single run for the Lag model over the test period. } \usage{ -RunModel_LAG(InputsModel, RunOptions, Param) +RunModel_Lag(InputsModel, RunOptions, Param) } @@ -25,7 +25,7 @@ RunModel_LAG(InputsModel, RunOptions, Param) \item{Param}{[numeric] vector of 1 parameter \tabular{ll}{ - LAG \tab Mean flow velocity [m/s] + Lag \tab Mean flow velocity [m/s] }} } @@ -57,7 +57,7 @@ BasinAreas <- c(NA, BasinInfo$BasinArea) ## Delay time between the reservoir and the catchment outlet is 2 days and the distance is 150 km LenghtHydro <- 150 -LAG <- LenghtHydro / 2 / 86400 * 1000 # Conversion km/day -> m/s +Lag <- LenghtHydro / 2 / 86400 * 1000 # Conversion km/day -> m/s ## preparation of the InputsModel object InputsModel <- CreateInputsModel(FUN_MOD = RunModel_GR4J, DatesR = BasinObs$DatesR, @@ -79,8 +79,8 @@ OutputsModelDown <- RunModel_GR4J(InputsModel = InputsModel, RunOptions = RunOptions, Param = Param) InputsModel$OutputsModel <- OutputsModelDown -OutputsModel <- RunModel_LAG(InputsModel = InputsModel, - RunOptions = RunOptions, Param = LAG) +OutputsModel <- RunModel_Lag(InputsModel = InputsModel, + RunOptions = RunOptions, Param = Lag) ## results preview of comparison between naturalised (observed) and influenced flow (simulated) plot(OutputsModel, Qobs = OutputsModel$QsimDown) -- GitLab