En raison d'une défaillance matérielle, les jobs d'intégration continue peuvent échouer sans raison évidente sur les runners partagés. Les disques incriminés devraient être changés en fin de semaine. Merci de votre compréhension.

Commit 9c837562 authored by Delaigue Olivier's avatar Delaigue Olivier
Browse files

v 0.2.9.5 CLEAN: minor typo revisions in the serve file

parent 0ddda0e5
Package: airGRteaching
Type: Package
Title: Teaching Hydrological Modelling with the GR Rainfall-Runoff Models ('Shiny' Interface Included)
Version: 0.2.9.4
Version: 0.2.9.5
Date: 2020-03-24
Authors@R: c(
person("Olivier", "Delaigue", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-7668-8468"), email = "airGR@inrae.fr"),
......
......@@ -4,7 +4,7 @@
### 0.2.9.4 Release Notes (2020-03-24)
### 0.2.9.5 Release Notes (2020-03-24)
____________________________________________________________________________________
......
......@@ -171,7 +171,7 @@ shinyServer(function(input, output, session) {
verbose = FALSE)
## Criteria computation
CRIT_opt <- list(Crit = c(rep("ErrorCrit_NSE", 3), rep("ErrorCrit_KGE", 3)),
CRIT_opt <- list(Crit = c(rep("ErrorCrit_NSE", 3), rep("ErrorCrit_KGE", 3)),
Transfo = rep(c("", "sqrt", "inv"), times = 2))
nCRIT_opt <- length(CRIT_opt$Crit)
if (!getPrep()$isUngauged) {
......@@ -859,7 +859,7 @@ shinyServer(function(input, output, session) {
ParamUnits <- c("mm", "mm/%s", "mm", "%s", "", "mm")[seq_len(getPrep()$TMGR$NbParam)]
if (input$SnowModel == "CemaNeige") {
ParamTitle <- c(ParamTitle, "C1", "C2")
ParamUnits <- c(ParamUnits, "", "mm/°C/%s")
ParamUnits <- c(ParamUnits, "", "mm/°C/%s")
}
ParamTitle <- paste(ParamTitle, paste(getSim()$PARAM, sprintf(ParamUnits, getPrep()$TMGR$TimeUnit)), sep = " = ", collapse = ", ")
ParamTitle <- gsub(" ,", ",", ParamTitle)
......@@ -868,7 +868,7 @@ shinyServer(function(input, output, session) {
paste0(input$Period, collapse = " - "),
ParamTitle)
if (getPlotType() == 1) {
png(filename = file, width = 1000*k, height = ifelse(input$SnowModel != "CemaNeige", 700*k, 1100*k), pointsize = 14, res = 150)
png(filename = file, width = 1000*k, height = ifelse(input$SnowModel != "CemaNeige", 700*k, 1100*k), pointsize = 14, res = 150)
par(oma = c(0, 0, 4, 0))
plot(getSim()$SIM)
mtext(text = PngTitle, side = 3, outer = TRUE, cex = 0.8, line = 1.2)
......@@ -914,7 +914,7 @@ shinyServer(function(input, output, session) {
polygon(c(data$Dates, rev(range(data$Dates))), c(data$prod., rep(0, 2)), border = "darkblue", col = adjustcolor("darkblue", alpha.f = 0.30))
polygon(c(data$Dates, rev(range(data$Dates))), c(data$rout., rep(0, 2)), border = "cyan4" , col = adjustcolor("cyan4" , alpha.f = 0.30))
if (input$HydroModel == "GR6J") {
minQrExp <- min(data$prod., data$rout., data$exp., 0)
minQrExp <- min(data$prod., data$rout., data$exp., 0)
colQrExp <- ifelse(minQrExp > 0, "#10B510", "#FF0303")
polygon(c(data$Dates, rev(range(data$Dates))), c(data$exp., rep(0, 2)), border = colQrExp, col = adjustcolor(colQrExp, alpha.f = 0.30))
}
......
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