En raison d'une défaillance matérielle, les jobs d'intégration continue peuvent échouer sans raison évidente sur les runners partagés. Les disques incriminés devraient être changés en fin de semaine. Merci de votre compréhension.

Commit e01ed232 authored by Delaigue Olivier's avatar Delaigue Olivier
Browse files

Merge branch 'dev' into 'master'

CRAN v1.6.9.27

See merge request !28
parents 15c056fb 88db83a4
Pipeline #19531 canceled with stages
in 5 seconds
Package: airGR
Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
Version: 1.6.9.23
Date: 2021-01-13
Version: 1.6.9.27
Date: 2021-01-18
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"),
......
......@@ -9,7 +9,7 @@ useDynLib(airGR, .registration = TRUE)
## S3 methods ##
#####################################
S3method('[', InputsModel)
S3method('[', OutputsModel)
#S3method('[', OutputsModel) ### to add in version 2.0
S3method(plot, OutputsModel)
S3method(SeriesAggreg, data.frame)
S3method(SeriesAggreg, list)
......@@ -37,6 +37,7 @@ export(ErrorCrit_RMSE)
export(Imax)
export(PE_Oudin)
export(PEdaily_Oudin)
export(plot.OutputsModel) ### to remove from version 2.0
export(RunModel)
export(RunModel_CemaNeige)
export(RunModel_CemaNeigeGR4H)
......
......@@ -2,7 +2,7 @@
### 1.6.9.23 Release Notes (2021-01-13)
### 1.6.9.27 Release Notes (2021-01-18)
#### New features
......@@ -12,7 +12,7 @@
- `PE_Oudin()` now presents a `RunFortran` argument to run the code in Fortran or in R. The Fortran mode is the fastest. ([#62](https://gitlab.irstea.fr/HYCAR-Hydro/airgr/-/issues/62))
- Added `RunModel_Lag()` which allows to perform a single run for the Lag model over the test period in order to run semi-distributed GR models. ([#34](https://gitlab.irstea.fr/HYCAR-Hydro/airgr/-/issues/34))
- Added the 'sd_model' vignette to explain how to manage the use of semi-distributed GR models. ([#34](https://gitlab.irstea.fr/HYCAR-Hydro/airgr/-/issues/34))
- Added `[` S3 method for `InputsModel` and `OutputsModel` class objects in order to extract subsets of them. ([#67](https://gitlab.irstea.fr/HYCAR-Hydro/airgr/-/issues/67))
- Added `[` S3 method for `InputsModel` class object in order to extract subsets of it. ([#67](https://gitlab.irstea.fr/HYCAR-Hydro/airgr/-/issues/67))
#### Deprecated and defunct
......
......@@ -129,7 +129,7 @@
}
## InputsModel
## OutputsModel
.ExtractOutputsModel <- function(x, i) {
res <- lapply(x, function(x) {
......@@ -154,16 +154,16 @@
res
}
'[.OutputsModel' <- function(x, i) {
if (!inherits(x, "OutputsModel")) {
stop("'x' must be of class 'OutputsModel'")
}
if (is.factor(i)) {
i <- as.character(i)
}
if (is.numeric(i)) {
.ExtractOutputsModel(x, i)
} else {
NextMethod()
}
}
# '[.OutputsModel' <- function(x, i) {
# if (!inherits(x, "OutputsModel")) {
# stop("'x' must be of class 'OutputsModel'")
# }
# if (is.factor(i)) {
# i <- as.character(i)
# }
# if (is.numeric(i)) {
# .ExtractOutputsModel(x, i)
# } else {
# NextMethod()
# }
# }
......@@ -5,37 +5,38 @@ note <- sprintf("R package version %s", version)
citHeader("To cite airGR in publications use these two references:")
bibentry(bibtype="Article",
title = "The Suite of Lumped {GR} Hydrological Models in an {R} package",
author = personList(as.person("L. Coron"), as.person("G. Thirel"), as.person("O. Delaigue"), as.person("C. Perrin"), as.person("V. Andréassian")),
journal = "Environmental Modelling and Software",
year = "2017",
pages = {"166-171"},
volume = {94},
doi = "10.1016/j.envsoft.2017.05.002",
textVersion =
bibentry(bibtype ="Article",
title = "The Suite of Lumped {GR} Hydrological Models in an {R} package",
author = personList(as.person("L. Coron"), as.person("G. Thirel"), as.person("O. Delaigue"), as.person("C. Perrin"), as.person("V. Andréassian")),
journal = "Environmental Modelling and Software",
year = "2017",
pages = {"166-171"},
volume = {94},
doi = "10.1016/j.envsoft.2017.05.002",
textVersion =
paste("Coron, L., Thirel, G., Delaigue, O., Perrin, C. and Andréassian, V.",
"(2017).",
"(2017).",
"The Suite of Lumped GR Hydrological Models in an R package.",
"Environmental Modelling and Software,",
"94, 166-171.",
"DOI: 10.1016/j.envsoft.2017.05.002.",
"94, 166-171,",
"doi: 10.1016/j.envsoft.2017.05.002.",
sep = " ")
)
bibentry(bibtype="Manual",
title = "{airGR}: Suite of {GR} Hydrological Models for Precipitation-Runoff Modelling",
author = personList(as.person("L. Coron"), as.person("O. Delaigue"), as.person("G. Thirel"), as.person("C. Perrin"), as.person("C. Michel")),
journal = "R News",
year = year,
note = note,
doi = "10.15454/EX11NA",
url = "https://CRAN.R-project.org/package=airGR",
textVersion =
paste0("Coron, L., Delaigue, O., Thirel, G., Perrin, C. and Michel, C. (",
bibentry(bibtype = "Manual",
title = "{airGR}: Suite of {GR} Hydrological Models for Precipitation-Runoff Modelling",
author = personList(as.person("L. Coron"), as.person("O. Delaigue"), as.person("G. Thirel"), as.person("D. Dorchies"), as.person("C. Perrin"), as.person("C. Michel")),
journal = "R News",
year = year,
note = note,
doi = "10.15454/EX11NA",
url = "https://CRAN.R-project.org/package=airGR",
textVersion =
paste0("Coron, L., Delaigue, O., Thirel, G., Dorchies, D., Perrin, C. and Michel, C. (",
year,
"). airGR: Suite of GR Hydrological Models for Precipitation-Runoff Modelling. ",
note,
". DOI: 10.15454/EX11NA. URL: https://CRAN.R-project.org/package=airGR."
note, ", ",
"doi: 10.15454/EX11NA", ", ",
"URL: https://CRAN.R-project.org/package=airGR."
)
)
......@@ -44,7 +44,7 @@ Riboust, P., Thirel, G., Le Moine, N. and Ribstein P. (2019).
\cr\cr
Vidal, J.-P., Martin, E., Franchistéguy, L., Baillon, M. and Soubeyroux, J. (2010).
A 50-year high-resolution atmospheric reanalysis over France with the Safran system.
International Journal of Climatology, 30, 1627–1644. \doi{10.1002/joc.2003}.
International Journal of Climatology, 30, 1627–1644, \doi{10.1002/joc.2003}.
}
......
......@@ -73,7 +73,7 @@ CalibOptions <- CreateCalibOptions(FUN_MOD = RunModel_GR4J, FUN_CALIB = Calibrat
## calibration
OutputsCalib <- Calibration(InputsModel = InputsModel, RunOptions = RunOptions,
InputsCrit = InputsCrit, CalibOptions = CalibOptions,
InputsCrit = InputsCrit, CalibOptions = CalibOptions,
FUN_MOD = RunModel_GR4J,
FUN_CALIB = Calibration_Michel)
......
......@@ -83,7 +83,7 @@ Ficchi, A. (2017).
\cr\cr
Ficchi, 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}.
Journal of Hydrology, 575, 1308-1327, \doi{10.1016/j.jhydrol.2019.05.084}.
}
......
......@@ -3,7 +3,7 @@
\name{RunModel}
\alias{RunModel}
\alias{[.OutputsModel}
%\alias{[.OutputsModel}
\title{Run with the provided hydrological model function}
......@@ -16,8 +16,8 @@ Function which performs a single model run with the provided function over the s
\usage{
RunModel(InputsModel, RunOptions, Param, FUN_MOD)
\method{[}{OutputsModel}(x, i)
%
%\method{[}{OutputsModel}(x, i)
}
......@@ -29,10 +29,10 @@ RunModel(InputsModel, RunOptions, Param, FUN_MOD)
\item{Param}{[numeric] vector of model parameters (See details for SD lag model)}
\item{FUN_MOD}{[function] hydrological model function (e.g. \code{\link{RunModel_GR4J}}, \code{\link{RunModel_CemaNeigeGR4J}})}
\item{x}{[InputsModel] object of class InputsModel}
\item{i}{[integer] of the indices to subset a time series or [character] names of the elements to extract}
%
%\item{x}{[InputsModel] object of class InputsModel}
%
%\item{i}{[integer] of the indices to subset a time series or [character] names of the elements to extract}
}
......
......@@ -174,7 +174,7 @@ Valéry, A., Andréassian, V. and Perrin, C. (2014).
\seealso{
\code{\link{RunModel_CemaNeige}}, \code{\link{RunModel_CemaNeigeGR5J}},
\code{\link{RunModel_CemaNeige}}, \code{\link{RunModel_CemaNeigeGR5J}},
\code{\link{RunModel_CemaNeigeGR6J}}, \code{\link{RunModel_GR4J}},
\code{\link{CreateInputsModel}}, \code{\link{CreateRunOptions}}, \code{\link{CreateIniStates}}.
}
......
......@@ -113,7 +113,7 @@ Mouelhi S. (2003).
Vers une chaîne cohérente de modèles pluie-débit conceptuels globaux aux pas de temps pluriannuel, annuel, mensuel et journalier.
PhD thesis (in French), ENGREF - Cemagref Antony, France.
\cr\cr
Mouelhi, S., Michel, C., Perrin, C. and Andréassian V. (2006).
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}.
}
......
......@@ -7,27 +7,28 @@
!------------------------------------------------------------------------------
! 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, 517(0), 1166-1175, 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, 517(0), 1176-1187,
! doi: 10.1016/j.jhydrol.2014.04.058.!
!------------------------------------------------------------------------------
! Quick description of public procedures:
! 1. frun_cemaneige
......@@ -53,7 +54,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 +90,7 @@
IF (IsHyst .EQ. 1) IsHystBool = .TRUE.
IF (IsHyst .EQ. 0) IsHystBool = .FALSE.
!--------------------------------------------------------------
! Initializations
......@@ -142,7 +143,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 +157,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 +179,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
......
......@@ -6,17 +6,17 @@
! 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
!------------------------------------------------------------------------------
! REFERENCES
! Mouelhi S. (2003). Vers une chaîne cohérente de modèles pluie-débit
! conceptuels globaux aux pas de temps pluriannuel, annuel, mensuel et
! journalier. PhD thesis (in French), ENGREF, Cemagref Antony, France.
! Mouelhi S. (2003). Vers une chaîne cohérente de modèles pluie-débit
! conceptuels globaux aux pas de temps pluriannuel, annuel, mensuel et
! journalier. PhD thesis (in French), ENGREF - Cemagref Antony, France.
!------------------------------------------------------------------------------
! Quick description of public procedures:
! 1. frun_gr1a
......@@ -27,7 +27,7 @@
SUBROUTINE frun_gr1a(LInputs,InputsPrecip,InputsPE,NParam,Param, &
NStates,StateStart,NOutputs,IndOutputs, &
Outputs,StateEnd)
! Subroutine that initializes GR1A, get its parameters, performs the call
! Subroutine that initializes GR1A, get its parameters, performs the call
! to the MOD_GR1A 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 (none here)
! 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 (none here)
......@@ -60,7 +60,7 @@
! out
doubleprecision, dimension(NStates), intent(out) :: StateEnd
doubleprecision, dimension(LInputs,NOutputs), intent(out) :: Outputs
!! locals
integer :: I,K
integer, parameter :: NMISC=3
......@@ -70,7 +70,7 @@
!--------------------------------------------------------------
! Initializations
!--------------------------------------------------------------
! parameter values
! Param(1) : PE adjustment factor [-]
......@@ -131,7 +131,7 @@
integer, parameter :: NMISC=3
integer, parameter :: NParam=1
doubleprecision :: tt ! speed-up
!! dummies
! in
doubleprecision, dimension(NParam), intent(in) :: Param
......@@ -139,7 +139,7 @@
! out
doubleprecision, dimension(NMISC), intent(out) :: MISC
doubleprecision, intent(out) :: Q
! Runoff
! speed-up
......
......@@ -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
......@@ -16,11 +16,11 @@
! REFERENCES
! Mouelhi S. (2003). Vers une chaîne cohérente de modèles pluie-débit
! conceptuels globaux aux pas de temps pluriannuel, annuel, mensuel et
! journalier. PhD thesis (in French), ENGREF, Cemagref Antony, France.
! 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
......
......@@ -6,17 +6,22 @@
! 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.
! Mathevet, T. (2005). Quels modèles pluie-débit globaux pour le pas de temps
! horaire ? Développement empirique et comparaison de modèles sur un large
! échantillon de bassins versants. PhD thesis (in French), ENGREF - Cemagref
! Antony, 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 (in French), UPMC - Cemagref Antony, Paris, France.
!------------------------------------------------------------------------------
! Quick description of public procedures:
! 1. frun_gr4h
......@@ -27,7 +32,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 +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])
......@@ -60,7 +65,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 +103,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 +198,7 @@
! out
doubleprecision, intent(out) :: Q
doubleprecision, dimension(NMISC), intent(out) :: MISC
A=Param(1)
......@@ -203,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
PR=0.
......@@ -222,7 +227,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 +235,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
......
......@@ -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
! 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_gr4j
......@@ -27,7 +27,7 @@
SUBROUTINE frun_gr4j(LInputs,InputsPrecip,InputsPE,NParam,Param, &
NStates,StateStart,NOutputs,IndOutputs, &
Outputs,StateEnd)
! Subroutine that initializes GR4J, get its parameters, performs the call
! Subroutine that initializes GR4J, get its parameters, performs the call
! to the MOD_GR4J 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=20,NMISC=30
......@@ -98,7 +98,7 @@
! computation of UH ordinates
OrdUH1 = 0.
OrdUH2 = 0.
D=2.5
CALL UH1(OrdUH1,Param(4),D)
CALL UH2(OrdUH2,Param(4),D)
......@@ -209,7 +209,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.
......
......@@ -6,26 +6,21 @@
! 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.
! Ficchi, A. (2017). An adaptive hydrological model for multiple time-steps:
! Diagnostics and improvements based on fluxes consistency. PhD thesis,
! UPMC - Irstea Antony, 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.
! Ficchi, 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.
!------------------------------------------------------------------------------
! Quick description of public procedures:
! 1. frun_gr5h
......