Skip to content
GitLab
Commit 6a23e019 authored by unknown's avatar unknown
Browse files

v1.0.9.3 bug fixed in DataAltiExtrapolation_Valery when PrecipScale = FALSE #4521

parent 0bdc58bc
dev 115-add-pcict-date-format-managment 118-plot-outputsmodel-remove-case-sensitivity-to-the-which-argument 136-decreased-performance-of-calibration-execution-time 60-migrate-transfoparam-functions-and-createcaliboptions-to-s3-methods 96-parallelize-the-grid-screening-step-during-calibration airGRplus cleanAirGRplus master 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 CRAN_v1.4.3.65 CRAN_v1.4.3.60 CRAN_v1.4.3.52 CRAN_v1.3.2.42 CRAN_v1.3.2.41 CRAN_v1.3.2.40 CRAN_v1.3.2.39 CRAN_v1.3.2.23 CRAN_v1.3.2.17 CRAN_v1.2.13.16 CRAN_v1.2.13.13 CRAN_v1.0.14.1 CRAN_v1.0.13.19 CRAN_v1.0.10.11 CRAN_v1.0.9.64
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 4 deletions
+4 -4
DESCRIPTION
+ 2
− 2
View file @ 6a23e019
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.0.9.2 Version: 1.0.9.3
Date: 2017-06-22 Date: 2017-06-26
Authors@R: c( Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl")), person("Laurent", "Coron", role = c("aut", "trl")),
person("Charles", "Perrin", role = c("aut", "ths")), person("Charles", "Perrin", role = c("aut", "ths")),
......
R/DataAltiExtrapolation_Valery.R
+ 2
− 2
View file @ 6a23e019
...@@ -433,7 +433,7 @@ DataAltiExtrapolation_Valery <- function(DatesR, ...@@ -433,7 +433,7 @@ DataAltiExtrapolation_Valery <- function(DatesR,
##Extrapolation ##Extrapolation
##Thresold_of_inputs_median_elevation ##Thresold_of_inputs_median_elevation
Zthreshold <- 4000 Zthreshold <- 4000
LayerPrecip_df <- sapply(1:NLayers, function(iLayer) { LayerPrecip_mat <- sapply(1:NLayers, function(iLayer) {
##If_layer_elevation_smaller_than_Zthreshold ##If_layer_elevation_smaller_than_Zthreshold
if (ZLayers[iLayer] <= Zthreshold) { if (ZLayers[iLayer] <= Zthreshold) {
prcp <- as.double(Precip * exp(TabGradP * (ZLayers[iLayer] - ZInputs))) prcp <- as.double(Precip * exp(TabGradP * (ZLayers[iLayer] - ZInputs)))
...@@ -450,7 +450,7 @@ DataAltiExtrapolation_Valery <- function(DatesR, ...@@ -450,7 +450,7 @@ DataAltiExtrapolation_Valery <- function(DatesR,
return(prcp) return(prcp)
}) })
if (PrecipScale) { if (PrecipScale) {
LayerPrecip_mat <- LayerPrecip_df / rowMeans(LayerPrecip_df) * Precip LayerPrecip_mat <- LayerPrecip_mat / rowMeans(LayerPrecip_mat) * Precip
LayerPrecip_mat[is.nan(LayerPrecip_mat)] <- 0 LayerPrecip_mat[is.nan(LayerPrecip_mat)] <- 0
} }
LayerPrecip <- as.list(as.data.frame(LayerPrecip_mat)) LayerPrecip <- as.list(as.data.frame(LayerPrecip_mat))
......
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