diff --git a/DESCRIPTION b/DESCRIPTION index 10451eaddc9a635da3527d2bb8b198ef1a0853c9..a004ffb1e9774ffaa2900ac511b224ad7b5b1551 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.2.7.6 +Version: 1.2.7.7 Date: 2019-03-04 Authors@R: c( person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")), diff --git a/NEWS.rmd b/NEWS.rmd index 1f864f80507d4d17b95be168a6f01f54dbccf355..2d514bcc1bc5d3e9d64709caa0a30f1ff80c4c94 100644 --- a/NEWS.rmd +++ b/NEWS.rmd @@ -13,7 +13,7 @@ output: -### 1.2.7.6 Release Notes (2019-03-04) +### 1.2.7.7 Release Notes (2019-03-04) diff --git a/R/DataAltiExtrapolation_Valery.R b/R/DataAltiExtrapolation_Valery.R index 6dee926d1e2ef40bba743ea018cf8558a624b755..e75850b001fdbd55925490e81272820107d49427 100644 --- a/R/DataAltiExtrapolation_Valery.R +++ b/R/DataAltiExtrapolation_Valery.R @@ -460,8 +460,7 @@ DataAltiExtrapolation_Valery <- function(DatesR, ##Temperature_extrapolation____________________________________________________________________ ##Initialisation - LayerTempMean <- - list() + LayerTempMean <- list() LayerTempMin <- list() LayerTempMax <- list() @@ -499,15 +498,17 @@ DataAltiExtrapolation_Valery <- function(DatesR, ##Thresold_of_inputs_median_elevation Zthreshold <- 1500 + ##Option + Option <- "USACE" + if (!is.na(ZInputs)) { + if (ZInputs < Zthreshold & !is.null(TempMin) & !is.null(TempMax)) { + Option <- "Hydrotel" + } + } + ##On_each_elevation_layer... for (iLayer in 1:NLayers) { - Option <- "USACE" - - if (!is.na(ZInputs)) { - if (ZInputs < Zthreshold & !is.null(TempMin) & !is.null(TempMax)) { - Option <- "Hydrotel" - } - } + ##Turcotte_formula_from_Hydrotel if (Option == "Hydrotel") { TempMin <- LayerTempMin[[iLayer]]