Skip to content

Commit

Permalink
Merge pull request modelica#3760 from beutlich/fix-assert-msg
Browse files Browse the repository at this point in the history
Fix assert message of Modelica.Fluid.Pipes.BaseClasses.WallFriction.NoFriction.massFlowRate_dp_staticHead
  • Loading branch information
MartinOtter committed Oct 29, 2021
2 parents da13364 + e8e8829 commit af0913b
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions Modelica/Fluid/Pipes.mo
Original file line number Diff line number Diff line change
Expand Up @@ -1907,9 +1907,8 @@ See also <a href=\"modelica://Modelica.Fluid.Pipes.BaseClasses.CharacteristicNum
"Return mass flow rate m_flow as function of pressure loss dp, i.e., m_flow = f(dp), due to wall friction"

algorithm
assert(false, "function massFlowRate_dp (option: from_dp=true)
cannot be used for WallFriction.NoFriction. Use instead
function pressureLoss_m_flow (option: from_dp=false)");
assert(false, "Function cannot be used. Use instead
function pressureLoss_m_flow (option: from_dp=false) for WallFriction.NoFriction.");
annotation (Documentation(info="<html>
</html>"));
Expand All @@ -1929,9 +1928,8 @@ function pressureLoss_m_flow (option: from_dp=false)");
"Return mass flow rate m_flow as function of pressure loss dp, i.e., m_flow = f(dp), due to wall friction and static head"

algorithm
assert(false, "function massFlowRate_dp (option: from_dp=true)
cannot be used for WallFriction.NoFriction. Use instead
function pressureLoss_m_flow (option: from_dp=false)");
assert(false, "Function cannot be used. Use instead
function pressureLoss_m_flow (option: from_dp=false) for WallFriction.NoFriction.");
annotation (Documentation(info="<html>
</html>"));
Expand Down

0 comments on commit af0913b

Please sign in to comment.