From b379ecd3894b7627fc51dd37c8a1eab864369977 Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.fr>
Date: Tue, 24 Nov 2020 09:45:55 +0100
Subject: [PATCH] v1.6.3.73 style: frun_GR6J subroutine is compliant with
Fortran 95 standard Reviewed-by: @antoine.pelletier Refs #68
---
DESCRIPTION | 4 ++--
NEWS.md | 2 +-
src/frun_GR6J.f90 | 13 ++++---------
3 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index ad060bef..574df6b6 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 485447f4..e4a9be1f 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 9f52bffa..0fa32577 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
--
GitLab