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
38eacc60
Commit
38eacc60
authored
May 15, 2020
by
Mathias Chouet
🍝
Browse files
Fix
#214
(2) update test
parent
7a097ec3
Changes
3
Hide whitespace changes
Inline
Side-by-side
spec/open-channel/regime_uniforme/regime_uniforme_circ.spec.ts
View file @
38eacc60
...
...
@@ -162,7 +162,7 @@ describe("Class RegimeUniforme / section circulaire :", () => {
});
describe
(
"
en charge −
"
,
()
=>
{
it
(
"
an error should be thrown if
Y > D
"
,
()
=>
{
// @TODO or >= ?
it
(
"
an error should be thrown if
sectionis circular, Y > D and YB >= D
"
,
()
=>
{
const
paramSection
=
new
ParamsSectionCirc
(
2
,
// diamètre
2.1
,
// tirant d'eau
...
...
src/open-channel/regime_uniforme.ts
View file @
38eacc60
...
...
@@ -67,7 +67,11 @@ export class RegimeUniforme extends SectionNub {
}
// Est-ce qu'on est en charge sur une section circulaire ? @see #214
if
(
this
.
section
instanceof
cSnCirc
&&
isGreaterThan
(
this
.
section
.
prms
.
Y
.
v
,
this
.
section
.
prms
.
D
.
v
,
1
e
-
3
))
{
if
(
this
.
section
instanceof
cSnCirc
&&
this
.
section
.
prms
.
YB
.
v
>=
this
.
section
.
prms
.
D
.
v
&&
isGreaterThan
(
this
.
section
.
prms
.
Y
.
v
,
this
.
section
.
prms
.
D
.
v
,
1
e
-
3
)
)
{
this
.
currentResult
=
new
Result
(
new
Message
(
MessageCode
.
ERROR_RU_CIRC_LEVEL_TOO_HIGH
));
return
this
.
result
;
}
...
...
src/util/message.ts
View file @
38eacc60
...
...
@@ -240,7 +240,7 @@ export enum MessageCode {
*/
ERROR_REMOUS_PAS_CALCUL
,
/** RegimeUniforme :
en charge (le tirant d'eau dépasse le diamètre de la
section circulaire) */
/** RegimeUniforme :
impossible de calculer avec uen conduite en charge (
section circulaire) */
ERROR_RU_CIRC_LEVEL_TOO_HIGH
,
/**
...
...
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