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
cassiopee
jalhyd
Commits
75f9b340
Commit
75f9b340
authored
Nov 29, 2019
by
Mathias Chouet
🍝
Browse files
Fix
#176
- MacroRugo: remove tech. guide results
parent
9bfdc02c
Changes
3
Hide whitespace changes
Inline
Side-by-side
spec/macrorugo/macrorugo.spec.ts
View file @
75f9b340
...
...
@@ -49,8 +49,6 @@ const macroRugoExtraResultEmergentCd15: { [key: string]: number|MacroRugoFlowTyp
ENUM_MacroRugoFlowType
:
MacroRugoFlowType
.
EMERGENT
,
Fr
:
0.530425
,
PV
:
242.174003
,
Q_GuideTech
:
0.561860
,
V_GuideTech
:
1.991299
,
Vdeb
:
0.822881
,
Vmax
:
1.799502
,
Strickler
:
5.173107
,
...
...
@@ -92,8 +90,6 @@ const macroRugoExtraResultEmergentCd2: { [key: string]: number|MacroRugoFlowType
ENUM_MacroRugoFlowType
:
MacroRugoFlowType
.
EMERGENT
,
Fr
:
0.404817
,
PV
:
184.825731
,
Q_GuideTech
:
0.414154
,
V_GuideTech
:
1.592932
,
Vdeb
:
0.628018
,
Vmax
:
1.536129
,
Strickler
:
3.948084
,
...
...
@@ -133,7 +129,6 @@ const macroRugoExtraResultSubmerged: { [key: string]: number|MacroRugoFlowType }
ENUM_MacroRugoFlowType
:
MacroRugoFlowType
.
SUBMERGED
,
Fr
:
0.776130
,
PV
:
545.564782
,
Q_GuideTech
:
0.940450
,
Vdeb
:
1.390328
,
Strickler
:
7.215044
,
ZF2
:
12.2
...
...
src/macrorugo/macrorugo.ts
View file @
75f9b340
...
...
@@ -115,13 +115,6 @@ export class MacroRugo extends Nub {
cV
=
[
4.54
,
0.32
,
0.56
];
}
}
r
.
resultElement
.
values
.
Q_GuideTech
=
cQ
[
0
]
*
Math
.
pow
(
this
.
prms
.
Y
.
v
/
hdk
,
cQ
[
1
])
*
Math
.
pow
(
this
.
prms
.
If
.
v
,
cQ
[
2
])
*
Math
.
pow
(
this
.
prms
.
C
.
v
,
cQ
[
3
])
*
Math
.
sqrt
(
MacroRugo
.
g
*
hdk
)
*
hdk
*
this
.
prms
.
B
.
v
;
if
(
r
.
resultElement
.
values
.
ENUM_MacroRugoFlowType
!==
MacroRugoFlowType
.
SUBMERGED
)
{
r
.
resultElement
.
values
.
V_GuideTech
=
cV
[
0
]
*
Math
.
pow
(
this
.
prms
.
Y
.
v
/
this
.
prms
.
PBD
.
v
,
cV
[
1
])
*
Math
.
pow
(
this
.
prms
.
If
.
v
,
cV
[
2
])
*
Math
.
sqrt
(
MacroRugo
.
g
*
this
.
prms
.
PBD
.
v
);
}
if
(
this
.
prms
.
Y
.
v
>
0
&&
this
.
prms
.
If
.
v
>
0
)
{
r
.
resultElement
.
values
.
Strickler
=
this
.
prms
.
Q
.
V
/
(
Math
.
pow
(
this
.
prms
.
Y
.
v
,
5
/
3
)
*
this
.
prms
.
B
.
v
*
Math
.
pow
(
this
.
prms
.
If
.
v
,
0.5
));
...
...
@@ -170,8 +163,6 @@ export class MacroRugo extends Nub {
protected
setResultsFamilies
()
{
this
.
_resultsFamilies
=
{
ZF2
:
ParamFamily
.
ELEVATIONS
,
Q_GuideTech
:
ParamFamily
.
FLOWS
,
V_GuideTech
:
ParamFamily
.
SPEEDS
,
Vdeb
:
ParamFamily
.
SPEEDS
,
Vmax
:
ParamFamily
.
SPEEDS
};
...
...
src/macrorugo/macrorugo_compound.ts
View file @
75f9b340
...
...
@@ -88,7 +88,6 @@ export class MacrorugoCompound extends MacroRugo implements Observer {
public
Equation
(
sVarCalc
:
string
):
Result
{
let
QT
:
number
=
0
;
let
QGTT
:
number
=
0
;
let
B
:
number
=
0
;
for
(
const
child
of
this
.
children
)
{
child
.
Calc
(
sVarCalc
);
...
...
@@ -98,11 +97,8 @@ export class MacrorugoCompound extends MacroRugo implements Observer {
// la cote de fond aval n'a pas de sens dans la MR-Complexe car on
// ne précise pas la longueur
delete
child
.
result
.
values
.
ZF2
;
// débit total selon le guide technique
QGTT
+=
child
.
result
.
values
.
Q_GuideTech
;
}
const
res
=
new
Result
(
QT
);
res
.
resultElement
.
values
.
Q_GuideTech
=
QGTT
;
return
res
;
}
...
...
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