Skip to content
GitLab
Commit 2f0dcd3a authored by Delaigue Olivier's avatar Delaigue Olivier
Browse files

v1.3.2.67 SPEED: hyperbolic tangent function definition modified in frun_GR* Fortran codes #21

parent 9739dd34
dev 115-add-pcict-date-format-managment 118-plot-outputsmodel-remove-case-sensitivity-to-the-which-argument 136-decreased-performance-of-calibration-execution-time 161-runmodel_lag-proposal-for-a-better-transformation-and-screening-of-the-parameters 165-add-missing-isintstore-argument-in-createcaliboptions 171-check-error-direct-call-of-as-data-frame-posixct-is-deprecated-use-as-data-frame-vector-or-as 191-speed-up-runmodel_lag-when-it-is-used-alone 33-merge-airgr-and-airgrplus-functions 60-migrate-transfoparam-functions-and-createcaliboptions-to-s3-methods 96-parallelize-the-grid-screening-step-during-calibration airGRplus master rmOptions CRAN_v1.7.6 CRAN_v1.7.5 CRAN_v1.7.4 CRAN_v1.7.3 CRAN_v1.7.2 CRAN_v1.7.1 CRAN_v1.7.0 CRAN_v1.6.12 CRAN_v1.6.11 CRAN_v1.6.10.4 CRAN_v1.6.9.27 CRAN_v1.6.9.24 CRAN_v1.6.9.23 CRAN_v1.6.9.21 CRAN_v1.4.3.65 CRAN_v1.4.3.60 CRAN_v1.4.3.52
1 merge request!2Clean fortran
Hide whitespace changes
Inline Side-by-side
Showing
with 27 additions and 17 deletions
+27 -17
DESCRIPTION
+ 1
− 1
View file @ 2f0dcd3a
Package: airGR
Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
Version: 1.3.2.66
Version: 1.3.2.67
Date: 2019-12-02
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
......
NEWS.md
+ 1
− 1
View file @ 2f0dcd3a
......@@ -2,7 +2,7 @@
### 1.3.2.66 Release Notes (2019-12-02)
### 7 Release Notes (2019-12-02)
#### New features
......
src/frun_GR2M.f
+ 5
− 3
View file @ 2f0dcd3a
......@@ -147,7 +147,7 @@
integer, parameter :: NParam=2,NMISC=30
doubleprecision :: WS,tanHyp,S1,S2
doubleprecision :: P1,P2,P3,R1,R2,AE,EXCH
doubleprecision :: TWS, Sr ! speed-up
doubleprecision :: expWS, TWS, Sr ! speed-up
!! dummies
! in
......@@ -164,7 +164,8 @@
IF(WS.GT.13.) WS=13.
! speed-up
TWS = tanHyp(WS)
expWS = exp(2.*WS)
TWS = (expWS - 1.)/(expWS + 1.)
S1=(St(1)+Param(1)*TWS)/(1.+St(1)/Param(1)*TWS)
! S1=(X(1)+Param(1)*tanHyp(WS))/(1.+X(1)/Param(1)*tanHyp(WS))
! end speed-up
......@@ -174,7 +175,8 @@
IF(WS.GT.13.) WS=13.
! speed-up
TWS = tanHyp(WS)
expWS = exp(2.*WS)
TWS = (expWS - 1.)/(expWS + 1.)
S2=S1*(1.-TWS)/(1.+(1.-S1/Param(1))*TWS)
! S2=S1*(1.-tanHyp(WS))/(1.+(1.-S1/Param(1))*tanHyp(WS))
! end speed-up
......
src/frun_GR4H.f
+ 5
− 3
View file @ 2f0dcd3a
......@@ -180,7 +180,7 @@
integer :: K
doubleprecision, parameter :: B=0.9
doubleprecision, parameter :: stored_val=759.69140625
doubleprecision :: TWS, Sr, Rr ! speed-up
doubleprecision :: expWS, TWS, Sr, Rr ! speed-up
!! dummies
! in
......@@ -207,7 +207,8 @@
IF(WS.GT.13.) WS=13.
! speed-up
TWS = tanHyp(WS)
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))
......@@ -224,7 +225,8 @@
IF(WS.GT.13.)WS=13.
! speed-up
TWS = tanHyp(WS)
expWS = exp(2.*WS)
TWS = (expWS - 1.)/(expWS + 1.)
Sr = St(1)/A
PS=A*(1.-Sr*Sr)*TWS/(1.+Sr*TWS)
! PS=A*(1.-(X(2)/A)**2.)*tanHyp(WS)/(1.+X(2)/A*tanHyp(WS))
......
src/frun_GR4J.f
+ 5
− 3
View file @ 2f0dcd3a
......@@ -180,7 +180,7 @@
integer :: K
doubleprecision, parameter :: B=0.9
doubleprecision, parameter :: stored_val=25.62890625
doubleprecision :: TWS, Sr, Rr ! speed-up
doubleprecision :: expWS, TWS, Sr, Rr ! speed-up
!! dummies
! in
......@@ -206,7 +206,8 @@
WS=EN/A
IF(WS.GT.13.) WS=13.
! speed-up
TWS = tanHyp(WS)
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))
......@@ -222,7 +223,8 @@
WS=PN/A
IF(WS.GT.13.) WS=13.
! speed-up
TWS = tanHyp(WS)
expWS = exp(2.*WS)
TWS = (expWS - 1.)/(expWS + 1.)
Sr = St(1)/A
PS=A*(1.-Sr*Sr)*TWS/(1.+Sr*TWS)
! PS=A*(1.-(X(2)/A)**2.)*tanHyp(WS)/(1.+X(2)/A*tanHyp(WS))
......
src/frun_GR5J.f
+ 5
− 3
View file @ 2f0dcd3a
......@@ -174,7 +174,7 @@
integer :: K
doubleprecision, parameter :: B=0.9
doubleprecision, parameter :: stored_val=25.62890625
doubleprecision :: TWS, Sr, Rr ! speed-up
doubleprecision :: expWS, TWS, Sr, Rr ! speed-up
!! dummies
! in
......@@ -198,7 +198,8 @@
WS=EN/A
IF(WS.GT.13.) WS=13.
! speed-up
TWS = tanHyp(WS)
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))
......@@ -214,7 +215,8 @@
WS=PN/A
IF(WS.GT.13.) WS=13.
! speed-up
TWS = tanHyp(WS)
expWS = exp(2.*WS)
TWS = (expWS - 1.)/(expWS + 1.)
Sr = St(1)/A
PS=A*(1.-Sr*Sr)*TWS/(1.+Sr*TWS)
! PS=A*(1.-(X(2)/A)**2.)*tanHyp(WS)/(1.+X(2)/A*tanHyp(WS))
......
src/frun_GR6J.f
+ 5
− 3
View file @ 2f0dcd3a
......@@ -185,7 +185,7 @@
integer :: K
doubleprecision, parameter :: B=0.9, C=0.4
doubleprecision, parameter :: stored_val=25.62890625
doubleprecision :: TWS, Sr, Rr ! speed-up
doubleprecision :: expWS, TWS, Sr, Rr ! speed-up
!! dummies
! in
......@@ -212,7 +212,8 @@
IF(WS.GT.13) WS=13.
! speed-up
TWS = tanHyp(WS)
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))
......@@ -230,7 +231,8 @@
IF(WS.GT.13) WS=13.
! speed-up
TWS = tanHyp(WS)
expWS = exp(2.*WS)
TWS = (expWS - 1.)/(expWS + 1.)
Sr = St(1)/A
PS=A*(1.-Sr*Sr)*TWS/(1.+Sr*TWS)
! PS=A*(1.-(X(2)/A)**2.)*tanHyp(WS)/(1.+X(2)/A*tanHyp(WS))
......
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