Fix dimension error of PumpCharacteristics.linearPower (modelica#4259)

AHaumer · Jan 18, 2024 · 43e203e · 43e203e
1 parent da81bb7
commit 43e203e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/Modelica/Fluid/Machines.mo b/Modelica/Fluid/Machines.mo
@@ -739,7 +739,7 @@ provided a two-phase medium model is used (see Advanced tab).
   W_nominal[2] = c[1] + V_flow_nominal[2]*c[2];
   */
       protected
-      Real c[2] = Modelica.Math.Matrices.solve([ones(3),V_flow_nominal],W_nominal)
+      Real c[2] = Modelica.Math.Matrices.solve([ones(2),V_flow_nominal],W_nominal)
           "Coefficients of linear power consumption curve";
     algorithm
       consumption := c[1] + V_flow*c[2];

diff --git a/ModelicaTest/Fluid/TestComponents/Machines/TestLinearPower.mo b/ModelicaTest/Fluid/TestComponents/Machines/TestLinearPower.mo
@@ -0,0 +1,9 @@
+within ModelicaTest.Fluid.TestComponents.Machines;
+model TestLinearPower
+  extends Modelica.Icons.Example;
+  Modelica.Units.SI.Power p;
+equation
+  p = Modelica.Fluid.Machines.BaseClasses.PumpCharacteristics.linearPower(V_flow_nominal={1,2}, W_nominal={3,5}, V_flow=11);
+  assert(p >= 23 and p <= 23, "Error in linearPower");
+annotation(experiment(StopTime=1));
+end TestLinearPower;
diff --git a/ModelicaTest/Fluid/TestComponents/Machines/package.order b/ModelicaTest/Fluid/TestComponents/Machines/package.order
@@ -12,3 +12,4 @@ TestWaterPumpNPSH
 TestWaterPumpPowerCharacteristic
 TestWaterPumpRecirculation
 TestWaterPumpVariableSpeed
+TestLinearPower
diff --git a/...eference/ModelicaTest/Fluid/TestComponents/Machines/TestLinearPower/comparisonSignals.txt b/...eference/ModelicaTest/Fluid/TestComponents/Machines/TestLinearPower/comparisonSignals.txt
@@ -0,0 +1,2 @@
+time
+p