Skip to content

Commit

Permalink
fix comparison #1411
Browse files Browse the repository at this point in the history
  • Loading branch information
fabian.wuellhorst committed Dec 7, 2022
1 parent feb8ebf commit bb87f38
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ model testMaxMinHeightTable
annotation (Placement(transformation(extent={{-11,-10},{9,10}}, rotation=0)));
initial equation
assert(
(sum(abs(param.maxMinHeight)) <> 0),
(sum(abs(param.maxMinHeight)) > 0),
"In a pump model parameter record
parameter matrix 'maxMinHeight' was all zero.",
level=AssertionLevel.error);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,14 @@ model testPumpHeadCalculation
Modelica.Blocks.Sources.RealExpression headNew(y=headFlowSpeedFuncNew(
param.cHQN,
volumeFlowTable.y,
speedTable.y)) if sum(abs(param.cHQN)) <> 0
speedTable.y)) if sum(abs(param.cHQN)) > 0
annotation (Placement(transformation(extent={{-20,10},{0,30}})));

Modelica.Blocks.Sources.RealExpression headNewABC(y=headFlowSpeedFuncNewABC(
{param.cHQN[3,1], param.cHQN[2,2], param.cHQN[1,3]},
volumeFlowTable.y,
speedTable.y)) if sum(abs({param.cHQN[3,1], param.cHQN[2,2],
param.cHQN[1,3]})) <> 0
param.cHQN[1,3]})) > 0
annotation (Placement(transformation(extent={{-20,-30},{0,-10}})));

annotation (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ model testPumpPowerCalculation
Modelica.Blocks.Sources.RealExpression power(y=headFlowSpeedFuncNew(
param.cPQN,
volumeFlowTable.y,
speedTable.y)) if sum(abs(param.cPQN)) <> 0
speedTable.y)) if sum(abs(param.cPQN)) > 0
annotation (Placement(transformation(extent={{-20,10},{0,30}})));

annotation (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,13 @@ model testPumpSpeedCalculation
// Modelica.Blocks.Sources.RealExpression speed(y=speedFlowHeadFunc(
// param.cNQH,
// volumeFlowTable.y,
// headTable.y)) if sum(abs(param.cNQH)) <> 0
// headTable.y)) if sum(abs(param.cNQH)) > 0
// annotation (Placement(transformation(extent={{-20,10},{0,30}})));
Modelica.Blocks.Sources.RealExpression speedABC(y=speedFlowHeadFuncABC(
{param.cHQN[3,1], param.cHQN[2,2], param.cHQN[1,3]},
volumeFlowTable.y,
headTable.y)) if sum(abs({param.cHQN[3,1], param.cHQN[2,2],
param.cHQN[1,3]})) <> 0
param.cHQN[1,3]})) > 0
annotation (Placement(transformation(extent={{-20,-30},{0,-10}})));

annotation (
Expand Down

0 comments on commit bb87f38

Please sign in to comment.