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
1967f070
Commit
1967f070
authored
Mar 04, 2019
by
Delaigue Olivier
Browse files
v1.2.7.5 CLEAN: typo revisions and prints removed
parent
035fca61
Changes
5
Hide whitespace changes
Inline
Side-by-side
DESCRIPTION
View file @
1967f070
Package: airGR
Type: Package
Title: Suite of GR Hydrological Models for Precipitation-Runoff Modelling
Version: 1.2.7.
4
Version: 1.2.7.
5
Date: 2019-03-04
Authors@R: c(
person("Laurent", "Coron", role = c("aut", "trl"), comment = c(ORCID = "0000-0002-1503-6204")),
...
...
NEWS.rmd
View file @
1967f070
...
...
@@ -13,7 +13,7 @@ output:
### 1.2.7.
4
Release Notes (2019-03-04)
### 1.2.7.
5
Release Notes (2019-03-04)
...
...
R/CreateIniStates.R
View file @
1967f070
...
...
@@ -182,7 +182,7 @@ CreateIniStates <- function(FUN_MOD, InputsModel,
if
(
is.null
(
GlocmaxCemaNeigeLayers
))
{
GlocmaxCemaNeigeLayers
<-
rep
(
Inf
,
NLayers
)
}
cat
(
GCemaNeigeLayers
)
# check negative values
if
(
any
(
ProdStore
<
0
)
|
any
(
RoutStore
<
0
)
|
...
...
R/CreateRunOptions.R
View file @
1967f070
...
...
@@ -313,14 +313,13 @@ CreateRunOptions <- function(FUN_MOD, InputsModel, IndPeriod_WarmUp = NULL, IndP
Outputs_Cal
<-
c
(
"DatesR"
,
Outputs_all
,
"StateEnd"
)
}
Test
<-
which
(
Outputs_Cal
%in%
c
(
"DatesR"
,
Outputs_all
,
"StateEnd"
)
==
FALSE
)
Test
<-
which
(
Outputs_Cal
%in%
c
(
"DatesR"
,
Outputs_all
,
"StateEnd"
)
==
FALSE
)
if
(
length
(
Test
)
!=
0
)
{
stop
(
paste0
(
"'Outputs_Cal' is incorrectly defined: "
,
paste
(
Outputs_Cal
[
Test
],
collapse
=
", "
),
" not found"
))
}
Outputs_Cal
<-
Outputs_Cal
[
!
duplicated
(
Outputs_Cal
)]
Outputs_Calxxx
<-
unique
(
Outputs_Cal
[
!
duplicated
(
Outputs_Cal
)]
)
Outputs_Calxxx
<-
unique
(
Outputs_Cal
)
print
(
Outputs_Cal
)
print
(
Outputs_Calxxx
)
...
...
R/RunModel_CemaNeige.R
View file @
1967f070
...
...
@@ -11,7 +11,7 @@ RunModel_CemaNeige <- function(InputsModel, RunOptions, Param, IsHyst = FALSE) {
NParam
<-
ifelse
(
IsHyst
,
4L
,
2L
)
NStates
<-
4L
FortranOutputsCemaNeige
<-
.FortranOutputs
(
GR
=
NULL
,
isCN
=
TRUE
)
$
CN
print
(
FortranOutputsCemaNeige
)
## Arguments_check
if
(
!
inherits
(
InputsModel
,
"InputsModel"
))
{
...
...
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