Commit af730fcc authored by Hban Mesure's avatar Hban Mesure
Browse files

v1.4.1.7 BUG: variable ER has been renamed ES in frun_FR5H.f90 #13

it was only the case for the outputs (the other items were forgotten)
Showing with 10 additions and 10 deletions
+10 -10
Package: airGR
Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
Version: 1.4.1.6
Version: 1.4.1.7
Date: 2019-12-05
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
......
......@@ -2,7 +2,7 @@
### 1.4.1.6 Release Notes (2019-12-05)
### 1.4.1.7 Release Notes (2019-12-05)
#### New features
......
......@@ -182,7 +182,7 @@
!! locals
integer, parameter :: NParam=5,NMISC=30,NH=480
doubleprecision :: A,EN,ER,PN,PR,PS,WS,tanHyp,EI
doubleprecision :: A,EN,ES,PN,PR,PS,WS,tanHyp,EI
doubleprecision :: PERC,EXCH,QR,QD,Q1,Q9
doubleprecision :: AE,AEXCH1,AEXCH2
integer :: K
......@@ -226,9 +226,9 @@
expWS=exp(2.*WS)
TWS = (expWS - 1.)/(expWS + 1.)
Sr = St(1)/A
ER=St(1)*(2.-Sr)*TWS/(1.+(1.-Sr)*TWS)
St(1)=St(1)-ER
AE=ER+EI
ES=St(1)*(2.-Sr)*TWS/(1.+(1.-Sr)*TWS)
St(1)=St(1)-ES
AE=ES+EI
ELSE
AE=EI
ENDIF
......@@ -259,12 +259,12 @@
expWS=exp(2.*WS)
TWS = (expWS - 1.)/(expWS + 1.)
Sr = St(1)/A
ER=St(1)*(2.-Sr)*TWS/(1.+(1.-Sr)*TWS)
! ER=X(2)*(2.-X(2)/A)*tanHyp(WS)/(1.+(1.-X(2)/A)*tanHyp(WS))
ES=St(1)*(2.-Sr)*TWS/(1.+(1.-Sr)*TWS)
! ES=X(2)*(2.-X(2)/A)*tanHyp(WS)/(1.+(1.-X(2)/A)*tanHyp(WS))
! end speed-up
AE=ER+P1
AE=ES+P1
EI = P1
St(1)=St(1)-ER
St(1)=St(1)-ES
PS=0.
PR=0.
ELSE
......
Supports Markdown
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