From a4b966a6fdd0370e8a4d625db59140aec6ef5f22 Mon Sep 17 00:00:00 2001 From: JayHuLBL Date: Thu, 27 Feb 2025 11:17:41 -0800 Subject: [PATCH 1/2] corrected conditions for removing connectors --- .../PartialReversibleRefrigerantMachine.mo | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/PartialReversibleRefrigerantMachine.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/PartialReversibleRefrigerantMachine.mo index 00136bb3a8..fe8c73cce1 100644 --- 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="