From 907890b6ca931c0c7b76129d651d4c9abf50f10d Mon Sep 17 00:00:00 2001 From: Michael Wetter Date: Mon, 15 Jan 2024 07:55:36 -0800 Subject: [PATCH] Corrected the use of displayUnit For #1826 --- IBPSA/Fluid/Movers/Data/Generic.mo | 2 +- IBPSA/Fluid/Movers/FlowControlled_dp.mo | 2 +- IBPSA/Obsolete/Fluid/Movers/Data/Generic.mo | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/IBPSA/Fluid/Movers/Data/Generic.mo b/IBPSA/Fluid/Movers/Data/Generic.mo index ea043bc64b..f1c70c74e5 100644 --- a/IBPSA/Fluid/Movers/Data/Generic.mo +++ b/IBPSA/Fluid/Movers/Data/Generic.mo @@ -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 diff --git a/IBPSA/Fluid/Movers/FlowControlled_dp.mo b/IBPSA/Fluid/Movers/FlowControlled_dp.mo index 81cd458c00..a61cec66f5 100644 --- a/IBPSA/Fluid/Movers/FlowControlled_dp.mo +++ b/IBPSA/Fluid/Movers/FlowControlled_dp.mo @@ -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( diff --git a/IBPSA/Obsolete/Fluid/Movers/Data/Generic.mo b/IBPSA/Obsolete/Fluid/Movers/Data/Generic.mo index 699411aff4..71ba99f159 100644 --- a/IBPSA/Obsolete/Fluid/Movers/Data/Generic.mo +++ b/IBPSA/Obsolete/Fluid/Movers/Data/Generic.mo @@ -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]) @@ -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