From 19f749e0f8480a936f7b5c05f004dc3e404e48eb Mon Sep 17 00:00:00 2001 From: Delaigue Olivier <olivier.delaigue@irstea.priv> Date: Wed, 30 Jan 2019 14:14:49 +0100 Subject: [PATCH] v1.1.2.39 CLEAN: RunModel_CemaNeige syntax cleaned --- DESCRIPTION | 2 +- NEWS.rmd | 2 +- R/RunModel_CemaNeige.R | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 7921b101..10e8fb11 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.1.2.38 +Version: 1.1.2.39 Date: 2019-01-29 Authors@R: c( person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")), diff --git a/NEWS.rmd b/NEWS.rmd index 94c0ac08..65a9529c 100644 --- a/NEWS.rmd +++ b/NEWS.rmd @@ -13,7 +13,7 @@ output: -### 1.1.2.38 Release Notes (2019-01-29) +### 1.1.2.39 Release Notes (2019-01-29) diff --git a/R/RunModel_CemaNeige.R b/R/RunModel_CemaNeige.R index 52e3789e..4eec9007 100644 --- a/R/RunModel_CemaNeige.R +++ b/R/RunModel_CemaNeige.R @@ -93,8 +93,8 @@ RunModel_CemaNeige <- function(InputsModel, RunOptions, Param) { ncol = length(IndOutputsCemaNeige)), StateEnd = rep(-999.999, 2) ### state variables at the end of the model run (reservoir levels [mm] and HU) ) - RESULTS$Outputs[round(RESULTS$Outputs , 3) == (-999.999)] <- NA - RESULTS$StateEnd[round(RESULTS$StateEnd, 3) == (-999.999)] <- NA + RESULTS$Outputs[round(RESULTS$Outputs , 3) == -999.999] <- NA + RESULTS$StateEnd[round(RESULTS$StateEnd, 3) == -999.999] <- NA @@ -109,7 +109,7 @@ RunModel_CemaNeige <- function(InputsModel, RunOptions, Param) { } ### ENDFOR_iLayer - names(CemaNeigeLayers) <- paste("Layer", formatC(1:NLayers, width = 2, flag = "0"), sep = "") + names(CemaNeigeLayers) <- sprintf("Layer%02i", seq_len(NLayers)) if (ExportStateEnd) { CemaNeigeStateEnd <- CreateIniStates(FUN_MOD = RunModel_CemaNeige, InputsModel = InputsModel, -- GitLab