diff --git a/DESCRIPTION b/DESCRIPTION index ad060bef8bd6943dbdd5ca0741bc69bdd9ed5c52..574df6b667fd918ce043d01f7e282b10e7ddd417 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.72 -Date: 2020-11-23 +Version: 1.6.3.73 +Date: 2020-11-24 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 485447f40fa7649601f045af7206830852015eed..e4a9be1f2cc9207558a29764ce9c5da01b3e87c5 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,7 +4,7 @@ -### 1.6.3.72 Release Notes (2020-11-23) +### 1.6.3.73 Release Notes (2020-11-24) #### New features diff --git a/src/frun_GR6J.f90 b/src/frun_GR6J.f90 index 9f52bffaa7835f5edb13597fb070fb81697e1e2a..0fa325770325b1905eb8fe1017c18761b51661cd 100644 --- a/src/frun_GR6J.f90 +++ b/src/frun_GR6J.f90 @@ -296,19 +296,14 @@ IF(AR.GT.33.) AR=33. IF(AR.LT.-33.) AR=-33. - IF(AR.GT.7.)THEN + IF(AR.GT.7.) THEN QRExp=St(3)+Param(6)/EXP(AR) - GOTO 3 - ENDIF - - IF(AR.LT.-7.)THEN + ELSEIF(AR.LT.-7.) THEN QRExp=Param(6)*EXP(AR) - GOTO 3 + ELSE + QRExp=Param(6)*LOG(EXP(AR)+1.) ENDIF - QRExp=Param(6)*LOG(EXP(AR)+1.) - 3 CONTINUE - St(3)=St(3)-QRExp ! Runoff from direct branch QD