From 8df74423ec59cadb87fa3ac1629f1ff99870d3c5 Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.priv>
Date: Tue, 22 May 2018 09:47:56 +0200
Subject: [PATCH] v1.0.10.0 bug fixed in GR2M. The function now returns the
total precipitation (P) instead of the net rainfall (P1) #5244
---
DESCRIPTION | 2 +-
NEWS.rmd | 2 +-
src/frun_GR2M.f | 15 ++++++++-------
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index a24e72e3..9bcac62f 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.0.9.79
+Version: 1.0.10.0
Date: 2018-05-22
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl")),
diff --git a/NEWS.rmd b/NEWS.rmd
index f6efeeb6..de0315e2 100644
--- a/NEWS.rmd
+++ b/NEWS.rmd
@@ -14,7 +14,7 @@ output:
-### 1.0.9.79 Release Notes (2018-05-22)
+### 1.0.10.0 Release Notes (2018-05-22)
____________________________________________________________________________________
diff --git a/src/frun_GR2M.f b/src/frun_GR2M.f
index 98ecf120..99dd8920 100644
--- a/src/frun_GR2M.f
+++ b/src/frun_GR2M.f
@@ -167,14 +167,15 @@ C Updating store level
C Variables storage
MISC( 1)=E ! PE ! [numeric] observed potential evapotranspiration [mm/month]
- MISC( 2)=P1 ! Precip ! [numeric] observed total precipitation [mm/month]
+ MISC( 2)=P ! Precip ! [numeric] observed total precipitation [mm/month]
MISC( 3)=AE ! AE ! [numeric] actual evapotranspiration [mm/month]
- MISC( 4)=P2 ! P2 ! [numeric] percolation (P2) [mm/month]
- MISC( 5)=P3 ! P3 ! [numeric] P3=P1+P2 [mm/month]
- MISC( 6)=EXCH ! EXCH ! [numeric] groundwater exchange (EXCH) [mm/month]
- MISC( 7)=St(1) ! Prod ! [numeric] production store level (St(1)) [mm]
- MISC( 8)=St(2) ! Rout ! [numeric] routing store level (St(2)) [mm]
- MISC( 9)=Q ! Qsim ! [numeric] simulated outflow at catchment outlet [mm/month]
+ MISC( 4)=P1 ! P1 ! [numeric] net rainfall (P1) [mm/month]
+ MISC( 5)=P2 ! P2 ! [numeric] percolation (P2) [mm/month]
+ MISC( 6)=P3 ! P3 ! [numeric] P3=P1+P2 [mm/month]
+ MISC( 7)=EXCH ! EXCH ! [numeric] groundwater exchange (EXCH) [mm/month]
+ MISC( 8)=St(1) ! Prod ! [numeric] production store level (St(1)) [mm]
+ MISC( 9)=St(2) ! Rout ! [numeric] routing store level (St(2)) [mm]
+ MISC(10)=Q ! Qsim ! [numeric] simulated outflow at catchment outlet [mm/month]
ENDSUBROUTINE
--
GitLab