Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Corrected the use of displayUnit #1827

Merged
merged 1 commit into from
Jan 16, 2024
+4 −4
Merged

Corrected the use of displayUnit #1827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion IBPSA/Fluid/Movers/Data/Generic.mo
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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