diff --git a/DESCRIPTION b/DESCRIPTION index 99421689b394421683a0b4a8f2fd8198278f63a0..dd96f525c7a910c4209a1165dd813ac484e9b40c 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.0.5.25 +Version: 1.0.5.26 Date: 2017-03-15 Authors@R: c( person("Laurent", "Coron", role = c("aut", "trl")), diff --git a/R/RunModel_CemaNeigeGR4J.R b/R/RunModel_CemaNeigeGR4J.R index 94e24f07c53cf2c6ac02d287455890c7d4e9505d..28151667fa8f79f26265ed1e8b8684f14b1aa2fd 100644 --- a/R/RunModel_CemaNeigeGR4J.R +++ b/R/RunModel_CemaNeigeGR4J.R @@ -22,7 +22,7 @@ RunModel_CemaNeigeGR4J <- function(InputsModel,RunOptions,Param){ Param[1L] <- Param_X1X3_threshold } if (Param[3L] < Param_X1X3_threshold) { - warning(sprintf("Param[1] (X3: routing store capacity [mm]) < %.2f\n New X3 value: %.2f", Param_X1X3_threshold, Param_X1X3_threshold)) + warning(sprintf("Param[3] (X3: routing store capacity [mm]) < %.2f\n New X3 value: %.2f", Param_X1X3_threshold, Param_X1X3_threshold)) Param[3L] <- Param_X1X3_threshold } diff --git a/R/RunModel_CemaNeigeGR5J.R b/R/RunModel_CemaNeigeGR5J.R index 6e7a49d96b0c5b65f1bd01dc460c8a66ce73b5f3..b99e4c2dd32af514e185a0aeeb9211633c444b39 100644 --- a/R/RunModel_CemaNeigeGR5J.R +++ b/R/RunModel_CemaNeigeGR5J.R @@ -22,7 +22,7 @@ RunModel_CemaNeigeGR5J <- function(InputsModel,RunOptions,Param){ Param[1L] <- Param_X1X3_threshold } if (Param[3L] < Param_X1X3_threshold) { - warning(sprintf("Param[1] (X3: routing store capacity [mm]) < %.2f\n New X3 value: %.2f", Param_X1X3_threshold, Param_X1X3_threshold)) + warning(sprintf("Param[3] (X3: routing store capacity [mm]) < %.2f\n New X3 value: %.2f", Param_X1X3_threshold, Param_X1X3_threshold)) Param[3L] <- Param_X1X3_threshold } diff --git a/R/RunModel_CemaNeigeGR6J.R b/R/RunModel_CemaNeigeGR6J.R index 641ed08d5ba34b4c84cbe03da64cba5d54a622ed..120899b5bc3561d62c9a1c816d25c4541544dbd0 100644 --- a/R/RunModel_CemaNeigeGR6J.R +++ b/R/RunModel_CemaNeigeGR6J.R @@ -22,7 +22,7 @@ RunModel_CemaNeigeGR6J <- function(InputsModel,RunOptions,Param){ Param[1L] <- Param_X1X3_threshold } if (Param[3L] < Param_X1X3_threshold) { - warning(sprintf("Param[1] (X3: routing store capacity [mm]) < %.2f\n New X3 value: %.2f", Param_X1X3_threshold, Param_X1X3_threshold)) + warning(sprintf("Param[3] (X3: routing store capacity [mm]) < %.2f\n New X3 value: %.2f", Param_X1X3_threshold, Param_X1X3_threshold)) Param[3L] <- Param_X1X3_threshold } diff --git a/R/RunModel_GR4H.R b/R/RunModel_GR4H.R index d803c7e49f019cf5edbb4a5fd3a4b6479c54722e..541d9dfccac80a01b670cec538e701e68596d6c7 100644 --- a/R/RunModel_GR4H.R +++ b/R/RunModel_GR4H.R @@ -19,7 +19,7 @@ RunModel_GR4H <- function(InputsModel,RunOptions,Param){ Param[1L] <- Param_X1X3_threshold } if (Param[3L] < Param_X1X3_threshold) { - warning(sprintf("Param[1] (X3: routing store capacity [mm]) < %.2f\n New X3 value: %.2f", Param_X1X3_threshold, Param_X1X3_threshold)) + warning(sprintf("Param[3] (X3: routing store capacity [mm]) < %.2f\n New X3 value: %.2f", Param_X1X3_threshold, Param_X1X3_threshold)) Param[3L] <- Param_X1X3_threshold } diff --git a/R/RunModel_GR4J.R b/R/RunModel_GR4J.R index a5f6e7d5905f7b5b2d9cc5ed00b2ee1b6d67f818..c657d6942f75abace57f4d606423c3850b2fe68d 100644 --- a/R/RunModel_GR4J.R +++ b/R/RunModel_GR4J.R @@ -19,7 +19,7 @@ RunModel_GR4J <- function(InputsModel,RunOptions,Param){ Param[1L] <- Param_X1X3_threshold } if (Param[3L] < Param_X1X3_threshold) { - warning(sprintf("Param[1] (X3: routing store capacity [mm]) < %.2f\n New X3 value: %.2f", Param_X1X3_threshold, Param_X1X3_threshold)) + warning(sprintf("Param[3] (X3: routing store capacity [mm]) < %.2f\n New X3 value: %.2f", Param_X1X3_threshold, Param_X1X3_threshold)) Param[3L] <- Param_X1X3_threshold } @@ -54,7 +54,7 @@ RunModel_GR4J <- function(InputsModel,RunOptions,Param){ ) RESULTS$Outputs[ round(RESULTS$Outputs ,3)==(-999.999)] <- NA; RESULTS$StateEnd[round(RESULTS$StateEnd,3)==(-999.999)] <- NA; - +print(head(RESULTS$Outputs[, c(3,9)])) ##Output_data_preparation IndPeriod2 <- (length(RunOptions$IndPeriod_WarmUp)+1):LInputSeries; ExportDatesR <- "DatesR" %in% RunOptions$Outputs_Sim; diff --git a/R/RunModel_GR5J.R b/R/RunModel_GR5J.R index e0ee240a51d37dc261bae42b112d6aa4ac5bc0d4..f7357c09d01a298a0d8f7cac8fa535289a40d764 100644 --- a/R/RunModel_GR5J.R +++ b/R/RunModel_GR5J.R @@ -19,7 +19,7 @@ RunModel_GR5J <- function(InputsModel,RunOptions,Param){ Param[1L] <- Param_X1X3_threshold } if (Param[3L] < Param_X1X3_threshold) { - warning(sprintf("Param[1] (X3: routing store capacity [mm]) < %.2f\n New X3 value: %.2f", Param_X1X3_threshold, Param_X1X3_threshold)) + warning(sprintf("Param[3] (X3: routing store capacity [mm]) < %.2f\n New X3 value: %.2f", Param_X1X3_threshold, Param_X1X3_threshold)) Param[3L] <- Param_X1X3_threshold } diff --git a/R/RunModel_GR6J.R b/R/RunModel_GR6J.R index 8bfd01b8c047019cacc84c176883028acb5c7934..d96bd13a15796edf9ecfd023fdbaf5bc022b3e49 100644 --- a/R/RunModel_GR6J.R +++ b/R/RunModel_GR6J.R @@ -19,7 +19,7 @@ RunModel_GR6J <- function(InputsModel,RunOptions,Param){ Param[1L] <- Param_X1X3_threshold } if (Param[3L] < Param_X1X3_threshold) { - warning(sprintf("Param[1] (X3: routing store capacity [mm]) < %.2f\n New X3 value: %.2f", Param_X1X3_threshold, Param_X1X3_threshold)) + warning(sprintf("Param[6] (X3: routing store capacity [mm]) < %.2f\n New X3 value: %.2f", Param_X1X3_threshold, Param_X1X3_threshold)) Param[3L] <- Param_X1X3_threshold }