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
17adb40b
Commit
17adb40b
authored
4 years ago
by
Mathias Chouet
Committed by
mathias.chouet
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Update PAR Simulation error messages for
nghyd#394
parent
601de70d
Loading
Loading
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/par/par_simulation.ts
+3
-3
3 additions, 3 deletions
src/par/par_simulation.ts
src/util/message.ts
+2
-2
2 additions, 2 deletions
src/util/message.ts
with
5 additions
and
5 deletions
src/par/par_simulation.ts
+
3
−
3
View file @
17adb40b
...
...
@@ -154,7 +154,7 @@ export class ParSimulation extends Par implements Observer {
let
m
:
Message
;
if
(
ZR
.
v
===
undefined
&&
ZD
.
v
===
undefined
)
{
m
=
new
Message
(
MessageCode
.
ERROR_AT_LEAST_ONE_OF_THOSE_MUST_BE_DEFINED
);
m
.
extraVar
.
symbol
s
=
[
ZR
.
symbol
,
ZD
.
symbol
]
.
join
(
"
,
"
)
;
m
.
extraVar
.
variable
s
=
[
ZR
.
symbol
,
ZD
.
symbol
];
}
else
{
// calculate missing value
let
zrDef
=
true
;
...
...
@@ -179,8 +179,8 @@ export class ParSimulation extends Par implements Observer {
expectedZD
=
this
.
parCalc
.
CalcZDFromZR
(
ZR
.
V
);
if
(
!
isEqual
(
ZR
.
v
,
expectedZR
,
1
E
-
3
))
{
m
=
new
Message
(
MessageCode
.
ERROR_PAR_ZR_ZD_MISMATCH
);
m
.
extraVar
.
ZR
=
ZR
.
symbol
;
m
.
extraVar
.
ZD
=
ZD
.
symbol
;
m
.
extraVar
.
var_
ZR
=
ZR
.
symbol
;
m
.
extraVar
.
var_
ZD
=
ZD
.
symbol
;
m
.
extraVar
.
expectedZR
=
expectedZR
;
m
.
extraVar
.
expectedZD
=
expectedZD
;
}
...
...
This diff is collapsed.
Click to expand it.
src/util/message.ts
+
2
−
2
View file @
17adb40b
...
...
@@ -73,7 +73,7 @@ export enum MessageCode {
/** Jet submergé, pente trop faible: pas de solution pour calculer l'abscisse de l'impact */
ERROR_JET_SUBMERGED_NO_SOLUTION
,
/** At least one of the %
symbol
s% variables must be defined */
/** At least one of the %
variable
s% variables must be defined */
ERROR_AT_LEAST_ONE_OF_THOSE_MUST_BE_DEFINED
,
/** PAR - simulation : le nombre de ralentisseurs fourni ne correspond pas aux dimensions de la passe %stdNb% */
...
...
@@ -91,7 +91,7 @@ export enum MessageCode {
/** La valeur %val% de ha sort de l'intervalle de validité [ %min%, %max% ] donné par les abaques */
ERROR_PAR_HA_OUT_OF_RANGE
,
/** Les valeurs de %ZR% et %ZD% ne correspondent pas : soit %ZR% devrait valoir %expectedZR%, soit %ZD% devrait valoir %expectedZD% */
/** Les valeurs de %
var_
ZR% et %
var_
ZD% ne correspondent pas : soit %
var_
ZR% devrait valoir %expectedZR%, soit %
var_
ZD% devrait valoir %expectedZD% */
ERROR_PAR_ZR_ZD_MISMATCH
,
/**
...
...
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