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
airGRteaching
Commits
984b754a
Commit
984b754a
authored
Aug 06, 2021
by
Delaigue Olivier
Browse files
style(Utils): indent code
parent
d3c7b074
Pipeline
#26140
passed with stage
in 2 minutes and 2 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
R/Utils.R
View file @
984b754a
...
...
@@ -355,11 +355,11 @@ if (getRversion() >= "2.15.1") {
y0
=
y_interception
,
y1
=
y_rendement
)
if
(
HydroModel
!=
"GR2M"
)
{
# Ecriture
plotrix
::
boxed.labels
(
x
=
xy_P
[
1
],
y
=
y_interception
,
labels
=
"Pn"
,
bg
=
col_mod_bg
,
border
=
NA
,
xpad
=
xpad
,
ypad
=
ypad
)
plotrix
::
boxed.labels
(
x
=
xy_E
[
1
],
y
=
y_interception
,
labels
=
"En"
,
bg
=
col_mod_bg
,
border
=
NA
,
xpad
=
xpad
,
ypad
=
ypad
)
# Ecriture
plotrix
::
boxed.labels
(
x
=
xy_P
[
1
],
y
=
y_interception
,
labels
=
"Pn"
,
bg
=
col_mod_bg
,
border
=
NA
,
xpad
=
xpad
,
ypad
=
ypad
)
plotrix
::
boxed.labels
(
x
=
xy_E
[
1
],
y
=
y_interception
,
labels
=
"En"
,
bg
=
col_mod_bg
,
border
=
NA
,
xpad
=
xpad
,
ypad
=
ypad
)
}
# ETP
...
...
@@ -742,9 +742,9 @@ if (getRversion() >= "2.15.1") {
y0
=
xy_min_EXPO
[
2
],
y1
=
xy_min_EXPO
[
2
]
-
logExpMax
*
fact_resExp
-
tmp_triche
)
text
(
x
=
30
,
y
=
xy_min_EXPO
[
2
]
+00
,
labels
=
"Exp.\nstore"
,
cex
=
1.4
,
pos
=
4
)
points
(
x
=
180
,
y
=
xy_min_EXPO
[
2
]
+20
,
pch
=
43
,
# +
cex
=
2.0
,
col
=
"#10B510"
)
cex
=
2.0
,
col
=
"#10B510"
)
points
(
x
=
178
,
y
=
xy_min_EXPO
[
2
]
-20
,
pch
=
95
,
# -
cex
=
1.6
,
col
=
"#FF0303"
)
cex
=
1.6
,
col
=
"#FF0303"
)
# Valeur de QrExp
if
(
OutputsModel
$
QR
[
i_pdt
]
!=
0
)
{
...
...
@@ -780,23 +780,23 @@ if (getRversion() >= "2.15.1") {
# --------------------------------------------------------------------------------
if
(
HydroModel
!=
"GR2M"
)
{
# Actual exchange Q9
arrows
(
x0
=
xy_min_ROUT
[
1
]
+
base_res
,
x1
=
1025
,
y0
=
y_Ech_Q9
,
y1
=
y_Ech_Q9
,
length
=
0.075
,
angle
=
20
,
code
=
3
)
pch
<-
ifelse
(
OutputsModel
$
AExch1
[
i_pdt
]
<
0
,
tri_R
,
tri_L
)
points
(
x
=
xy_min_ROUT
[
1
]
+
base_res
+130
,
y
=
y_Ech_Q9
,
type
=
"p"
,
pch
=
pch
,
col
=
col_P
,
cex
=
cex_tri
(
OutputsModel
$
AExch1
[
i_pdt
],
fact
=
fact_triangle
,
max
=
cex_max_poly
))
# Actual exchange Q1
arrows
(
x0
=
xy_Q1
[
1
],
x1
=
1025
,
y0
=
y_Ech_Q1
,
y1
=
y_Ech_Q1
,
length
=
0.075
,
angle
=
20
,
code
=
3
)
pch
<-
ifelse
(
OutputsModel
$
AExch2
[
i_pdt
]
<
0
,
tri_R
,
tri_L
)
points
(
x
=
xy_Q1
[
1
]
+100
,
y
=
y_Ech_Q1
,
type
=
"p"
,
pch
=
pch
,
col
=
col_P
,
cex
=
cex_tri
(
OutputsModel
$
AExch2
[
i_pdt
],
fact
=
fact_triangle
,
max
=
cex_max_poly
))
# Actual exchange Q9
arrows
(
x0
=
xy_min_ROUT
[
1
]
+
base_res
,
x1
=
1025
,
y0
=
y_Ech_Q9
,
y1
=
y_Ech_Q9
,
length
=
0.075
,
angle
=
20
,
code
=
3
)
pch
<-
ifelse
(
OutputsModel
$
AExch1
[
i_pdt
]
<
0
,
tri_R
,
tri_L
)
points
(
x
=
xy_min_ROUT
[
1
]
+
base_res
+130
,
y
=
y_Ech_Q9
,
type
=
"p"
,
pch
=
pch
,
col
=
col_P
,
cex
=
cex_tri
(
OutputsModel
$
AExch1
[
i_pdt
],
fact
=
fact_triangle
,
max
=
cex_max_poly
))
# Actual exchange Q1
arrows
(
x0
=
xy_Q1
[
1
],
x1
=
1025
,
y0
=
y_Ech_Q1
,
y1
=
y_Ech_Q1
,
length
=
0.075
,
angle
=
20
,
code
=
3
)
pch
<-
ifelse
(
OutputsModel
$
AExch2
[
i_pdt
]
<
0
,
tri_R
,
tri_L
)
points
(
x
=
xy_Q1
[
1
]
+100
,
y
=
y_Ech_Q1
,
type
=
"p"
,
pch
=
pch
,
col
=
col_P
,
cex
=
cex_tri
(
OutputsModel
$
AExch2
[
i_pdt
],
fact
=
fact_triangle
,
max
=
cex_max_poly
))
}
if
(
HydroModel
==
"GR2M"
)
{
...
...
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