Skip to content

Commit 2622f9f

Browse files
authored
Corrected conditions to disable output connectors (lbl-srg#4124)
* corrected conditions for disabling connectors * added revision note
1 parent ca1e43f commit 2622f9f

1 file changed

Lines changed: 10 additions & 4 deletions

File tree

Buildings/Fluid/HeatPumps/ModularReversible/BaseClasses/PartialReversibleRefrigerantMachine.mo

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -367,10 +367,10 @@ partial model PartialReversibleRefrigerantMachine
367367
final unit="W") "Actual cooling heat flow rate removed from fluid 2"
368368
annotation (Placement(transformation(extent={{140,-140},{160,-120}}),
369369
iconTransformation(extent={{100,-100},{120,-80}})));
370-
Modelica.Blocks.Interfaces.RealOutput EER(unit="1") if use_EER
370+
Modelica.Blocks.Interfaces.RealOutput EER(unit="1") if use_EER and calEff
371371
"Energy efficieny ratio" annotation (Placement(transformation(extent={{140,-40},
372372
{160,-20}}), iconTransformation(extent={{100,-40},{120,-20}})));
373-
Modelica.Blocks.Interfaces.RealOutput COP(unit="1") if use_COP
373+
Modelica.Blocks.Interfaces.RealOutput COP(unit="1") if use_COP and calEff
374374
"Coefficient of performance" annotation (Placement(transformation(extent={{140,
375375
20},{160,40}}), iconTransformation(extent={{100,20},{120,40}})));
376376

@@ -649,12 +649,12 @@ equation
649649
Text(
650650
extent={{72,40},{96,16}},
651651
textColor={0,0,127},
652-
visible=use_COP,
652+
visible=use_COP and calEff,
653653
textString="COP"),
654654
Text(
655655
extent={{72,-18},{96,-42}},
656656
textColor={0,0,127},
657-
visible=use_EER,
657+
visible=use_EER and calEff,
658658
textString="EER"),
659659
Rectangle(
660660
extent={{34,42},{38,-46}},
@@ -691,6 +691,12 @@ equation
691691
fillPattern=FillPattern.Solid)}),
692692
Diagram(coordinateSystem(extent={{-140,-160},{140,160}})),
693693
Documentation(revisions="<html><ul>
694+
<li>
695+
<i>February 27, 2025</i> by Jianjun Hu:<br/>
696+
Corrected conditions for removing COP and EER output connector.<br/>
697+
This is for
698+
<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1979\">IBPSA #1979</a>.
699+
</li>
694700
<li>
695701
<i>August 19, 2024</i> by Michael Wetter:<br/>
696702
Changed markup commands for code merge.<br/>

0 commit comments

Comments
 (0)