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 conditions for removing connectors #1980

Merged
merged 2 commits into from
Feb 28, 2025
Merged

Corrected conditions for removing connectors #1980

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4b966a
corrected conditions for removing connectors
JayHuLBL Feb 27, 2025
398a093
corrected revision date
JayHuLBL Feb 27, 2025
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
14 changes: 10 additions & 4 deletions IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/PartialReversibleRefrigerantMachine.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,10 +367,10 @@ partial model PartialReversibleRefrigerantMachine
final unit="W") "Actual cooling heat flow rate removed from fluid 2"
annotation (Placement(transformation(extent={{140,-140},{160,-120}}),
iconTransformation(extent={{100,-100},{120,-80}})));
Modelica.Blocks.Interfaces.RealOutput EER(unit="1") if use_EER
Modelica.Blocks.Interfaces.RealOutput EER(unit="1") if use_EER and calEff
"Energy efficieny ratio" annotation (Placement(transformation(extent={{140,-40},
{160,-20}}), iconTransformation(extent={{100,-40},{120,-20}})));
Modelica.Blocks.Interfaces.RealOutput COP(unit="1") if use_COP
Modelica.Blocks.Interfaces.RealOutput COP(unit="1") if use_COP and calEff
"Coefficient of performance" annotation (Placement(transformation(extent={{140,
20},{160,40}}), iconTransformation(extent={{100,20},{120,40}})));

Expand Down Expand Up @@ -649,12 +649,12 @@ equation
Text(
extent={{72,40},{96,16}},
textColor={0,0,127},
visible=use_COP,
visible=use_COP and calEff,
textString="COP"),
Text(
extent={{72,-18},{96,-42}},
textColor={0,0,127},
visible=use_EER,
visible=use_EER and calEff,
textString="EER"),
Rectangle(
extent={{34,42},{38,-46}},
Expand Down Expand Up @@ -691,6 +691,12 @@ equation
fillPattern=FillPattern.Solid)}),
Diagram(coordinateSystem(extent={{-140,-160},{140,160}})),
Documentation(revisions="<html><ul>
<li>
<i>February 27, 2025</i> by Jianjun Hu:<br/>
Corrected conditions for removing COP and EER output connector.<br/>
This is for
<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1979\">IBPSA #1979</a>.
</li>
<li>
<i>August 19, 2024</i> by Michael Wetter:<br/>
Changed markup commands for code merge.<br/>
Expand Down