Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jalhyd
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Cassiopée
jalhyd
Commits
7bcad6db
Commit
7bcad6db
authored
5 years ago
by
David Dorchies
Browse files
Options
Downloads
Patches
Plain Diff
#33
Add ZRAM in results of all PAB cloisons including downstream wall
parent
5871e774
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
spec/pab/pab.spec.ts
+2
-1
2 additions, 1 deletion
spec/pab/pab.spec.ts
src/pab/cloisons.ts
+1
-0
1 addition, 0 deletions
src/pab/cloisons.ts
src/pab/pab.ts
+3
-0
3 additions, 0 deletions
src/pab/pab.ts
with
6 additions
and
1 deletion
spec/pab/pab.spec.ts
+
2
−
1
View file @
7bcad6db
...
...
@@ -96,7 +96,7 @@ function checkPabResults(p: Pab, vCalc: number) {
p
.
CalcSerie
();
// Résultat du calcul principal (Z1 ou Q)
expect
(
p
.
result
.
vCalc
).
toBeCloseTo
(
vCalc
,
2
);
// Résultat Ligne d'eau (Cote de l'eau, P/V, Tmoy dans les 14 bassins)
// Résultat Ligne d'eau (Cote de l'eau, P/V, Tmoy
, DH
dans les 14 bassins)
const
tRef
=
[
[
78.270
,
150.032
,
1.500
,
0.230
],
[
78.040
,
149.932
,
1.501
,
0.230
],
...
...
@@ -116,6 +116,7 @@ function checkPabResults(p: Pab, vCalc: number) {
// Cote de l'eau dernier bassin à l'amont de la cloison aval
expect
(
p
.
downWall
.
result
.
vCalc
).
toBeCloseTo
(
75.077
,
2
);
expect
(
p
.
downWall
.
result
.
extraResults
.
DH
).
toBeCloseTo
(
0.217
,
2
);
expect
(
p
.
downWall
.
result
.
extraResults
.
ZRAM
).
toBeCloseTo
(
73.435
,
2
);
for
(
let
i
=
0
;
i
<
14
;
i
++
)
{
// Cote de l'eau à l'amont de la cloison amont du bassin
expect
(
p
.
children
[
i
].
result
.
vCalc
).
toBeCloseTo
(
tRef
[
i
][
0
],
2
);
...
...
This diff is collapsed.
Click to expand it.
src/pab/cloisons.ts
+
1
−
0
View file @
7bcad6db
...
...
@@ -63,6 +63,7 @@ export class Cloisons extends ParallelStructure {
// Ajout de la cote de radier de bassin
r
.
extraResults
.
ZRMB
=
this
.
prms
.
ZRMB
.
v
;
r
.
extraResults
.
ZRAM
=
this
.
prms
.
ZRAM
.
v
;
// Ajout de ZDV pour les seuils
for
(
let
i
=
0
;
i
<
this
.
structures
.
length
;
i
++
)
{
...
...
This diff is collapsed.
Click to expand it.
src/pab/pab.ts
+
3
−
0
View file @
7bcad6db
...
...
@@ -112,6 +112,9 @@ export class Pab extends Nub {
// Down to up course : water surface calculation
let
Z
:
number
=
this
.
prms
.
Z2
.
v
;
Z
=
this
.
calcCloisonZ1
(
this
.
downWall
,
Z
);
this
.
downWall
.
result
.
extraResults
.
ZRAM
=
this
.
children
[
this
.
children
.
length
-
1
].
prms
.
ZRMB
.
v
-
this
.
children
[
this
.
children
.
length
-
1
].
prms
.
DH
.
v
/
2
;
for
(
let
i
=
this
.
children
.
length
-
1
;
i
>=
0
;
i
--
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment