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
ed6680fe
Commit
ed6680fe
authored
Apr 01, 2019
by
Delaigue Olivier
Browse files
v1.2.13.1 UPDATE: RunModel_CemaNeige* funs now use the IsHyst argument when CreateInistats is used
parent
5951ebb9
Changes
6
Hide whitespace changes
Inline
Side-by-side
DESCRIPTION
View file @
ed6680fe
Package: airGR
Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
Version: 1.2.13.
0
Version: 1.2.13.
1
Date: 2019-04-01
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
...
...
NEWS.rmd
View file @
ed6680fe
...
...
@@ -13,7 +13,7 @@ output:
### 1.2.13.
0
Release Notes (2019-04-01)
### 1.2.13.
1
Release Notes (2019-04-01)
...
...
R/RunModel_CemaNeige.R
View file @
ed6680fe
...
...
@@ -111,7 +111,7 @@ RunModel_CemaNeige <- function(InputsModel, RunOptions, Param) {
if
(
ExportStateEnd
)
{
idNStates
<-
seq_len
(
NStates
*
NLayers
)
%%
NStates
CemaNeigeStateEnd
<-
CreateIniStates
(
FUN_MOD
=
RunModel_CemaNeige
,
InputsModel
=
InputsModel
,
CemaNeigeStateEnd
<-
CreateIniStates
(
FUN_MOD
=
RunModel_CemaNeige
,
InputsModel
=
InputsModel
,
IsHyst
=
IsHyst
,
ProdStore
=
NULL
,
RoutStore
=
NULL
,
ExpStore
=
NULL
,
UH1
=
NULL
,
UH2
=
NULL
,
GCemaNeigeLayers
=
CemaNeigeStateEnd
[
seq_len
(
NStates
*
NLayers
)[
idNStates
==
3
]],
...
...
R/RunModel_CemaNeigeGR4J.R
View file @
ed6680fe
...
...
@@ -131,7 +131,7 @@ RunModel_CemaNeigeGR4J <- function(InputsModel,RunOptions,Param){
RESULTS
$
StateEnd
[
round
(
RESULTS
$
StateEnd
,
3
)
==
(
-999.999
)]
<-
NA
;
if
(
ExportStateEnd
)
{
idNStates
<-
seq_len
(
NStates
*
NLayers
)
%%
NStates
RESULTS
$
StateEnd
<-
CreateIniStates
(
FUN_MOD
=
RunModel_CemaNeigeGR4J
,
InputsModel
=
InputsModel
,
RESULTS
$
StateEnd
<-
CreateIniStates
(
FUN_MOD
=
RunModel_CemaNeigeGR4J
,
InputsModel
=
InputsModel
,
IsHyst
=
IsHyst
,
ProdStore
=
RESULTS
$
StateEnd
[
1L
],
RoutStore
=
RESULTS
$
StateEnd
[
2L
],
ExpStore
=
NULL
,
UH1
=
RESULTS
$
StateEnd
[(
1
:
20
)
+7
],
UH2
=
RESULTS
$
StateEnd
[(
1
:
40
)
+
(
7+20
)],
GCemaNeigeLayers
=
CemaNeigeStateEnd
[
seq_len
(
NStates
*
NLayers
)[
idNStates
==
3
]],
...
...
R/RunModel_CemaNeigeGR5J.R
View file @
ed6680fe
...
...
@@ -129,7 +129,7 @@ RunModel_CemaNeigeGR5J <- function(InputsModel,RunOptions,Param){
RESULTS
$
StateEnd
[
round
(
RESULTS
$
StateEnd
,
3
)
==
(
-999.999
)]
<-
NA
;
if
(
ExportStateEnd
)
{
idNStates
<-
seq_len
(
NStates
*
NLayers
)
%%
NStates
RESULTS
$
StateEnd
<-
CreateIniStates
(
FUN_MOD
=
RunModel_CemaNeigeGR5J
,
InputsModel
=
InputsModel
,
RESULTS
$
StateEnd
<-
CreateIniStates
(
FUN_MOD
=
RunModel_CemaNeigeGR5J
,
InputsModel
=
InputsModel
,
IsHyst
=
IsHyst
,
ProdStore
=
RESULTS
$
StateEnd
[
1L
],
RoutStore
=
RESULTS
$
StateEnd
[
2L
],
ExpStore
=
NULL
,
UH1
=
NULL
,
UH2
=
RESULTS
$
StateEnd
[(
1
:
40
)
+
(
7+20
)],
GCemaNeigeLayers
=
CemaNeigeStateEnd
[
seq_len
(
NStates
*
NLayers
)[
idNStates
==
3
]],
...
...
R/RunModel_CemaNeigeGR6J.R
View file @
ed6680fe
...
...
@@ -134,7 +134,7 @@ RunModel_CemaNeigeGR6J <- function(InputsModel,RunOptions,Param){
RESULTS
$
StateEnd
[
round
(
RESULTS
$
StateEnd
,
3
)
==
(
-999.999
)]
<-
NA
;
if
(
ExportStateEnd
)
{
idNStates
<-
seq_len
(
NStates
*
NLayers
)
%%
NStates
RESULTS
$
StateEnd
<-
CreateIniStates
(
FUN_MOD
=
RunModel_CemaNeigeGR6J
,
InputsModel
=
InputsModel
,
RESULTS
$
StateEnd
<-
CreateIniStates
(
FUN_MOD
=
RunModel_CemaNeigeGR6J
,
InputsModel
=
InputsModel
,
IsHyst
=
IsHyst
,
ProdStore
=
RESULTS
$
StateEnd
[
1L
],
RoutStore
=
RESULTS
$
StateEnd
[
2L
],
ExpStore
=
RESULTS
$
StateEnd
[
3L
],
UH1
=
RESULTS
$
StateEnd
[(
1
:
20
)
+7
],
UH2
=
RESULTS
$
StateEnd
[(
1
:
40
)
+
(
7+20
)],
GCemaNeigeLayers
=
CemaNeigeStateEnd
[
seq_len
(
NStates
*
NLayers
)[
idNStates
==
3
]],
...
...
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