diff --git a/DESCRIPTION b/DESCRIPTION index 23275273227d26b2b92b281fb0540bafa7986cd6..33879b54ae26002f7ef8eb45c9a6032fdcca213f 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: airGRteaching Type: Package Title: Teaching Hydrological Modelling with the GR Rainfall-Runoff Models ('Shiny' Interface Included) -Version: 0.2.10.15 -Date: 2020-04-16 +Version: 0.2.10.16 +Date: 2020-04-17 Authors@R: c( person("Olivier", "Delaigue", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-7668-8468"), email = "airGR@inrae.fr"), person("Laurent", "Coron", role = c("aut"), comment = c(ORCID = "0000-0002-1503-6204")), diff --git a/NEWS.md b/NEWS.md index 48cd31969ca1cf3251101f277970b66467f1261a..570173bc23bf8208b0a01ae16ef3274ed5df2d78 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,7 +4,7 @@ -### 0.2.10.16 Release Notes (2020-04-14) +### 0.2.10.16 Release Notes (2020-04-17) #### New features diff --git a/R/Utils.R b/R/Utils.R index ca5805e5dae30cdbe683baafba26ab166bef4783..205752cffa484e93421efb842e75b907fc5939bc 100644 --- a/R/Utils.R +++ b/R/Utils.R @@ -482,15 +482,13 @@ if (getRversion() >= "2.15.1") { cex = cex_tri(OutputsModel$PR[i_pdt]*0.9, fact = fact_triangle, max = cex_max_poly)) } - if (HydroModel != "GR2M") { - # Remplissage de UH1 - PR_mat_UH1_lg <- ceiling(Param[4]) - PR_mat_UH1_id <- max(i_pdt-PR_mat_UH1_lg+1, 1):i_pdt - PR_mat_UH1 <- matrix(rep(c(rep(0, times = PR_mat_UH1_lg-length(PR_mat_UH1_id)+1), - OutputsModel$PR[PR_mat_UH1_id]), times = PR_mat_UH1_lg), - ncol = PR_mat_UH1_lg+1)[, -1L] - PR_mat_UH1[lower.tri(PR_mat_UH1)] <- 0 - } + # Remplissage de UH1 + PR_mat_UH1_lg <- ceiling(Param[4]) + PR_mat_UH1_id <- max(i_pdt-PR_mat_UH1_lg+1, 1):i_pdt + PR_mat_UH1 <- matrix(rep(c(rep(0, times = PR_mat_UH1_lg-length(PR_mat_UH1_id)+1), + OutputsModel$PR[PR_mat_UH1_id]), times = PR_mat_UH1_lg), + ncol = PR_mat_UH1_lg+1)[, -1L] + PR_mat_UH1[lower.tri(PR_mat_UH1)] <- 0 # -------------------------------------------------------------------------------- @@ -504,15 +502,13 @@ if (getRversion() >= "2.15.1") { cex = cex_tri(OutputsModel$PR[i_pdt]*0.1, fact = fact_triangle, max = cex_max_poly)) } - if (HydroModel != "GR2M") { - # Remplissage de UH2 - PR_mat_UH2_lg <- ceiling(Param[4]*2) - PR_mat_UH2_id <- max(i_pdt-PR_mat_UH2_lg+1, 1):i_pdt - PR_mat_UH2 <- matrix(rep(c(rep(0, times = PR_mat_UH2_lg-length(PR_mat_UH2_id)+1), - OutputsModel$PR[PR_mat_UH2_id]), times = PR_mat_UH2_lg), - ncol = PR_mat_UH2_lg+1)[, -1L] - PR_mat_UH2[lower.tri(PR_mat_UH2)] <- 0 - } + # Remplissage de UH2 + PR_mat_UH2_lg <- ceiling(Param[4]*2) + PR_mat_UH2_id <- max(i_pdt-PR_mat_UH2_lg+1, 1):i_pdt + PR_mat_UH2 <- matrix(rep(c(rep(0, times = PR_mat_UH2_lg-length(PR_mat_UH2_id)+1), + OutputsModel$PR[PR_mat_UH2_id]), times = PR_mat_UH2_lg), + ncol = PR_mat_UH2_lg+1)[, -1L] + PR_mat_UH2[lower.tri(PR_mat_UH2)] <- 0 }