Skip to content

Commit

Permalink
Corrected the use of displayUnit
Browse files Browse the repository at this point in the history
For #1826
  • Loading branch information
mwetter committed Jan 15, 2024
1 parent 8c89af8 commit 907890b
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion IBPSA/Fluid/Movers/Data/Generic.mo
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ record Generic "Generic data record for movers"
parameter Boolean motorCooledByFluid=true
"If true, then motor heat is added to fluid stream"
annotation(Dialog(group="Motor heat rejection"));
parameter Modelica.Units.SI.Power WMot_nominal(final displayUnit="W")=
parameter Modelica.Units.SI.Power WMot_nominal=
if max(power.P)>Modelica.Constants.eps
then
if powerOrEfficiencyIsHydraulic
Expand Down
2 changes: 1 addition & 1 deletion IBPSA/Fluid/Movers/FlowControlled_dp.mo
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ model FlowControlled_dp

Modelica.Blocks.Interfaces.RealInput dpMea(
final quantity="PressureDifference",
final displayUnit="Pa",
displayUnit="Pa",
final unit="Pa")=gain.u if prescribeSystemPressure
"Measurement of pressure difference between two points where the set point should be obtained"
annotation (Placement(transformation(
Expand Down
4 changes: 2 additions & 2 deletions IBPSA/Obsolete/Fluid/Movers/Data/Generic.mo
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ record Generic "Generic data record for movers"
* pressure.dp[end])
else 0
"Volume flow rate on the curve when pressure rise is zero";
parameter Modelica.Units.SI.PressureDifference dpMax=
parameter Modelica.Units.SI.PressureDifference dpMax(displayUnit="Pa")=
if havePressureCurve
then (pressure.dp[1]
-(pressure.dp[1] - pressure.dp[2])
Expand Down Expand Up @@ -97,7 +97,7 @@ record Generic "Generic data record for movers"
parameter Boolean motorCooledByFluid=true
"If true, then motor heat is added to fluid stream"
annotation(Dialog(group="Motor heat rejection"));
parameter Modelica.Units.SI.Power WMot_nominal(final displayUnit="W")=
parameter Modelica.Units.SI.Power WMot_nominal=
if max(power.P)>Modelica.Constants.eps
then
if powerOrEfficiencyIsHydraulic
Expand Down

0 comments on commit 907890b

Please sign in to comment.