diff --git a/DESCRIPTION b/DESCRIPTION index 80f80524c827e463cb01845bdff60587c3d9abc4..9b871de581057351d05a525daf58f5e32432217e 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: airGR Type: Package Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling -Version: 1.6.3.23 -Date: 2020-10-27 +Version: 1.6.3.24 +Date: 2020-11-05 Authors@R: c( person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")), person("Olivier", "Delaigue", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-7668-8468"), email = "airGR@inrae.fr"), diff --git a/NEWS.md b/NEWS.md index 99ffdce14356d1acf14024502452e02172e763c7..6541b58caebf8d88a358a55592ad95c2dc319db1 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,7 +4,7 @@ -### 1.6.3.23 Release Notes (2020-10-27) +### 1.6.3.24 Release Notes (2020-1&-05) #### New features diff --git a/R/RunModel_GR1A.R b/R/RunModel_GR1A.R index d636ab4d2ab7e04e73a47d6334965c1614c563ef..98cb5ec94580eef1ae40dde2a54796f09a5419d4 100644 --- a/R/RunModel_GR1A.R +++ b/R/RunModel_GR1A.R @@ -52,7 +52,7 @@ RunModel_GR1A <- function(InputsModel,RunOptions,Param){ P1 <- InputsModel$Precip[ IndPeriod1][2: L ] E1 <- InputsModel$PotEvap[IndPeriod1][2: L ] Q1 <- P1*(1.-1./(1.+((0.7*P1+0.3*P0)/Param[1]/E1)^2.0)^0.5) - PEQ <- rbind(c(NA,NA,NA),cbind(P1,E1,Q1)) + PEQ <- rbind(c(NA,NA,NA),cbind(E1,P1,Q1)) Outputs <- PEQ[,IndOutputs] if(is.vector(Outputs)){ Outputs <- cbind(Outputs); } RESULTS <- list(NOutputs=length(IndOutputs),IndOutputs=IndOutputs,Outputs=Outputs,StatesEnd=NA)