From 01322853dbb0868bef6ae5517041606304e0fffc Mon Sep 17 00:00:00 2001 From: Delaigue Olivier <olivier.delaigue@irstea.priv> Date: Mon, 25 Mar 2019 18:28:47 +0100 Subject: [PATCH] v1.2.11.11 BUG: check on setting parameter values added in frun_CEMANEIGE FORTRAN file --- DESCRIPTION | 2 +- NEWS.rmd | 2 +- src/frun_CEMANEIGE.f | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index d5549d6d..cd1e15e4 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.2.11.10 +Version: 1.2.11.11 Date: 2019-03-25 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 3c71ce5a..b1350506 100644 --- a/NEWS.rmd +++ b/NEWS.rmd @@ -13,7 +13,7 @@ output: -### 1.2.11.10 Release Notes (2019-03-25) +### 1.2.11.11 Release Notes (2019-03-25) diff --git a/src/frun_CEMANEIGE.f b/src/frun_CEMANEIGE.f index 13dd5157..5d18df4d 100644 --- a/src/frun_CEMANEIGE.f +++ b/src/frun_CEMANEIGE.f @@ -70,8 +70,9 @@ Gacc=Param(3) prct=Param(4) - Gthreshold=prct*MeanAnSolidPrecip - Glocalmax=Gthreshold + IF (Gthreshold .EQ. 0.) Gthreshold=prct*MeanAnSolidPrecip + IF (Glocalmax .EQ. 0.) Glocalmax=Gthreshold + ELSE Gthreshold=0.9*MeanAnSolidPrecip ENDIF -- GitLab