Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
HYCAR-Hydro
airGR
Commits
af01972a
Commit
af01972a
authored
Jun 12, 2017
by
unknown
Browse files
v1.0.7.0 GR4J, GR5J and GR6J (+CemaNeige) now return Ps, Pn and true exchanges #4703
parent
61bcbcb5
Changes
16
Hide whitespace changes
Inline
Side-by-side
R/CreateRunOptions.R
View file @
af01972a
...
...
@@ -132,11 +132,14 @@ CreateRunOptions <- function(FUN_MOD,InputsModel,IndPeriod_WarmUp=NULL,IndPeriod
if
(
identical
(
FUN_MOD
,
RunModel_GR4H
)){
Outputs_all
<-
c
(
Outputs_all
,
"PotEvap"
,
"Precip"
,
"Prod"
,
"AE"
,
"Perc"
,
"PR"
,
"Q9"
,
"Q1"
,
"Rout"
,
"Exch"
,
"AExch"
,
"QR"
,
"QD"
,
"Qsim"
);
}
if
(
identical
(
FUN_MOD
,
RunModel_GR4J
)
|
identical
(
FUN_MOD
,
RunModel_CemaNeigeGR4J
)){
Outputs_all
<-
c
(
Outputs_all
,
"PotEvap"
,
"Precip"
,
"Prod"
,
"AE"
,
"Perc"
,
"PR"
,
"Q9"
,
"Q1"
,
"Rout"
,
"Exch"
,
"AExch"
,
"QR"
,
"QD"
,
"Qsim"
);
}
Outputs_all
<-
c
(
Outputs_all
,
"PotEvap"
,
"Precip"
,
"Prod"
,
"Pn"
,
"Ps"
,
"AE"
,
"Perc"
,
"PR"
,
"Q9"
,
"Q1"
,
"Rout"
,
"Exch"
,
"AExch1"
,
"AExch2"
,
"AExch"
,
"QR"
,
"QD"
,
"Qsim"
);
}
if
(
identical
(
FUN_MOD
,
RunModel_GR5J
)
|
identical
(
FUN_MOD
,
RunModel_CemaNeigeGR5J
)){
Outputs_all
<-
c
(
Outputs_all
,
"PotEvap"
,
"Precip"
,
"Prod"
,
"AE"
,
"Perc"
,
"PR"
,
"Q9"
,
"Q1"
,
"Rout"
,
"Exch"
,
"AExch"
,
"QR"
,
"QD"
,
"Qsim"
);
}
Outputs_all
<-
c
(
Outputs_all
,
"PotEvap"
,
"Precip"
,
"Prod"
,
"Pn"
,
"Ps"
,
"AE"
,
"Perc"
,
"PR"
,
"Q9"
,
"Q1"
,
"Rout"
,
"Exch"
,
"AExch1"
,
"AExch2"
,
"AExch"
,
"QR"
,
"QD"
,
"Qsim"
);
}
if
(
identical
(
FUN_MOD
,
RunModel_GR6J
)
|
identical
(
FUN_MOD
,
RunModel_CemaNeigeGR6J
)){
Outputs_all
<-
c
(
Outputs_all
,
"PotEvap"
,
"Precip"
,
"Prod"
,
"AE"
,
"Perc"
,
"PR"
,
"Q9"
,
"Q1"
,
"Rout"
,
"Exch"
,
"AExch"
,
"QR"
,
"QR1"
,
"Exp"
,
"QD"
,
"Qsim"
);
}
Outputs_all
<-
c
(
Outputs_all
,
"PotEvap"
,
"Precip"
,
"Prod"
,
"Pn"
,
"Ps"
,
"AE"
,
"Perc"
,
"PR"
,
"Q9"
,
"Q1"
,
"Rout"
,
"Exch"
,
"AExch1"
,
"AExch2"
,
"AExch"
,
"QR"
,
"QR1"
,
"Exp"
,
"QD"
,
"Qsim"
);
}
if
(
identical
(
FUN_MOD
,
RunModel_GR2M
)){
Outputs_all
<-
c
(
Outputs_all
,
"PotEvap"
,
"Precip"
,
"AE"
,
"Perc"
,
"P3"
,
"Exch"
,
"Prod"
,
"Rout"
,
"Qsim"
);
}
if
(
identical
(
FUN_MOD
,
RunModel_GR1A
)){
...
...
R/RunModel_CemaNeigeGR4J.R
View file @
af01972a
...
...
@@ -2,7 +2,8 @@ RunModel_CemaNeigeGR4J <- function(InputsModel,RunOptions,Param){
NParam
<-
6
;
FortranOutputsCemaNeige
<-
c
(
"Pliq"
,
"Psol"
,
"SnowPack"
,
"ThermalState"
,
"Gratio"
,
"PotMelt"
,
"Melt"
,
"PliqAndMelt"
,
"Temp"
);
FortranOutputsMod
<-
c
(
"PotEvap"
,
"Precip"
,
"Prod"
,
"AE"
,
"Perc"
,
"PR"
,
"Q9"
,
"Q1"
,
"Rout"
,
"Exch"
,
"AExch"
,
"QR"
,
"QD"
,
"Qsim"
);
FortranOutputsMod
<-
c
(
"PotEvap"
,
"Precip"
,
"Prod"
,
"Pn"
,
"Ps"
,
"AE"
,
"Perc"
,
"PR"
,
"Q9"
,
"Q1"
,
"Rout"
,
"Exch"
,
"AExch1"
,
"AExch2"
,
"AExch"
,
"QR"
,
"QD"
,
"Qsim"
);
##Arguments_check
if
(
inherits
(
InputsModel
,
"InputsModel"
)
==
FALSE
){
stop
(
"InputsModel must be of class 'InputsModel' \n"
);
return
(
NULL
);
}
...
...
R/RunModel_CemaNeigeGR5J.R
View file @
af01972a
...
...
@@ -2,7 +2,8 @@ RunModel_CemaNeigeGR5J <- function(InputsModel,RunOptions,Param){
NParam
<-
7
;
FortranOutputsCemaNeige
<-
c
(
"Pliq"
,
"Psol"
,
"SnowPack"
,
"ThermalState"
,
"Gratio"
,
"PotMelt"
,
"Melt"
,
"PliqAndMelt"
,
"Temp"
);
FortranOutputsMod
<-
c
(
"PotEvap"
,
"Precip"
,
"Prod"
,
"AE"
,
"Perc"
,
"PR"
,
"Q9"
,
"Q1"
,
"Rout"
,
"Exch"
,
"AExch"
,
"QR"
,
"QD"
,
"Qsim"
);
FortranOutputsMod
<-
c
(
"PotEvap"
,
"Precip"
,
"Prod"
,
"Pn"
,
"Ps"
,
"AE"
,
"Perc"
,
"PR"
,
"Q9"
,
"Q1"
,
"Rout"
,
"Exch"
,
"AExch1"
,
"AExch2"
,
"AExch"
,
"QR"
,
"QD"
,
"Qsim"
);
##Arguments_check
if
(
inherits
(
InputsModel
,
"InputsModel"
)
==
FALSE
){
stop
(
"InputsModel must be of class 'InputsModel' \n"
);
return
(
NULL
);
}
...
...
R/RunModel_CemaNeigeGR6J.R
View file @
af01972a
...
...
@@ -2,7 +2,8 @@ RunModel_CemaNeigeGR6J <- function(InputsModel,RunOptions,Param){
NParam
<-
8
;
FortranOutputsCemaNeige
<-
c
(
"Pliq"
,
"Psol"
,
"SnowPack"
,
"ThermalState"
,
"Gratio"
,
"PotMelt"
,
"Melt"
,
"PliqAndMelt"
,
"Temp"
);
FortranOutputsMod
<-
c
(
"PotEvap"
,
"Precip"
,
"Prod"
,
"AE"
,
"Perc"
,
"PR"
,
"Q9"
,
"Q1"
,
"Rout"
,
"Exch"
,
"AExch"
,
"QR"
,
"QR1"
,
"Exp"
,
"QD"
,
"Qsim"
);
FortranOutputsMod
<-
c
(
"PotEvap"
,
"Precip"
,
"Prod"
,
"Pn"
,
"Ps"
,
"AE"
,
"Perc"
,
"PR"
,
"Q9"
,
"Q1"
,
"Rout"
,
"Exch"
,
"AExch1"
,
"AExch2"
,
"AExch"
,
"QR"
,
"QR1"
,
"Exp"
,
"QD"
,
"Qsim"
);
##Arguments_check
if
(
inherits
(
InputsModel
,
"InputsModel"
)
==
FALSE
){
stop
(
"InputsModel must be of class 'InputsModel' \n"
);
return
(
NULL
);
}
...
...
R/RunModel_GR4J.R
View file @
af01972a
RunModel_GR4J
<-
function
(
InputsModel
,
RunOptions
,
Param
){
NParam
<-
4
;
FortranOutputs
<-
c
(
"PotEvap"
,
"Precip"
,
"Prod"
,
"AE"
,
"Perc"
,
"PR"
,
"Q9"
,
"Q1"
,
"Rout"
,
"Exch"
,
"AExch"
,
"QR"
,
"QD"
,
"Qsim"
);
FortranOutputs
<-
c
(
"PotEvap"
,
"Precip"
,
"Prod"
,
"Pn"
,
"Ps"
,
"AE"
,
"Perc"
,
"PR"
,
"Q9"
,
"Q1"
,
"Rout"
,
"Exch"
,
"AExch1"
,
"AExch2"
,
"AExch"
,
"QR"
,
"QD"
,
"Qsim"
);
##Arguments_check
if
(
inherits
(
InputsModel
,
"InputsModel"
)
==
FALSE
){
stop
(
"InputsModel must be of class 'InputsModel' \n"
);
return
(
NULL
);
}
...
...
R/RunModel_GR5J.R
View file @
af01972a
RunModel_GR5J
<-
function
(
InputsModel
,
RunOptions
,
Param
){
NParam
<-
5
;
FortranOutputs
<-
c
(
"PotEvap"
,
"Precip"
,
"Prod"
,
"AE"
,
"Perc"
,
"PR"
,
"Q9"
,
"Q1"
,
"Rout"
,
"Exch"
,
"AExch"
,
"QR"
,
"QD"
,
"Qsim"
);
FortranOutputs
<-
c
(
"PotEvap"
,
"Precip"
,
"Prod"
,
"Pn"
,
"Ps"
,
"AE"
,
"Perc"
,
"PR"
,
"Q9"
,
"Q1"
,
"Rout"
,
"Exch"
,
"AExch1"
,
"AExch2"
,
"AExch"
,
"QR"
,
"QD"
,
"Qsim"
);
##Arguments_check
if
(
inherits
(
InputsModel
,
"InputsModel"
)
==
FALSE
){
stop
(
"InputsModel must be of class 'InputsModel' \n"
);
return
(
NULL
);
}
...
...
R/RunModel_GR6J.R
View file @
af01972a
RunModel_GR6J
<-
function
(
InputsModel
,
RunOptions
,
Param
){
NParam
<-
6
;
FortranOutputs
<-
c
(
"PotEvap"
,
"Precip"
,
"Prod"
,
"AE"
,
"Perc"
,
"PR"
,
"Q9"
,
"Q1"
,
"Rout"
,
"Exch"
,
"AExch"
,
"QR"
,
"QR1"
,
"Exp"
,
"QD"
,
"Qsim"
);
FortranOutputs
<-
c
(
"PotEvap"
,
"Precip"
,
"Prod"
,
"Pn"
,
"Ps"
,
"AE"
,
"Perc"
,
"PR"
,
"Q9"
,
"Q1"
,
"Rout"
,
"Exch"
,
"AExch1"
,
"AExch2"
,
"AExch"
,
"QR"
,
"QR1"
,
"Exp"
,
"QD"
,
"Qsim"
);
##Arguments_check
if
(
inherits
(
InputsModel
,
"InputsModel"
)
==
FALSE
){
stop
(
"InputsModel must be of class 'InputsModel' \n"
);
return
(
NULL
);
}
...
...
man/RunModel_CemaNeigeGR4J.Rd
View file @
af01972a
...
...
@@ -27,6 +27,8 @@ CemaNeige X2 \tab degree-day melt coefficient [mm/°C/d] \
\emph{$PotEvap } \tab [numeric] series of input potential evapotranspiration [mm/d] \cr
\emph{$Precip } \tab [numeric] series of input total precipitation [mm/d] \cr
\emph{$Prod } \tab [numeric] series of production store level [mm] \cr
\emph{$Pn } \tab [numeric] series of net rainfall [mm/d] \cr
\emph{$Ps } \tab [numeric] series of the part of Ps filling the production store [mm/d] \cr
\emph{$AE } \tab [numeric] series of actual evapotranspiration [mm/d] \cr
\emph{$Perc } \tab [numeric] series of percolation (PERC) [mm/d] \cr
\emph{$PR } \tab [numeric] series of PR=PN-PS+PERC [mm/d] \cr
...
...
@@ -34,6 +36,8 @@ CemaNeige X2 \tab degree-day melt coefficient [mm/°C/d] \
\emph{$Q1 } \tab [numeric] series of UH2 outflow (Q1) [mm/d] \cr
\emph{$Rout } \tab [numeric] series of routing store level [mm] \cr
\emph{$Exch } \tab [numeric] series of potential semi-exchange between catchments [mm/d] \cr
\emph{$AExch1 } \tab [numeric] series of actual exchange between catchments for branch 1 [mm/d] \cr
\emph{$AExch2 } \tab [numeric] series of actual exchange between catchments for branch 2 [mm/d] \cr
\emph{$AExch } \tab [numeric] series of actual exchange between catchments (1+2) [mm/d] \cr
\emph{$QR } \tab [numeric] series of routing store outflow (QR) [mm/d] \cr
\emph{$QD } \tab [numeric] series of direct flow from UH2 after exchange (QD) [mm/d] \cr
...
...
man/RunModel_CemaNeigeGR5J.Rd
View file @
af01972a
...
...
@@ -28,6 +28,8 @@ CemaNeige X2 \tab degree-day melt coefficient [mm/°C/d] \
\emph{$PotEvap } \tab [numeric] series of input potential evapotranspiration [mm/d] \cr
\emph{$Precip } \tab [numeric] series of input total precipitation [mm/d] \cr
\emph{$Prod } \tab [numeric] series of production store level [mm] \cr
\emph{$Pn } \tab [numeric] series of net rainfall [mm/d] \cr
\emph{$Ps } \tab [numeric] series of the part of Ps filling the production store [mm/d] \cr
\emph{$AE } \tab [numeric] series of actual evapotranspiration [mm/d] \cr
\emph{$Perc } \tab [numeric] series of percolation (PERC) [mm/d] \cr
\emph{$PR } \tab [numeric] series of PR=PN-PS+PERC [mm/d] \cr
...
...
@@ -35,6 +37,8 @@ CemaNeige X2 \tab degree-day melt coefficient [mm/°C/d] \
\emph{$Q1 } \tab [numeric] series of UH2 outflow (Q1) [mm/d] \cr
\emph{$Rout } \tab [numeric] series of routing store level [mm] \cr
\emph{$Exch } \tab [numeric] series of potential semi-exchange between catchments [mm/d] \cr
\emph{$AExch1 } \tab [numeric] series of actual exchange between catchments for branch 1 [mm/d] \cr
\emph{$AExch2 } \tab [numeric] series of actual exchange between catchments for branch 2 [mm/d] \cr
\emph{$AExch } \tab [numeric] series of actual exchange between catchments (1+2) [mm/d] \cr
\emph{$QR } \tab [numeric] series of routing store outflow (QR) [mm/d] \cr
\emph{$QD } \tab [numeric] series of direct flow from UH2 after exchange (QD) [mm/d] \cr
...
...
man/RunModel_CemaNeigeGR6J.Rd
View file @
af01972a
...
...
@@ -29,6 +29,8 @@ CemaNeige X2 \tab degree-day melt coefficient [mm/°C/d] \
\emph{$PotEvap } \tab [numeric] series of input potential evapotranspiration [mm/d] \cr
\emph{$Precip } \tab [numeric] series of input total precipitation [mm/d] \cr
\emph{$Prod } \tab [numeric] series of production store level [mm] \cr
\emph{$Pn } \tab [numeric] series of net rainfall [mm/d] \cr
\emph{$Ps } \tab [numeric] series of the part of Ps filling the production store [mm/d] \cr
\emph{$AE } \tab [numeric] series of actual evapotranspiration [mm/d] \cr
\emph{$Perc } \tab [numeric] series of percolation (PERC) [mm/d] \cr
\emph{$PR } \tab [numeric] series of PR=PN-PS+PERC [mm/d] \cr
...
...
@@ -36,6 +38,8 @@ CemaNeige X2 \tab degree-day melt coefficient [mm/°C/d] \
\emph{$Q1 } \tab [numeric] series of UH2 outflow (Q1) [mm/d] \cr
\emph{$Rout } \tab [numeric] series of routing store level [mm] \cr
\emph{$Exch } \tab [numeric] series of potential semi-exchange between catchments [mm/d] \cr
\emph{$AExch1 } \tab [numeric] series of actual exchange between catchments for branch 1 [mm/d] \cr
\emph{$AExch2 } \tab [numeric] series of actual exchange between catchments for branch 2 [mm/d] \cr
\emph{$AExch } \tab [numeric] series of actual exchange between catchments (1+2) [mm/d] \cr
\emph{$QR } \tab [numeric] series of routing store outflow (QR) [mm/d] \cr
\emph{$QR1 } \tab [numeric] series of exponential store outflow (QR1) [mm/d] \cr
...
...
man/RunModel_GR4J.Rd
View file @
af01972a
...
...
@@ -24,14 +24,18 @@ GR4J X4 \tab unit hydrograph time constant [d]
\emph{$DatesR } \tab [POSIXlt] series of dates \cr
\emph{$PotEvap } \tab [numeric] series of input potential evapotranspiration [mm/d] \cr
\emph{$Precip } \tab [numeric] series of input total precipitation [mm/d] \cr
\emph{$Prod } \tab [numeric] series of production store level [mm] \cr
\emph{$Prod } \tab [numeric] series of production store level [mm] \cr
\emph{$Pn } \tab [numeric] series of net rainfall [mm/d] \cr
\emph{$Ps } \tab [numeric] series of the part of Ps filling the production store [mm/d] \cr
\emph{$AE } \tab [numeric] series of actual evapotranspiration [mm/d] \cr
\emph{$Perc } \tab [numeric] series of percolation (PERC) [mm/d] \cr
\emph{$PR } \tab [numeric] series of PR=PN-PS+PERC [mm/d] \cr
\emph{$Q9 } \tab [numeric] series of UH1 outflow (Q9) [mm/d] \cr
\emph{$Q1 } \tab [numeric] series of UH2 outflow (Q1) [mm/d] \cr
\emph{$Rout } \tab [numeric] series of routing store level [mm] \cr
\emph{$Rout } \tab [numeric] series of routing store level [mm]
\cr
\emph{$Exch } \tab [numeric] series of potential semi-exchange between catchments [mm/d] \cr
\emph{$AExch1 } \tab [numeric] series of actual exchange between catchments for branch 1 [mm/d] \cr
\emph{$AExch2 } \tab [numeric] series of actual exchange between catchments for branch 2 [mm/d] \cr
\emph{$AExch } \tab [numeric] series of actual exchange between catchments (1+2) [mm/d] \cr
\emph{$QR } \tab [numeric] series of routing store outflow (QR) [mm/d] \cr
\emph{$QD } \tab [numeric] series of direct flow from UH2 after exchange (QD) [mm/d] \cr
...
...
man/RunModel_GR5J.Rd
View file @
af01972a
...
...
@@ -26,6 +26,8 @@ GR5J X5 \tab intercatchment exchange threshold [-] \cr
\emph{$PotEvap } \tab [numeric] series of input potential evapotranspiration [mm/d] \cr
\emph{$Precip } \tab [numeric] series of input total precipitation [mm/d] \cr
\emph{$Prod } \tab [numeric] series of production store level [mm] \cr
\emph{$Pn } \tab [numeric] series of net rainfall [mm/d] \cr
\emph{$Ps } \tab [numeric] series of the part of Ps filling the production store [mm/d] \cr
\emph{$AE } \tab [numeric] series of actual evapotranspiration [mm/d] \cr
\emph{$Perc } \tab [numeric] series of percolation (PERC) [mm/d] \cr
\emph{$PR } \tab [numeric] series of PR=PN-PS+PERC [mm/d] \cr
...
...
@@ -33,6 +35,8 @@ GR5J X5 \tab intercatchment exchange threshold [-] \cr
\emph{$Q1 } \tab [numeric] series of UH2 outflow (Q1) [mm/d] \cr
\emph{$Rout } \tab [numeric] series of routing store level [mm] \cr
\emph{$Exch } \tab [numeric] series of potential semi-exchange between catchments [mm/d] \cr
\emph{$AExch1 } \tab [numeric] series of actual exchange between catchments for branch 1 [mm/d] \cr
\emph{$AExch2 } \tab [numeric] series of actual exchange between catchments for branch 2 [mm/d] \cr
\emph{$AExch } \tab [numeric] series of actual exchange between catchments (1+2) [mm/d] \cr
\emph{$QR } \tab [numeric] series of routing store outflow (QR) [mm/d] \cr
\emph{$QD } \tab [numeric] series of direct flow from UH2 after exchange (QD) [mm/d] \cr
...
...
man/RunModel_GR6J.Rd
View file @
af01972a
...
...
@@ -27,6 +27,8 @@ GR6J X6 \tab coefficient for emptying exponential store [mm]
\emph{$PotEvap } \tab [numeric] series of input potential evapotranspiration [mm/d] \cr
\emph{$Precip } \tab [numeric] series of input total precipitation [mm/d] \cr
\emph{$Prod } \tab [numeric] series of production store level [mm] \cr
\emph{$Pn } \tab [numeric] series of net rainfall [mm/d] \cr
\emph{$Ps } \tab [numeric] series of the part of Ps filling the production store [mm/d] \cr
\emph{$AE } \tab [numeric] series of actual evapotranspiration [mm/d] \cr
\emph{$Perc } \tab [numeric] series of percolation (PERC) [mm/d] \cr
\emph{$PR } \tab [numeric] series of PR=PN-PS+PERC [mm/d] \cr
...
...
@@ -34,6 +36,8 @@ GR6J X6 \tab coefficient for emptying exponential store [mm]
\emph{$Q1 } \tab [numeric] series of UH2 outflow (Q1) [mm/d] \cr
\emph{$Rout } \tab [numeric] series of routing store level [mm] \cr
\emph{$Exch } \tab [numeric] series of potential semi-exchange between catchments [mm/d] \cr
\emph{$AExch1 } \tab [numeric] series of actual exchange between catchments for branch 1 [mm/d] \cr
\emph{$AExch2 } \tab [numeric] series of actual exchange between catchments for branch 2 [mm/d] \cr
\emph{$AExch } \tab [numeric] series of actual exchange between catchments (1+2) [mm/d] \cr
\emph{$QR } \tab [numeric] series of routing store outflow (QR) [mm/d] \cr
\emph{$QR1 } \tab [numeric] series of exponential store outflow (QR1) [mm/d] \cr
...
...
src/frun_GR4J.f
View file @
af01972a
...
...
@@ -173,6 +173,7 @@ C Interception and production store
! fin speed-up
AE
=
ER
+
P1
St
(
1
)
=
St
(
1
)
-
ER
PS
=
0.
PR
=
0.
ELSE
EN
=
0.
...
...
@@ -254,17 +255,21 @@ C Variables storage
MISC
(
1
)
=
E
! PE ! observed potential evapotranspiration [mm/day]
MISC
(
2
)
=
P1
! Precip ! observed total precipitation [mm/day]
MISC
(
3
)
=
St
(
1
)
! Prod ! production store level (St(1)) [mm]
MISC
(
4
)
=
AE
! AE ! actual evapotranspiration [mm/day]
MISC
(
5
)
=
PERC
! Perc ! percolation (PERC) [mm/day]
MISC
(
6
)
=
PR
! PR ! PR=PN-PS+PERC [mm/day]
MISC
(
7
)
=
StUH1
(
1
)
! Q9 ! outflow from UH1 (Q9) [mm/day]
MISC
(
8
)
=
StUH2
(
1
)
! Q1 ! outflow from UH2 (Q1) [mm/day]
MISC
(
9
)
=
St
(
2
)
! Rout ! routing store level (St(2)) [mm]
MISC
(
10
)
=
EXCH
! Exch ! potential semi-exchange between catchments (EXCH) [mm/day]
MISC
(
11
)
=
AEXCH1
+
AEXCH2
! AExch ! actual total exchange between catchments (AEXCH1+AEXCH2) [mm/day]
MISC
(
12
)
=
QR
! QR ! outflow from routing store (QR) [mm/day]
MISC
(
13
)
=
QD
! QD ! outflow from UH2 branch after exchange (QD) [mm/day]
MISC
(
14
)
=
Q
! Qsim ! simulated outflow at catchment outlet [mm/day]
MISC
(
4
)
=
PN
! Pn ! net rainfall [mm/day]
MISC
(
5
)
=
PS
! Ps ! part of Ps filling the production store [mm/day]
MISC
(
6
)
=
AE
! AE ! actual evapotranspiration [mm/day]
MISC
(
7
)
=
PERC
! Perc ! percolation (PERC) [mm/day]
MISC
(
8
)
=
PR
! PR ! PR=PN-PS+PERC [mm/day]
MISC
(
9
)
=
StUH1
(
1
)
! Q9 ! outflow from UH1 (Q9) [mm/day]
MISC
(
10
)
=
StUH2
(
1
)
! Q1 ! outflow from UH2 (Q1) [mm/day]
MISC
(
11
)
=
St
(
2
)
! Rout ! routing store level (St(2)) [mm]
MISC
(
12
)
=
EXCH
! Exch ! potential semi-exchange between catchments (EXCH) [mm/day]
MISC
(
13
)
=
AEXCH1
! AExch1 ! actual exchange between catchments from branch 1 (AEXCH1) [mm/day]
MISC
(
14
)
=
AEXCH2
! AExch2 ! actual exchange between catchments from branch 2 (AEXCH2) [mm/day]
MISC
(
15
)
=
AEXCH1
+
AEXCH2
! AExch ! actual total exchange between catchments (AEXCH1+AEXCH2) [mm/day]
MISC
(
16
)
=
QR
! QR ! outflow from routing store (QR) [mm/day]
MISC
(
17
)
=
QD
! QD ! outflow from UH2 branch after exchange (QD) [mm/day]
MISC
(
18
)
=
Q
! Qsim ! simulated outflow at catchment outlet [mm/day]
...
...
src/frun_GR5J.f
View file @
af01972a
...
...
@@ -163,6 +163,7 @@ C Interception and production store
! fin speed-up
AE
=
ER
+
P1
St
(
1
)
=
St
(
1
)
-
ER
PS
=
0.
PR
=
0.
ELSE
EN
=
0.
...
...
@@ -239,19 +240,21 @@ C Variables storage
MISC
(
1
)
=
E
! PE ! observed potential evapotranspiration [mm/day]
MISC
(
2
)
=
P1
! Precip ! observed total precipitation [mm/day]
MISC
(
3
)
=
St
(
1
)
! Prod ! production store level (St(1)) [mm]
MISC
(
4
)
=
AE
! AE ! actual evapotranspiration [mm/day]
MISC
(
5
)
=
PERC
! Perc ! percolation (PERC) [mm/day]
MISC
(
6
)
=
PR
! PR ! PR=PN-PS+PERC [mm/day]
MISC
(
7
)
=
Q9
! Q9 ! outflow from first branch (Q9) [mm/day]
MISC
(
8
)
=
Q1
! Q1 ! outflow from second branch (Q1) [mm/day]
MISC
(
9
)
=
St
(
2
)
! Rout ! routing store level (St(2)) [mm]
MISC
(
10
)
=
EXCH
! Exch ! potential semi-exchange between catchments (EXCH) [mm/day]
MISC
(
11
)
=
AEXCH1
+
AEXCH2
! AExch ! actual total exchange between catchments (AEXCH1+AEXCH2) [mm/day]
MISC
(
12
)
=
QR
! QR ! outflow from routing store (QR) [mm/day]
MISC
(
13
)
=
QD
! QD ! outflow from UH2 branch after exchange (QD) [mm/day]
MISC
(
14
)
=
Q
! Qsim ! simulated outflow at catchment outlet [mm/day]
MISC
(
4
)
=
PN
! Pn ! net rainfall [mm/day]
MISC
(
5
)
=
PS
! Ps ! part of Ps filling the production store [mm/day]
MISC
(
6
)
=
AE
! AE ! actual evapotranspiration [mm/day]
MISC
(
7
)
=
PERC
! Perc ! percolation (PERC) [mm/day]
MISC
(
8
)
=
PR
! PR ! PR=PN-PS+PERC [mm/day]
MISC
(
9
)
=
Q9
! Q9 ! outflow from UH1 (Q9) [mm/day]
MISC
(
10
)
=
Q1
! Q1 ! outflow from UH2 (Q1) [mm/day]
MISC
(
11
)
=
St
(
2
)
! Rout ! routing store level (St(2)) [mm]
MISC
(
12
)
=
EXCH
! Exch ! potential semi-exchange between catchments (EXCH) [mm/day]
MISC
(
13
)
=
AEXCH1
! AExch1 ! actual exchange between catchments from branch 1 (AEXCH1) [mm/day]
MISC
(
14
)
=
AEXCH2
! AExch2 ! actual exchange between catchments from branch 2 (AEXCH2) [mm/day]
MISC
(
15
)
=
AEXCH1
+
AEXCH2
! AExch ! actual total exchange between catchments (AEXCH1+AEXCH2) [mm/day]
MISC
(
16
)
=
QR
! QR ! outflow from routing store (QR) [mm/day]
MISC
(
17
)
=
QD
! QD ! outflow from UH2 branch after exchange (QD) [mm/day]
MISC
(
18
)
=
Q
! Qsim ! simulated outflow at catchment outlet [mm/day]
ENDSUBROUTINE
...
...
src/frun_GR6J.f
View file @
af01972a
...
...
@@ -180,6 +180,7 @@ C Production store
AE
=
ER
+
P1
St
(
1
)
=
St
(
1
)
-
ER
PS
=
0.
PR
=
0.
ELSE
EN
=
0.
...
...
@@ -283,19 +284,23 @@ C Variables storage
MISC
(
1
)
=
E
! PE ! observed potential evapotranspiration [mm/day]
MISC
(
2
)
=
P1
! Precip ! observed total precipitation [mm/day]
MISC
(
3
)
=
St
(
1
)
! Prod ! production store level (St(1)) [mm]
MISC
(
4
)
=
AE
! AE ! actual evapotranspiration [mm/day]
MISC
(
5
)
=
PERC
! Perc ! percolation (PERC) [mm/day]
MISC
(
6
)
=
PR
! PR ! PR=PN-PS+PERC [mm/day]
MISC
(
7
)
=
StUH1
(
1
)
! Q9 ! outflow from UH1 (Q9) [mm/day]
MISC
(
8
)
=
StUH2
(
1
)
! Q1 ! outflow from UH2 (Q1) [mm/day]
MISC
(
9
)
=
St
(
2
)
! Rout ! routing store level (St(2)) [mm]
MISC
(
10
)
=
EXCH
! Exch ! potential third-exchange between catchments (EXCH) [mm/day]
MISC
(
11
)
=
AEXCH1
+
AEXCH2
+
EXCH
! AExch ! actual total exchange between catchments (AEXCH1+AEXCH2+EXCH) [mm/day]
MISC
(
12
)
=
QR
! QR ! outflow from routing store (QR) [mm/day]
MISC
(
13
)
=
QR1
! QR1 ! outflow from exponential store (QR1) [mm/day]
MISC
(
14
)
=
St
(
3
)
! Exp ! exponential store level (St(3)) (negative) [mm]
MISC
(
15
)
=
QD
! QD ! outflow from UH2 branch after exchange (QD) [mm/day]
MISC
(
16
)
=
Q
! Qsim ! simulated outflow at catchment outlet [mm/day]
MISC
(
4
)
=
PN
! Pn ! net rainfall [mm/day]
MISC
(
5
)
=
PS
! Ps ! part of Ps filling the production store [mm/day]
MISC
(
6
)
=
AE
! AE ! actual evapotranspiration [mm/day]
MISC
(
7
)
=
PERC
! Perc ! percolation (PERC) [mm/day]
MISC
(
8
)
=
PR
! PR ! PR=PN-PS+PERC [mm/day]
MISC
(
9
)
=
StUH1
(
1
)
! Q9 ! outflow from UH1 (Q9) [mm/day]
MISC
(
10
)
=
StUH2
(
1
)
! Q1 ! outflow from UH2 (Q1) [mm/day]
MISC
(
11
)
=
St
(
2
)
! Rout ! routing store level (St(2)) [mm]
MISC
(
12
)
=
EXCH
! Exch ! potential third-exchange between catchments (EXCH) [mm/day]
MISC
(
13
)
=
AEXCH1
! AExch1 ! actual exchange between catchments from routing store (AEXCH1) [mm/day]
MISC
(
14
)
=
AEXCH2
! AExch2 ! actual exchange between catchments from direct branch (after UH2) (AEXCH2) [mm/day]
MISC
(
15
)
=
AEXCH1
+
AEXCH2
+
EXCH
! AExch ! actual total exchange between catchments (AEXCH1+AEXCH2+EXCH) [mm/day]
MISC
(
16
)
=
QR
! QR ! outflow from routing store (QR) [mm/day]
MISC
(
17
)
=
QR1
! QR1 ! outflow from exponential store (QR1) [mm/day]
MISC
(
18
)
=
St
(
3
)
! Exp ! exponential store level (St(3)) (negative) [mm]
MISC
(
19
)
=
QD
! QD ! outflow from UH2 branch after exchange (QD) [mm/day]
MISC
(
20
)
=
Q
! Qsim ! simulated outflow at catchment outlet [mm/day]
ENDSUBROUTINE
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment