From dccbc4eb031cfb593777c1af9f5372540318aab3 Mon Sep 17 00:00:00 2001
From: Delaigue Olivier <olivier.delaigue@irstea.fr>
Date: Wed, 20 Jan 2021 17:05:10 +0100
Subject: [PATCH] chore(Fortran): format author names and references
---
src/frun_CEMANEIGE.f90 | 38 +++++++++++++++++++-------------------
src/frun_GR1A.f90 | 6 +++---
src/frun_GR2M.f90 | 10 +++++-----
src/frun_GR4H.f90 | 32 ++++++++++++++++----------------
src/frun_GR4J.f90 | 10 +++++-----
src/frun_GR5H.f90 | 38 +++++++++++++++++++-------------------
src/frun_GR5J.f90 | 30 +++++++++++++++---------------
src/frun_GR6J.f90 | 42 +++++++++++++++++++++---------------------
src/frun_PE.f90 | 18 +++++++++---------
src/utils_D.f90 | 4 ++--
src/utils_H.f90 | 4 ++--
11 files changed, 116 insertions(+), 116 deletions(-)
diff --git a/src/frun_CEMANEIGE.f90 b/src/frun_CEMANEIGE.f90
index 494bba7f..31d4fa46 100644
--- a/src/frun_CEMANEIGE.f90
+++ b/src/frun_CEMANEIGE.f90
@@ -7,27 +7,27 @@
!------------------------------------------------------------------------------
! AUTHORS
! Original code: A. Valéry, P. Riboust
-! Cleaning and formatting for airGR: L. Coron
-! Further cleaning: G. Thirel
+! Cleaning and formatting for airGR: Coron, L.
+! Further cleaning: Thirel, G.
!------------------------------------------------------------------------------
! Creation date: 2011
! Last modified: 22/11/2019
!------------------------------------------------------------------------------
! REFERENCES
-! Riboust, P., G. Thirel, N. Le Moine and P. Ribstein (2019), Revisiting a
-! simple degree-day model for integrating satellite data: implementation of
-! SWE-SCA hystereses. Journal of Hydrology and Hydromechanics,
-! doi:10.2478/johh-2018-0004, 67, 1, 70–81.
+! Riboust, P., Thirel, G., Le Moine, N. and Ribstein, P. (2019). Revisiting a
+! simple degree-day model for integrating satellite data: implementation of
+! SWE-SCA hystereses. Journal of Hydrology and Hydromechanics,
+! 67, 1, 70–81, doi: 10.2478/johh-2018-0004.
!
-! Valéry, A., V. Andréassian and C. Perrin (2014), "As simple as possible but
-! not simpler": what is useful in a temperature-based snow-accounting routine?
-! Part 1 - Comparison of six snow accounting routines on 380 catchments,
-! Journal of Hydrology, doi:10.1016/j.jhydrol.2014.04.059.
+! Valéry, A., Andréassian, V. and Perrin, C. (2014). "As simple as possible but
+! not simpler": what is useful in a temperature-based snow-accounting routine?
+! Part 1 - Comparison of six snow accounting routines on 380 catchments,
+! Journal of Hydrology, doi: 10.1016/j.jhydrol.2014.04.059.
!
-! Valéry, A., V. Andréassian and C. Perrin (2014), "As simple as possible but
-! not simpler": What is useful in a temperature-based snow-accounting routine?
-! Part 2 - Sensitivity analysis of the Cemaneige snow accounting routine on
-! 380 catchments, Journal of Hydrology, doi:10.1016/j.jhydrol.2014.04.058.
+! Valéry, A., Andréassian, V. and Perrin, C. (2014). "As simple as possible but
+! not simpler": What is useful in a temperature-based snow-accounting routine?
+! Part 2 - Sensitivity analysis of the Cemaneige snow accounting routine on
+! 380 catchments, Journal of Hydrology, doi: 10.1016/j.jhydrol.2014.04.058.
!------------------------------------------------------------------------------
! Quick description of public procedures:
! 1. frun_cemaneige
@@ -53,7 +53,7 @@
! IsHyst ! integer, whether we should use the linear hysteresis [1] or not [0]
! NOutputs ! Integer, number of output series
! IndOutputs ! Vector of integer, indices of output series
-! Outputs
+! Outputs
! Outputs ! Vector of real, output series
! StateEnd ! Vector of real, state variables at the end of the model run (store levels [mm] and [-] and thresholds [mm])
@@ -89,7 +89,7 @@
IF (IsHyst .EQ. 1) IsHystBool = .TRUE.
IF (IsHyst .EQ. 0) IsHystBool = .FALSE.
-
+
!--------------------------------------------------------------
! Initializations
@@ -142,7 +142,7 @@
! Snow pack volume before melt
Ginit=G
G=G+Psol
-
+
! Snow pack thermal state before melt
eTG=CTG*eTG + (1.-CTG)*InputsTemp(k)
@@ -156,7 +156,7 @@
PotMelt=0.
ENDIF
-
+
IF (IsHystBool) THEN
IF (Potmelt.GT.0.) THEN
IF (G.LT.Glocalmax.AND.Gratio.EQ.1.) Glocalmax=G ! Update in case of potential melt and G lower than Gseuil
@@ -178,7 +178,7 @@
IF (IsHystBool) THEN
dG=G-Ginit ! Melt in case of negative dG, accumulation otherwise
-
+
IF (dG.GT.0.) THEN
Gratio = MIN(Gratio+(Psol-Melt)/Gacc,1.d0) !Psol - Melt = dG
IF (Gratio.EQ.1.) Glocalmax = Gthreshold
diff --git a/src/frun_GR1A.f90 b/src/frun_GR1A.f90
index 45229d02..7178ddfb 100644
--- a/src/frun_GR1A.f90
+++ b/src/frun_GR1A.f90
@@ -6,9 +6,9 @@
! FILE : frun_GR1A.f
!------------------------------------------------------------------------------
! AUTHORS
-! Original code: S. Mouelhi
-! Cleaning and formatting for airGR: L. Coron
-! Further cleaning: G. Thirel
+! Original code: Mouelhi, S.
+! Cleaning and formatting for airGR: Coron, L.
+! Further cleaning: Thirel, G.
!------------------------------------------------------------------------------
! Creation date: 2003
! Last modified: 25/11/2019
diff --git a/src/frun_GR2M.f90 b/src/frun_GR2M.f90
index b05d1139..86597910 100644
--- a/src/frun_GR2M.f90
+++ b/src/frun_GR2M.f90
@@ -6,9 +6,9 @@
! FILE : frun_GR2M.f
!------------------------------------------------------------------------------
! AUTHORS
-! Original code: S. Mouelhi
-! Cleaning and formatting for airGR: L. Coron
-! Further cleaning: G. Thirel
+! Original code: Mouelhi, S.
+! Cleaning and formatting for airGR: Coron, L.
+! Further cleaning: Thirel, G.
!------------------------------------------------------------------------------
! Creation date: 2003
! Last modified: 16/04/2020
@@ -18,9 +18,9 @@
! conceptuels globaux aux pas de temps pluriannuel, annuel, mensuel et
! journalier. PhD thesis (in French), ENGREF, Cemagref Antony, France.
!
-! Mouelhi, S., C. Michel, C. Perrin and V. Andréassian (2006). Stepwise
+! Mouelhi, S., Michel, C., Perrin, C. and Andréassian, V. (2006). Stepwise
! development of a two-parameter monthly water balance model. Journal of
-! Hydrology, 318(1-4), 200-214. doi:10.1016/j.jhydrol.2005.06.014.
+! Hydrology, 318(1-4), 200-214, doi: 10.1016/j.jhydrol.2005.06.014.
!------------------------------------------------------------------------------
! Quick description of public procedures:
! 1. frun_gr2m
diff --git a/src/frun_GR4H.f90 b/src/frun_GR4H.f90
index bde6a998..0b883c3b 100644
--- a/src/frun_GR4H.f90
+++ b/src/frun_GR4H.f90
@@ -6,17 +6,17 @@
! FILE : frun_GR4H.f
!------------------------------------------------------------------------------
! AUTHORS
-! Original code: C. Perrin
-! Cleaning and formatting for airGR: L. Coron
-! Further cleaning: G. Thirel
+! Original code: Perrin, C.
+! Cleaning and formatting for airGR: Coron, L.
+! Further cleaning: Thirel, G.
!------------------------------------------------------------------------------
! Creation date: 2003
! Last modified: 25/11/2019
!------------------------------------------------------------------------------
! REFERENCES
-! Perrin, C., C. Michel and V. Andréassian (2003). Improvement of a
-! parsimonious model for streamflow simulation. Journal of Hydrology,
-! 279(1-4), 275-289, doi:10.1016/S0022-1694(03)00225-7.
+! Perrin, C., Michel, C. and Andréassian, V. (2003). Improvement of a
+! parsimonious model for streamflow simulation. Journal of Hydrology,
+! 279(1-4), 275-289, doi: 10.1016/S0022-1694(03)00225-7.
!------------------------------------------------------------------------------
! Quick description of public procedures:
! 1. frun_gr4h
@@ -27,7 +27,7 @@
SUBROUTINE frun_gr4h(LInputs,InputsPrecip,InputsPE,NParam,Param, &
NStates,StateStart,NOutputs,IndOutputs, &
Outputs,StateEnd)
-! Subroutine that initializes GR4H, get its parameters, performs the call
+! Subroutine that initializes GR4H, get its parameters, performs the call
! to the MOD_GR4H subroutine at each time step, and stores the final states
! Inputs
! LInputs ! Integer, length of input and output series
@@ -39,7 +39,7 @@
! StateStart ! Vector of real, state variables used when the model run starts (store levels [mm] and Unit Hydrograph (UH) storages [mm])
! NOutputs ! Integer, number of output series
! IndOutputs ! Vector of integer, indices of output series
-! Outputs
+! Outputs
! Outputs ! Vector of real, output series
! StateEnd ! Vector of real, state variables at the end of the model run (store levels [mm] and Unit Hydrograph (UH) storages [mm])
@@ -60,7 +60,7 @@
! out
doubleprecision, dimension(NStates), intent(out) :: StateEnd
doubleprecision, dimension(LInputs,NOutputs), intent(out) :: Outputs
-
+
!! locals
integer :: I,K
integer, parameter :: NH=480,NMISC=30
@@ -98,7 +98,7 @@
!computation of UH ordinates
OrdUH1 = 0.
OrdUH2 = 0.
-
+
D=1.25
CALL UH1_H(OrdUH1,Param(4),D)
CALL UH2_H(OrdUH2,Param(4),D)
@@ -193,7 +193,7 @@
! out
doubleprecision, intent(out) :: Q
doubleprecision, dimension(NMISC), intent(out) :: MISC
-
+
A=Param(1)
@@ -203,15 +203,15 @@
PN=0.
WS=EN/A
IF(WS.GT.13.) WS=13.
-
+
! speed-up
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))
- ! end speed-up
-
+ ! end speed-up
+
AE=ER+P1
St(1)=St(1)-ER
PR=0.
@@ -222,7 +222,7 @@
PN=P1-E
WS=PN/A
IF(WS.GT.13.)WS=13.
-
+
! speed-up
expWS = exp(2.*WS)
TWS = (expWS - 1.)/(expWS + 1.)
@@ -230,7 +230,7 @@
PS=A*(1.-Sr*Sr)*TWS/(1.+Sr*TWS)
! PS=A*(1.-(X(2)/A)**2.)*tanHyp(WS)/(1.+X(2)/A*tanHyp(WS))
! end speed-up
-
+
PR=PN-PS
St(1)=St(1)+PS
ENDIF
diff --git a/src/frun_GR4J.f90 b/src/frun_GR4J.f90
index 55667a4a..3dcfe98b 100644
--- a/src/frun_GR4J.f90
+++ b/src/frun_GR4J.f90
@@ -6,17 +6,17 @@
! FILE : frun_GR4J.f
!------------------------------------------------------------------------------
! AUTHORS
-! Original code: C. Perrin
-! Cleaning and formatting for airGR: L. Coron
-! Further cleaning: G. Thirel
+! Original code: Perrin, C.
+! Cleaning and formatting for airGR: Coron, L.
+! Further cleaning: Thirel, G.
!------------------------------------------------------------------------------
! Creation date: 2000
! Last modified: 25/11/2019
!------------------------------------------------------------------------------
! REFERENCES
-! Perrin, C., C. Michel and V. Andréassian (2003). Improvement of a
+! Perrin, C., Michel, C. and Andréassian, V. (2003). Improvement of a
! parsimonious model for streamflow simulation. Journal of Hydrology,
-! 279(1-4), 275-289. doi:10.1016/S0022-1694(03)00225-7.
+! 279(1-4), 275-289, doi: 10.1016/S0022-1694(03)00225-7.
!------------------------------------------------------------------------------
! Quick description of public procedures:
! 1. frun_gr4j
diff --git a/src/frun_GR5H.f90 b/src/frun_GR5H.f90
index c2ccfe71..ee267c98 100644
--- a/src/frun_GR5H.f90
+++ b/src/frun_GR5H.f90
@@ -6,26 +6,26 @@
! FILE : frun_GR5H.f
!------------------------------------------------------------------------------
! AUTHORS
-! Original code: N. Le Moine, A. Ficchì
-! Cleaning and formatting for airGR: L. Coron
-! Further cleaning: G. Thirel
+! Original code: Le Moine, N., Ficchì, A.
+! Cleaning and formatting for airGR: Coron, L.
+! Further cleaning: Thirel, G.
!------------------------------------------------------------------------------
! Creation date: 2006
! Last modified: 26/11/2019
!------------------------------------------------------------------------------
! REFERENCES
-! Ficchì, A., Perrin, C., and Andréassian, V. (2019). Hydrological modelling at
-! multiple sub-daily time steps: model improvement via flux-matching, Journal
-! of Hydrology, 575, 1308-1327, https://doi.org/10.1016/j.jhydrol.2019.05.084.
+! Ficchì, A., Perrin, C. and Andréassian, V. (2019). Hydrological modelling at
+! multiple sub-daily time steps: model improvement via flux-matching, Journal
+! of Hydrology, 575, 1308-1327, doi: 10.1016/j.jhydrol.2019.05.084.
!
-! Le Moine, N. (2008). Le bassin versant de surface vu par le souterrain : une
-! voie d'amélioration des performances et du réalisme des modèles
-! pluie-débit ? PhD thesis (French), UPMC, Paris, France.
+! Le Moine, N. (2008). Le bassin versant de surface vu par le souterrain : une
+! voie d'amélioration des performances et du réalisme des modèles
+! pluie-débit ? PhD thesis (French), UPMC, Paris, France.
!
-! Pushpalatha, R., C. Perrin, N. Le Moine, T. Mathevet, and V. Andréassian
-! (2011). A downward structural sensitivity analysis of hydrological models to
-! improve low-flow simulation. Journal of Hydrology, 411(1-2), 66-76.
-! doi:10.1016/j.jhydrol.2011.09.034.
+! Pushpalatha, R., Perrin, C., Le Moine, N., Mathevet, T. and Andréassian, V.
+! (2011). A downward structural sensitivity analysis of hydrological models to
+! improve low-flow simulation. Journal of Hydrology, 411(1-2), 66-76,
+! doi: 10.1016/j.jhydrol.2011.09.034.
!------------------------------------------------------------------------------
! Quick description of public procedures:
! 1. frun_gr5h
@@ -36,7 +36,7 @@
SUBROUTINE frun_gr5h(LInputs,InputsPrecip,InputsPE,NParam,Param, &
NStates,StateStart,Imax,NOutputs,IndOutputs, &
Outputs,StateEnd)
-! Subroutine that initializes GR5H, get its parameters, performs the call
+! Subroutine that initializes GR5H, get its parameters, performs the call
! to the MOD_GR5H subroutine at each time step, and stores the final states
! Inputs
! LInputs ! Integer, length of input and output series
@@ -49,7 +49,7 @@
! Imax ! Real, fixed capacity of the interception store [mm] (used only if IsIntStore >= 0)
! NOutputs ! Integer, number of output series
! IndOutputs ! Vector of integer, indices of output series
-! Outputs
+! Outputs
! Outputs ! Vector of real, output series
! StateEnd ! Vector of real, state variables at the end of the model run (store levels [mm] and Unit Hydrograph (UH) storages [mm])
@@ -71,7 +71,7 @@
! out
doubleprecision, dimension(NStates), intent(out) :: StateEnd
doubleprecision, dimension(LInputs,NOutputs), intent(out) :: Outputs
-
+
!! locals
logical :: IsIntStore ! TRUE if interception store is used, FALSE otherwise
integer :: I,K
@@ -208,7 +208,7 @@
IF (IsIntStore .EQV. .TRUE.) THEN
! MODIFIED - A. Ficchi
- ! Calculation of interception fluxes [EI] and throughfall [PTH]
+ ! Calculation of interception fluxes [EI] and throughfall [PTH]
! & update of the Interception store state, St(3)
! Interception store calculation, with evaporation prior to throughfall
@@ -260,7 +260,7 @@
Sr = St(1)/A
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
+ ! end speed-up
AE=ES+P1
EI = P1
St(1)=St(1)-ES
@@ -281,7 +281,7 @@
PS=A*(1.-Sr*Sr)*TWS/(1.+Sr*TWS)
! PS=A*(1.-(X(2)/A)**2.)*tanHyp(WS)/(1.+X(2)/A*tanHyp(WS))
! end speed-up
-
+
PR=PN-PS
St(1)=St(1)+PS
ENDIF
diff --git a/src/frun_GR5J.f90 b/src/frun_GR5J.f90
index b4531248..3c47e4f3 100644
--- a/src/frun_GR5J.f90
+++ b/src/frun_GR5J.f90
@@ -6,22 +6,22 @@
! FILE : frun_GR5J.f
!------------------------------------------------------------------------------
! AUTHORS
-! Original code: N. Le Moine
-! Cleaning and formatting for airGR: L. Coron
-! Further cleaning: G. Thirel
+! Original code: Le Moine, N.
+! Cleaning and formatting for airGR: Coron, L.
+! Further cleaning: Thirel, G.
!------------------------------------------------------------------------------
! Creation date: 2006
! Last modified: 25/11/2019
!------------------------------------------------------------------------------
! REFERENCES
-! Le Moine, N. (2008). Le bassin versant de surface vu par le souterrain : une
-! voie d'amélioration des performances et du réalisme des modèles
-! pluie-débit ? PhD thesis (French), UPMC, Paris, France.
+! Le Moine, N. (2008). Le bassin versant de surface vu par le souterrain : une
+! voie d'amélioration des performances et du réalisme des modèles
+! pluie-débit ? PhD thesis (French), UPMC, Paris, France.
!
-! Pushpalatha, R., C. Perrin, N. Le Moine, T. Mathevet, and V. Andréassian
-! (2011). A downward structural sensitivity analysis of hydrological models to
-! improve low-flow simulation. Journal of Hydrology, 411(1-2), 66-76.
-! doi:10.1016/j.jhydrol.2011.09.034.
+! Pushpalatha, R., Perrin, C., Le Moine, N., Mathevet, T. and Andréassian, V.
+! (2011). A downward structural sensitivity analysis of hydrological models to
+! improve low-flow simulation. Journal of Hydrology, 411(1-2), 66-76,
+! doi: 10.1016/j.jhydrol.2011.09.034.
!------------------------------------------------------------------------------
! Quick description of public procedures:
! 1. frun_gr5j
@@ -32,7 +32,7 @@
SUBROUTINE frun_gr5j(LInputs,InputsPrecip,InputsPE,NParam,Param, &
NStates,StateStart,NOutputs,IndOutputs, &
Outputs,StateEnd)
-! Subroutine that initializes GR5J, get its parameters, performs the call
+! Subroutine that initializes GR5J, get its parameters, performs the call
! to the MOD_GR5J subroutine at each time step, and stores the final states
! Inputs
! LInputs ! Integer, length of input and output series
@@ -44,7 +44,7 @@
! StateStart ! Vector of real, state variables used when the model run starts (store levels [mm] and Unit Hydrograph (UH) storages [mm])
! NOutputs ! Integer, number of output series
! IndOutputs ! Vector of integer, indices of output series
-! Outputs
+! Outputs
! Outputs ! Vector of real, output series
! StateEnd ! Vector of real, state variables at the end of the model run (store levels [mm] and Unit Hydrograph (UH) storages [mm])
@@ -65,7 +65,7 @@
! out
doubleprecision, dimension(NStates), intent(out) :: StateEnd
doubleprecision, dimension(LInputs,NOutputs), intent(out) :: Outputs
-
+
!! locals
integer :: I,K
integer, parameter :: NH=20,NMISC=30
@@ -201,7 +201,7 @@
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))
- ! end speed-up
+ ! end speed-up
AE=ER+P1
St(1)=St(1)-ER
PS=0.
@@ -219,7 +219,7 @@
PS=A*(1.-Sr*Sr)*TWS/(1.+Sr*TWS)
! PS=A*(1.-(X(2)/A)**2.)*tanHyp(WS)/(1.+X(2)/A*tanHyp(WS))
! end speed-up
-
+
PR=PN-PS
St(1)=St(1)+PS
ENDIF
diff --git a/src/frun_GR6J.f90 b/src/frun_GR6J.f90
index 0fa32577..2f6cf48c 100644
--- a/src/frun_GR6J.f90
+++ b/src/frun_GR6J.f90
@@ -6,18 +6,18 @@
! FILE : frun_GR6J.f
!------------------------------------------------------------------------------
! AUTHORS
-! Original code: R. Pushpalatha
-! Cleaning and formatting for airGR: L. Coron
-! Further cleaning: G. Thirel
+! Original code: Pushpalatha, R.
+! Cleaning and formatting for airGR: Coron, L.
+! Further cleaning: Thirel, G.
!------------------------------------------------------------------------------
! Creation date: 2010
! Last modified: 25/11/2019
!------------------------------------------------------------------------------
! REFERENCES
-! Pushpalatha, R., C. Perrin, N. Le Moine, T. Mathevet and V. Andréassian!
-! (2011). A downward structural sensitivity analysis of hydrological models to
-! improve low-flow simulation. Journal of Hydrology, 411(1-2), 66-76.
-! doi:10.1016/j.jhydrol.2011.09.034.
+! Pushpalatha, R., Perrin, C., Le Moine, N., Mathevet, T. and Andréassian, V.
+! (2011). A downward structural sensitivity analysis of hydrological models to
+! improve low-flow simulation. Journal of Hydrology, 411(1-2), 66-76.
+! doi: 10.1016/j.jhydrol.2011.09.034.
!------------------------------------------------------------------------------
! Quick description of public procedures:
! 1. frun_gr6j
@@ -28,7 +28,7 @@
SUBROUTINE frun_gr6j(LInputs,InputsPrecip,InputsPE,NParam,Param, &
NStates,StateStart,NOutputs,IndOutputs, &
Outputs,StateEnd)
-! Subroutine that initializes GR6J, get its parameters, performs the call
+! Subroutine that initializes GR6J, get its parameters, performs the call
! to the MOD_GR6J subroutine at each time step, and stores the final states
! Inputs
! LInputs ! Integer, length of input and output series
@@ -40,7 +40,7 @@
! StateStart ! Vector of real, state variables used when the model run starts (store levels [mm] and Unit Hydrograph (UH) storages [mm])
! NOutputs ! Integer, number of output series
! IndOutputs ! Vector of integer, indices of output series
-! Outputs
+! Outputs
! Outputs ! Vector of real, output series
! StateEnd ! Vector of real, state variables at the end of the model run (store levels [mm] and Unit Hydrograph (UH) storages [mm])
@@ -61,7 +61,7 @@
! out
doubleprecision, dimension(NStates), intent(out) :: StateEnd
doubleprecision, dimension(LInputs,NOutputs), intent(out) :: Outputs
-
+
!! locals
integer :: I,K
integer, parameter :: NH=20,NMISC=30
@@ -102,11 +102,11 @@
! computation of HU ordinates
OrdUH1 = 0.
OrdUH2 = 0.
-
+
D=2.5
CALL UH1(OrdUH1,Param(4),D)
CALL UH2(OrdUH2,Param(4),D)
-
+
! initialization of model outputs
Q = -999.999
MISC = -999.999
@@ -208,15 +208,15 @@
PN=0.
WS=EN/A
IF(WS.GT.13) WS=13.
-
+
! speed-up
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))
- ! end speed-up
-
+ ! end speed-up
+
AE=ER+P1
St(1)=St(1)-ER
PS=0.
@@ -227,15 +227,15 @@
PN=P1-E
WS=PN/A
IF(WS.GT.13) WS=13.
-
+
! speed-up
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))
- ! end speed-up
-
+ ! end speed-up
+
PR=PN-PS
St(1)=St(1)+PS
ENDIF
@@ -249,7 +249,7 @@
Sr = Sr * Sr
PERC=St(1)*(1.-1./SQRT(SQRT(1.+Sr/stored_val)))
! PERC=X(2)*(1.-(1.+(X(2)/(9./4.*Param(1)))**4.)**(-0.25))
- ! end speed-up
+ ! end speed-up
St(1)=St(1)-PERC
@@ -279,7 +279,7 @@
IF((St(2)+(1-C)*StUH1(1)+EXCH).LT.0) AEXCH1=-St(2)-(1-C)*StUH1(1)
St(2)=St(2)+(1-C)*StUH1(1)+EXCH
IF(St(2).LT.0.) St(2)=0.
-
+
! speed-up
Rr = St(2)/Param(3)
Rr = Rr * Rr
@@ -287,7 +287,7 @@
QR=St(2)*(1.-1./SQRT(SQRT(1.+Rr)))
! QR=X(1)*(1.-(1.+(X(1)/Param(3))**4.)**(-1./4.))
! end speed-up
-
+
St(2)=St(2)-QR
! Update of exponential store
diff --git a/src/frun_PE.f90 b/src/frun_PE.f90
index be4e84a5..5c70b8fb 100644
--- a/src/frun_PE.f90
+++ b/src/frun_PE.f90
@@ -6,16 +6,16 @@
! FILE : frun_PE.f90
!------------------------------------------------------------------------------
! AUTHORS
-! Original code: L. Oudin
-! Cleaning and formatting for airGR: Fr. Bourgin
-! Further cleaning: O. Delaigue, G. Thirel
+! Original code: Oudin, L.
+! Cleaning and formatting for airGR: Bourgin, F.
+! Further cleaning: Delaigue, O., Thirel, G.
!------------------------------------------------------------------------------
! Creation date: 2004
! Last modified: 20/10/2020
!------------------------------------------------------------------------------
! REFERENCES
! Oudin, L., Hervieu, F., Michel, C., Perrin, C., Andréassian, V.,
-! Anctil, F. and Loumagne, C., 2005. Which potential evapotranspiration
+! Anctil, F. and Loumagne, C. (2005). Which potential evapotranspiration
! input for a rainfall-runoff model? Part 2 - Towards a simple and
! efficient PE model for rainfall-runoff modelling. Journal of Hydrology
! 303(1-4), 290-306.
@@ -29,7 +29,7 @@
!*******************************************************************************
SUBROUTINE frun_pe_oudin(LInputs,InputsLAT,InputsTemp,InputsJJ,OutputsPE)
!*******************************************************************************
-! Subroutine that performs the call to the PE_OUDIN subroutine at each time step,
+! Subroutine that performs the call to the PE_OUDIN subroutine at each time step,
! and stores the final values
! Inputs
! LInputs ! Integer, length of input and output series
@@ -51,21 +51,21 @@
doubleprecision, dimension(LInputs), intent(in) :: InputsLAT
doubleprecision, dimension(LInputs), intent(in) :: InputsTemp
doubleprecision, dimension(LInputs), intent(in) :: InputsJJ
-
+
! out
doubleprecision, dimension(LInputs), intent(out) :: OutputsPE
-
+
!! locals
integer :: k
doubleprecision :: FI, tt, jj, PEoud
-
+
!--------------------------------------------------------------
! Time loop
!--------------------------------------------------------------
DO k = 1, LInputs
tt = InputsTemp(k)
jj = InputsJJ(k)
- FI = InputsLAT(k)!
+ FI = InputsLAT(k)!
!model run on one time step
CALL PE_OUDIN(FI, tt, jj, PEoud)
!storage of outputs
diff --git a/src/utils_D.f90 b/src/utils_D.f90
index d12b96d3..5a640358 100644
--- a/src/utils_D.f90
+++ b/src/utils_D.f90
@@ -8,8 +8,8 @@
!------------------------------------------------------------------------------
! AUTHORS
! Original code: Unknown soldier
-! Cleaning and formatting for airGR: L. Coron
-! Further cleaning: G. Thirel
+! Cleaning and formatting for airGR: Coron, L.
+! Further cleaning: Thirel, G.
!------------------------------------------------------------------------------
! Creation date: 2000
! Last modified: 21/11/2019
diff --git a/src/utils_H.f90 b/src/utils_H.f90
index 6d902139..73c278d6 100644
--- a/src/utils_H.f90
+++ b/src/utils_H.f90
@@ -7,8 +7,8 @@
!------------------------------------------------------------------------------
! AUTHORS
! Original code: Unknown soldier
-! Cleaning and formatting for airGR: L. Coron
-! Further cleaning: G. Thirel
+! Cleaning and formatting for airGR: Coron, L.
+! Further cleaning: Thirel, G.
!------------------------------------------------------------------------------
! Creation date: 2000
! Last modified: 22/11/2019
--
GitLab