Merge pull request #1980 from ibpsa/issue1979_disableCOPEER

Corrected conditions for removing connectors
ibpsa · Feb 28, 2025 · 8fd2cb0 · 8fd2cb0
2 parents e6de2f3 + 398a093
commit 8fd2cb0
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/PartialReversibleRefrigerantMachine.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/PartialReversibleRefrigerantMachine.mo
@@ -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}})));
 
@@ -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}},
@@ -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/>