Commit 7f4f4b8c authored by Delaigue Olivier's avatar Delaigue Olivier

Merge branch 'outputsGR2M' into 'dev'

GR2M Outputs

See merge request !6
parents 6ebfc0e5 55246008
Package: airGR
Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
Version: 1.4.3.83
Date: 2020-04-09
Version: 1.4.3.85
Date: 2020-04-16
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"),
......
......@@ -4,7 +4,7 @@
### 1.4.3.83 Release Notes (2020-04-08)
### 1.4.3.85 Release Notes (2020-04-15)
#### CRAN-compatibility updates
......@@ -16,6 +16,11 @@
- The deprecated <code>RunSnowModule</code> argument has been removed from the <code>CreateRunOptions()</code> function.
#### Major user-visible changes
- Added output to <code>RunModel_GR2M()</code> function (Ps).
#### Minor user-visible changes
- Character argument verification now use partial matching in <code>PE_Oudin()</code> and <code>SeriesAggreg()</code> functions.
......
......@@ -28,7 +28,7 @@
outGR <- c("PotEvap", "Precip",
"Qsim")
} else if (GR == "GR2M") {
outGR <- c("PotEvap", "Precip", "Prod", "Pn",
outGR <- c("PotEvap", "Precip", "Prod", "Pn", "Ps",
"AE",
"Perc", "PR",
"Rout", "Exch",
......
......@@ -11,7 +11,7 @@
! Further cleaning: G. Thirel
!------------------------------------------------------------------------------
! Creation date: 2003
! Last modified: 25/11/2019
! Last modified: 16/04/2020
!------------------------------------------------------------------------------
! REFERENCES
! Mouelhi S. (2003). Vers une chaîne cohérente de modèles pluie-débit
......@@ -145,7 +145,7 @@
!! locals
integer, parameter :: NParam=2,NMISC=30
doubleprecision :: WS,S1,S2
doubleprecision :: P1,P2,P3,R1,R2,AE,EXCH
doubleprecision :: P1,P2,P3,R1,R2,AE,EXCH,PS
doubleprecision :: expWS, TWS, Sr ! speed-up
!! dummies
......@@ -169,7 +169,8 @@
! S1=(X(1)+Param(1)*tanHyp(WS))/(1.+X(1)/Param(1)*tanHyp(WS))
! end speed-up
P1=P+St(1)-S1
P1=P+St(1)-S1
PS = P - P1
WS=E/Param(1)
IF(WS.GT.13.) WS=13.
......@@ -211,14 +212,14 @@
MISC( 2)=P ! Precip ! [numeric] observed total precipitation [mm/month]
MISC( 3)=St(1) ! Prod ! [numeric] production store level (St(1)) [mm]
MISC( 4)=P1 ! Pn ! [numeric] net rainfall (P1) [mm/month]
MISC( 5)=AE ! AE ! [numeric] actual evapotranspiration [mm/month]
MISC( 6)=P2 ! Perc ! [numeric] percolation (P2) [mm/month]
MISC( 7)=P3 ! PR ! [numeric] P3=P1+P2 [mm/month]
MISC( 8)=St(2) ! Rout ! [numeric] routing store level (St(2)) [mm]
MISC( 9)=EXCH ! EXCH ! [numeric] groundwater exchange (EXCH) [mm/month]
MISC(10)=Q ! Qsim ! [numeric] simulated outflow at catchment outlet [mm/month]
MISC( 5)=PS ! Ps ! [numeric] part of P filling the production store [mm/month]
MISC( 6)=AE ! AE ! [numeric] actual evapotranspiration [mm/month]
MISC( 7)=P2 ! Perc ! [numeric] percolation (P2) [mm/month]
MISC( 8)=P3 ! PR ! [numeric] P3=P1+P2 [mm/month]
MISC( 9)=St(2) ! Rout ! [numeric] routing store level (St(2)) [mm]
MISC(10)=EXCH ! EXCH ! [numeric] groundwater exchange (EXCH) [mm/month]
MISC(11)=Q ! Qsim ! [numeric] simulated outflow at catchment outlet [mm/month]
END SUBROUTINE
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment