add negative gain for EER calculation input

ibpsa · Jan 6, 2024 · 22b9281 · 22b9281
1 parent e14ec6d
commit 22b9281
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/IBPSA/Fluid/Chillers/ModularReversible/RefrigerantCycle/BaseClasses/PartialChillerCycle.mo b/IBPSA/Fluid/Chillers/ModularReversible/RefrigerantCycle/BaseClasses/PartialChillerCycle.mo
@@ -15,7 +15,11 @@ partial model PartialChillerCycle
   IBPSA.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.BaseClasses.CalculateCOP
     calEER(PEleMin=PEle_nominal*0.1)  if calEff
                                       "Calculate the EER"
-    annotation (Placement(transformation(extent={{-80,-80},{-100,-100}})));
+    annotation (Placement(transformation(extent={{-90,-80},{-110,-100}})));
+  Modelica.Blocks.Math.Gain gain(final k=-1) annotation (Placement(transformation(
+        extent={{-10,-10},{10,10}},
+        rotation=180,
+        origin={-70,-90})));
 equation
   connect(iceFacCal.iceFac, sigBus.iceFacChiMea) annotation (Line(points={{-81.2,-50},
           {-72,-50},{-72,-30},{-110,-30},{-110,120},{1,120}},      color={0,0,
@@ -24,15 +28,17 @@ equation
       index=1,
       extent={{6,3},{6,3}},
       horizontalAlignment=TextAlignment.Left));
-  connect(calEER.COP, sigBus.EER) annotation (Line(points={{-101,-90},{-110,-90},{
-          -110,120},{1,120}},  color={0,0,127}), Text(
+  connect(calEER.COP, sigBus.EER) annotation (Line(points={{-111,-90},{-116,-90},
+          {-116,-30},{-110,-30},{-110,120},{1,120}},
+                               color={0,0,127}), Text(
       string="%second",
       index=1,
       extent={{6,3},{6,3}},
       horizontalAlignment=TextAlignment.Left));
-  connect(calEER.QUse_flow, proRedQEva.y) annotation (Line(points={{-78,-94},{-60,
-          -94},{-60,-108},{-30,-108},{-30,-101}},
-                                               color={0,0,127}));
+  connect(calEER.QUse_flow, gain.y) annotation (Line(points={{-88,-94},{-84,-94},
+          {-84,-90},{-81,-90}}, color={0,0,127}));
+  connect(gain.u, proRedQEva.y) annotation (Line(points={{-58,-90},{-50,-90},{-50,
+          -108},{-30,-108},{-30,-101}}, color={0,0,127}));
   annotation (Documentation(
   info="<html>
 <p>

diff --git a/IBPSA/Fluid/Chillers/ModularReversible/RefrigerantCycle/ConstantCarnotEffectiveness.mo b/IBPSA/Fluid/Chillers/ModularReversible/RefrigerantCycle/ConstantCarnotEffectiveness.mo
@@ -69,8 +69,8 @@ equation
   end if;
   connect(swiQUse.y, proRedQEva.u2) annotation (Line(points={{-50,-1},{-50,-30},{
           -24,-30},{-24,-78}},  color={0,0,127}));
-  connect(calEER.PEle, swiPEle.y) annotation (Line(points={{-78,-86},{-60,-86},{
-          -60,-60},{0,-60},{0,-8},{50,-8},{50,-1}}, color={0,0,127}));
+  connect(calEER.PEle, swiPEle.y) annotation (Line(points={{-88,-86},{-82,-86},{
+          -82,-66},{0,-66},{0,-8},{50,-8},{50,-1}}, color={0,0,127}));
   connect(constNegOne.y, proQUse_flow.u[4]) annotation (Line(points={{-79,30},{
           -68,30},{-68,70},{-50,70},{-50,60}}, color={0,0,127}));
   annotation (Documentation(revisions="<html><ul>

diff --git a/IBPSA/Fluid/Chillers/ModularReversible/RefrigerantCycle/TableData2D.mo b/IBPSA/Fluid/Chillers/ModularReversible/RefrigerantCycle/TableData2D.mo
@@ -71,8 +71,8 @@ equation
       index=1,
       extent={{-6,3},{-6,3}},
       horizontalAlignment=TextAlignment.Right));
-  connect(scaFacTimPel.y, calEER.PEle) annotation (Line(points={{-40,-9},{-40,-26},
-          {-60,-26},{-60,-86},{-78,-86}},                     color={0,0,127}));
+  connect(scaFacTimPel.y, calEER.PEle) annotation (Line(points={{-40,-9},{-40,-70},
+          {-80,-70},{-80,-86},{-88,-86}},                     color={0,0,127}));
 
   if useInChi then
     connect(reaPasThrTConOut.y, tabPEle.u2)