Commit 4f272a7b authored by Delaigue Olivier's avatar Delaigue Olivier
Browse files

v1.2.7.7 CLEAN: add names to elementq of lists of layers in DataAltiExtrapolation_Valery

Showing with 12 additions and 11 deletions
+12 -11
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.2.7.6 Version: 1.2.7.7
Date: 2019-03-04 Date: 2019-03-04
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")),
......
...@@ -13,7 +13,7 @@ output: ...@@ -13,7 +13,7 @@ output:
### 1.2.7.6 Release Notes (2019-03-04) ### 1.2.7.7 Release Notes (2019-03-04)
......
...@@ -460,8 +460,7 @@ DataAltiExtrapolation_Valery <- function(DatesR, ...@@ -460,8 +460,7 @@ DataAltiExtrapolation_Valery <- function(DatesR,
##Temperature_extrapolation____________________________________________________________________ ##Temperature_extrapolation____________________________________________________________________
##Initialisation ##Initialisation
LayerTempMean <- LayerTempMean <- list()
list()
LayerTempMin <- list() LayerTempMin <- list()
LayerTempMax <- list() LayerTempMax <- list()
...@@ -499,15 +498,17 @@ DataAltiExtrapolation_Valery <- function(DatesR, ...@@ -499,15 +498,17 @@ DataAltiExtrapolation_Valery <- function(DatesR,
##Thresold_of_inputs_median_elevation ##Thresold_of_inputs_median_elevation
Zthreshold <- 1500 Zthreshold <- 1500
##Option
Option <- "USACE"
if (!is.na(ZInputs)) {
if (ZInputs < Zthreshold & !is.null(TempMin) & !is.null(TempMax)) {
Option <- "Hydrotel"
}
}
##On_each_elevation_layer... ##On_each_elevation_layer...
for (iLayer in 1:NLayers) { 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 ##Turcotte_formula_from_Hydrotel
if (Option == "Hydrotel") { if (Option == "Hydrotel") {
TempMin <- LayerTempMin[[iLayer]] TempMin <- LayerTempMin[[iLayer]]
......
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