Skip to content
GitLab
Commit c4d6d7f4 authored by Delaigue Olivier's avatar Delaigue Olivier
Browse files

v1.6.8.36 refactor: rename variable in CreateCalibOptions

parent 26d137d4
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 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
1 merge request!26CRAN v1.6.9.21
Pipeline #18869 passed with stages
in 12 minutes and 19 seconds
Hide whitespace changes
Inline Side-by-side
Showing
with 10 additions and 10 deletions
+10 -10
DESCRIPTION
+ 1
− 1
View file @ c4d6d7f4
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.8.35 Version: 1.6.8.36
Date: 2021-01-05 Date: 2021-01-05
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")),
......
NEWS.md
+ 1
− 1
View file @ c4d6d7f4
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
### 1.6.8.35 Release Notes (2021-01-05) ### 1.6.8.36 Release Notes (2021-01-05)
#### New features #### New features
......
R/CreateCalibOptions.R
+ 8
− 8
View file @ c4d6d7f4
...@@ -142,9 +142,9 @@ CreateCalibOptions <- function(FUN_MOD, ...@@ -142,9 +142,9 @@ CreateCalibOptions <- function(FUN_MOD,
} }
##_set_FUN2 ##_set_FUN2
if (IsHyst) { if (IsHyst) {
FUN_NEIGE <- TransfoParam_CemaNeigeHyst FUN_SNOW <- TransfoParam_CemaNeigeHyst
} else { } else {
FUN_NEIGE <- TransfoParam_CemaNeige FUN_SNOW <- TransfoParam_CemaNeige
} }
##_set_FUN_LAG ##_set_FUN_LAG
if (IsSD) { if (IsSD) {
...@@ -180,7 +180,7 @@ CreateCalibOptions <- function(FUN_MOD, ...@@ -180,7 +180,7 @@ CreateCalibOptions <- function(FUN_MOD,
ParamOut <- NA * ParamIn ParamOut <- NA * ParamIn
NParam <- ncol(ParamIn) NParam <- ncol(ParamIn)
ParamOut[, 1:(NParam - 4) ] <- FUN_GR(ParamIn[, 1:(NParam - 4) ], Direction) ParamOut[, 1:(NParam - 4) ] <- FUN_GR(ParamIn[, 1:(NParam - 4) ], Direction)
ParamOut[, (NParam - 3):NParam] <- FUN_NEIGE(ParamIn[, (NParam - 3):NParam], Direction) ParamOut[, (NParam - 3):NParam] <- FUN_SNOW(ParamIn[, (NParam - 3):NParam], Direction)
if (!Bool) { if (!Bool) {
ParamOut <- ParamOut[1, ] ParamOut <- ParamOut[1, ]
} }
...@@ -200,7 +200,7 @@ CreateCalibOptions <- function(FUN_MOD, ...@@ -200,7 +200,7 @@ CreateCalibOptions <- function(FUN_MOD,
} else { } else {
ParamOut[, 1:(NParam - 2)] <- FUN_GR( ParamIn[, 1:(NParam - 2)], Direction) ParamOut[, 1:(NParam - 2)] <- FUN_GR( ParamIn[, 1:(NParam - 2)], Direction)
} }
ParamOut[, (NParam - 1):NParam] <- FUN_NEIGE(ParamIn[, (NParam - 1):NParam], Direction) ParamOut[, (NParam - 1):NParam] <- FUN_SNOW(ParamIn[, (NParam - 1):NParam], Direction)
if (!Bool) { if (!Bool) {
ParamOut <- ParamOut[1, ] ParamOut <- ParamOut[1, ]
} }
...@@ -216,7 +216,7 @@ CreateCalibOptions <- function(FUN_MOD, ...@@ -216,7 +216,7 @@ CreateCalibOptions <- function(FUN_MOD,
ParamOut <- NA * ParamIn ParamOut <- NA * ParamIn
NParam <- ncol(ParamIn) NParam <- ncol(ParamIn)
ParamOut[, 2:(NParam - 4) ] <- FUN_GR( ParamIn[, 2:(NParam - 4) ], Direction) ParamOut[, 2:(NParam - 4) ] <- FUN_GR( ParamIn[, 2:(NParam - 4) ], Direction)
ParamOut[, (NParam - 3):NParam] <- FUN_NEIGE( ParamIn[, (NParam - 3):NParam], Direction) ParamOut[, (NParam - 3):NParam] <- FUN_SNOW( ParamIn[, (NParam - 3):NParam], Direction)
ParamOut[, 1 ] <- FUN_LAG(as.matrix(ParamIn[, 1 ]), Direction) ParamOut[, 1 ] <- FUN_LAG(as.matrix(ParamIn[, 1 ]), Direction)
if (!Bool) { if (!Bool) {
ParamOut <- ParamOut[1, ] ParamOut <- ParamOut[1, ]
...@@ -237,8 +237,8 @@ CreateCalibOptions <- function(FUN_MOD, ...@@ -237,8 +237,8 @@ CreateCalibOptions <- function(FUN_MOD,
} else { } else {
ParamOut[, 2:(NParam - 2)] <- FUN_GR( ParamIn[, 2:(NParam - 2)], Direction) ParamOut[, 2:(NParam - 2)] <- FUN_GR( ParamIn[, 2:(NParam - 2)], Direction)
} }
ParamOut[, (NParam - 1):NParam] <- FUN_NEIGE( ParamIn[, (NParam - 1):NParam], Direction) ParamOut[, (NParam - 1):NParam] <- FUN_SNOW( ParamIn[, (NParam - 1):NParam], Direction)
ParamOut[, 1 ] <- FUN_LAG(as.matrix(ParamIn[, 1]), Direction) ParamOut[, 1 ] <- FUN_LAG(as.matrix(ParamIn[, 1]), Direction)
if (!Bool) { if (!Bool) {
ParamOut <- ParamOut[1, ] ParamOut <- ParamOut[1, ]
} }
...@@ -484,4 +484,4 @@ CreateCalibOptions <- function(FUN_MOD, ...@@ -484,4 +484,4 @@ CreateCalibOptions <- function(FUN_MOD,
return(CalibOptions) return(CalibOptions)
} }
\ No newline at end of file
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