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
Admin message
A compter du 1er avril, attention à vos pipelines :
Nouvelles limitations de Docker Hub
Show more breadcrumbs
Cassiopée
jalhyd
Commits
05ea25e3
Commit
05ea25e3
authored
1 year ago
by
François Grand
Browse files
Options
Downloads
Patches
Plain Diff
fix: remove ERROR_PREBARRAGE_STRUCTURE_ZDV_INF_ZF message when ZDV < ZF
Refs
#353
parent
74272f61
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/pre_barrage/pre-barrage.spec.ts
+0
-12
0 additions, 12 deletions
spec/pre_barrage/pre-barrage.spec.ts
src/prebarrage/pre_barrage.ts
+0
-15
0 additions, 15 deletions
src/prebarrage/pre_barrage.ts
src/util/message.ts
+0
-2
0 additions, 2 deletions
src/util/message.ts
with
0 additions
and
29 deletions
spec/pre_barrage/pre-barrage.spec.ts
+
0
−
12
View file @
05ea25e3
...
...
@@ -674,18 +674,6 @@ describe("Class PreBarrage:", () => {
expect
(
res
.
resultElement
.
log
.
messages
[
0
].
extraVar
.
n
).
toBe
(
"
1
"
);
});
it
(
"
device ZDV < ZF of upstream basin
"
,
()
=>
{
const
pb
=
createPreBarrageTest
();
pb
.
bassins
[
0
].
cloisonsAval
[
0
].
structures
[
0
].
prms
.
ZDV
.
singleValue
=
pb
.
bassins
[
0
].
prms
.
ZF
.
singleValue
-
1
;
const
res
=
pb
.
CalcSerie
();
expect
(
res
.
ok
).
toBe
(
false
);
expect
(
res
.
resultElement
.
log
.
messages
.
length
).
toBe
(
1
);
expect
(
res
.
resultElement
.
log
.
messages
[
0
].
code
).
toBe
(
MessageCode
.
ERROR_PREBARRAGE_STRUCTURE_ZDV_INF_ZF
);
expect
(
res
.
resultElement
.
log
.
messages
[
0
].
extraVar
.
cub
).
toBe
(
"
B1
"
,
"
wall upstream basin
"
);
expect
(
res
.
resultElement
.
log
.
messages
[
0
].
extraVar
.
cdb
).
toBe
(
"
MSG_INFO_LIB_AVAL
"
,
"
wall downstream basin
"
);
expect
(
res
.
resultElement
.
log
.
messages
[
0
].
extraVar
.
ns
).
toBe
(
"
1
"
,
"
structure number in wall
"
);
});
it
(
"
PreBarrage must have at least one path from upstream to downstream
"
,
()
=>
{
const
pb
=
createPreBarrageTest
();
pb
.
bassins
[
0
].
cloisonsAval
[
0
].
bassinAval
=
pb
.
bassins
[
0
];
// nonsense wall having the same basin at upstream and downstream
...
...
This diff is collapsed.
Click to expand it.
src/prebarrage/pre_barrage.ts
+
0
−
15
View file @
05ea25e3
...
...
@@ -502,21 +502,6 @@ export class PreBarrage extends Nub {
res
.
resultElement
.
log
.
add
(
m
);
}
}
// for each device of each wall: is ZDV < ZF of upstream basin ?
for
(
const
b
of
this
.
bassins
)
{
for
(
const
c
of
b
.
cloisonsAval
)
{
for
(
const
s
of
c
.
structures
)
{
if
(
s
.
prms
.
ZDV
.
v
<
b
.
prms
.
ZF
.
v
)
{
const
m
=
new
Message
(
MessageCode
.
ERROR_PREBARRAGE_STRUCTURE_ZDV_INF_ZF
);
m
.
extraVar
.
ns
=
String
(
s
.
findPositionInParent
()
+
1
);
const
desc
=
c
.
description
;
m
.
extraVar
.
cub
=
desc
.
extraVar
.
ub
;
m
.
extraVar
.
cdb
=
desc
.
extraVar
.
db
;
res
.
resultElement
.
log
.
add
(
m
);
}
}
}
}
return
res
;
}
...
...
This diff is collapsed.
Click to expand it.
src/util/message.ts
+
0
−
2
View file @
05ea25e3
...
...
@@ -694,8 +694,6 @@ export enum MessageCode {
/** Pré-barrage : cote de fond du bassin %n% supérieure à la cote de l'eau amont */
WARNING_PREBARRAGE_BASSIN_ZF_SUP_Z1
,
/** Pré-barrage : cote de radier de l'ouvrage %ns% inférieure à la cote de fond du bassin amont de la cloison %cub%-%cdb% */
ERROR_PREBARRAGE_STRUCTURE_ZDV_INF_ZF
}
/**
...
...
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