diff --git a/DESCRIPTION b/DESCRIPTION index eb60b7a1747505dae76bda2ef0e57b9aa487e7be..99421689b394421683a0b4a8f2fd8198278f63a0 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.24 +Version: 1.0.5.25 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 8ce9b7a7f92b9f8905e8f0000a97cf103f8cd385..94e24f07c53cf2c6ac02d287455890c7d4e9505d 100644 --- a/R/RunModel_CemaNeigeGR4J.R +++ b/R/RunModel_CemaNeigeGR4J.R @@ -91,7 +91,7 @@ RunModel_CemaNeigeGR4J <- function(InputsModel,RunOptions,Param){ } else { IndOutputsMod <- which(FortranOutputsMod %in% RunOptions$Outputs_Sim); } ##Use_of_IniResLevels - if("IniResLevels" %in% RunOptions){ + if("IniResLevels" %in% names(RunOptions)){ RunOptions$IniStates[1] <- RunOptions$IniResLevels[1]*ParamMod[1]; ### production store level (mm) RunOptions$IniStates[2] <- RunOptions$IniResLevels[2]*ParamMod[3]; ### routing store level (mm) } diff --git a/R/RunModel_CemaNeigeGR5J.R b/R/RunModel_CemaNeigeGR5J.R index f7e3b98209e77e43daf9a023a9f710431f1b20d1..6e7a49d96b0c5b65f1bd01dc460c8a66ce73b5f3 100644 --- a/R/RunModel_CemaNeigeGR5J.R +++ b/R/RunModel_CemaNeigeGR5J.R @@ -91,7 +91,7 @@ RunModel_CemaNeigeGR5J <- function(InputsModel,RunOptions,Param){ } else { IndOutputsMod <- which(FortranOutputsMod %in% RunOptions$Outputs_Sim); } ##Use_of_IniResLevels - if("IniResLevels" %in% RunOptions){ + if("IniResLevels" %in% names(RunOptions)){ RunOptions$IniStates[1] <- RunOptions$IniResLevels[1]*ParamMod[1]; ### production store level (mm) RunOptions$IniStates[2] <- RunOptions$IniResLevels[2]*ParamMod[3]; ### routing store level (mm) } diff --git a/R/RunModel_CemaNeigeGR6J.R b/R/RunModel_CemaNeigeGR6J.R index 641922d79e821be25d07cdeac5b5da492e535020..641ed08d5ba34b4c84cbe03da64cba5d54a622ed 100644 --- a/R/RunModel_CemaNeigeGR6J.R +++ b/R/RunModel_CemaNeigeGR6J.R @@ -92,7 +92,7 @@ RunModel_CemaNeigeGR6J <- function(InputsModel,RunOptions,Param){ } else { IndOutputsMod <- which(FortranOutputsMod %in% RunOptions$Outputs_Sim); } ##Use_of_IniResLevels - if("IniResLevels" %in% RunOptions){ + if("IniResLevels" %in% names(RunOptions)){ RunOptions$IniStates[1] <- RunOptions$IniResLevels[1]*ParamMod[1]; ### production store level (mm) RunOptions$IniStates[2] <- RunOptions$IniResLevels[2]*ParamMod[3]; ### routing store level (mm) }