Commit 8a76442e authored by unknown's avatar unknown
Browse files

v0.1.5.8 TypeModel argument of the DiagramGR function is renamed into HydroModel

parent 4d3eb510
Package: airGRteaching
Type: Package
Title: Tools to Simplify the Use of the airGR Hydrological Package for Education (Including a Shiny Interface)
Version: 0.1.5.7
Version: 0.1.5.8
Date: 2017-09-06
Authors@R: c(person("Olivier", "Delaigue", role = c("aut", "cre"), email = "airGR@irstea.fr"), person("Laurent", "Coron", role = c("aut")), person("Pierre", "Brigode", role = c("aut")), person("Guillaume", "Thirel", role = c("ctb")))
Depends: airGR (>= 1.0.8.0)
......
......@@ -42,7 +42,7 @@ if (getRversion() >= "2.15.1") {
## function to plot the gr models diagrams (only GR4J and GR5J)
## =================================================================================
DiagramGR <- function(OutputsModel, Param, SimPer, EventDate, TypeModel) {
DiagramGR <- function(OutputsModel, Param, SimPer, EventDate, HydroModel) {
# --------------------------------------------------------------------------------
......@@ -121,7 +121,7 @@ DiagramGR <- function(OutputsModel, Param, SimPer, EventDate, TypeModel) {
# UH 1 & 2
# --------------------------------------------------------------------------------
if (TypeModel == "GR4J") {
if (HydroModel == "GR4J") {
# Calcul des ordonnees SH1 de l' "hydrogramme unitaire cumule" UH1
SH1 <- array(NA, NH)
for (i in 1:NH) {
......@@ -364,7 +364,7 @@ DiagramGR <- function(OutputsModel, Param, SimPer, EventDate, TypeModel) {
segments(x0 = x_PnPs, x1 = x_PnPs,
y0 = y_percolation, y1 = y_entreeUH+tmp_decal/2)
if (TypeModel == "GR4J") {
if (HydroModel == "GR4J") {
# --------------------------------------------------------------------------------
# SEPARATION DE PR
......@@ -434,7 +434,7 @@ DiagramGR <- function(OutputsModel, Param, SimPer, EventDate, TypeModel) {
}
if (TypeModel == "GR5J") {
if (HydroModel == "GR5J") {
# --------------------------------------------------------------------------------
# SEPARATION DE PR
......@@ -584,7 +584,7 @@ DiagramGR <- function(OutputsModel, Param, SimPer, EventDate, TypeModel) {
type = "p", pch = pch, col = col_P,
cex = cex_tri(OutputsModel$AExch2[i_pdt], fact = fact_triangle, max = cex_max_poly))
if (TypeModel == "GR4J") {
if (HydroModel == "GR4J") {
# --------------------------------------------------------------------------------
# UH 1 & 2 PLOT
......@@ -608,7 +608,7 @@ DiagramGR <- function(OutputsModel, Param, SimPer, EventDate, TypeModel) {
}
if (TypeModel == "GR5J") {
if (HydroModel == "GR5J") {
# --------------------------------------------------------------------------------
# UH PLOT
......
Markdown is supported
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