From 76c43bbafccb8490face63f8cb7680add43bc099 Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.priv>
Date: Wed, 4 Dec 2019 16:31:59 +0100
Subject: [PATCH] v1.4.0.3 CLEAN: evapotranspiration from production store of
GR5H output renamed ES #13
---
DESCRIPTION | 2 +-
NEWS.md | 2 +-
R/Utils.R | 2 +-
src/frun_GR5H.f90 | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 1e1f0714..b1ecf54b 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.4.0.2
+Version: 1.4.0.3
Date: 2019-12-04
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
diff --git a/NEWS.md b/NEWS.md
index 347cabeb..165ae4f3 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -2,7 +2,7 @@
-### 1.4.0.2 Release Notes (2019-12-04)
+### 1.4.0.3 Release Notes (2019-12-04)
#### New features
diff --git a/R/Utils.R b/R/Utils.R
index 3e4f7da7..16f2a4d6 100644
--- a/R/Utils.R
+++ b/R/Utils.R
@@ -44,7 +44,7 @@
"Qsim")
} else if (GR == "GR5H") {
outGR <- c("PotEvap", "Precip", "Interc", "Prod", "Pn", "Ps",
- "AE", "EI", "ER",
+ "AE", "EI", "ES",
"Perc", "PR",
"Q9", "Q1",
"Rout", "Exch",
diff --git a/src/frun_GR5H.f90 b/src/frun_GR5H.f90
index 023b115b..47dbd990 100644
--- a/src/frun_GR5H.f90
+++ b/src/frun_GR5H.f90
@@ -350,7 +350,7 @@
MISC( 6)=PS ! Ps ! part of Ps filling the production store [mm/h]
MISC( 7)=AE ! AE ! actual evapotranspiration [mm/h]
MISC( 8)=EI ! EI ! evapotranspiration from rainfall neutralisation or interception store [mm/h]
- MISC( 9)=AE-EI ! AE-EI ! evapotranspiration from production store [mm/h]
+ MISC( 9)=ES ! ES ! evapotranspiration from production store [mm/h]
MISC(10)=PERC ! Perc ! percolation (PERC) [mm/h]
MISC(11)=PR ! PR ! PR=PN-PS+PERC [mm/h]
MISC(12)=Q9 ! Q9 ! outflow from UH1 (Q9) [mm/h]
--
GitLab