From 6b387a28a7e25e32e97c4e2de2b99796f7696ec3 Mon Sep 17 00:00:00 2001
From: FWuellhorst <fabian.wuellhorst@eonerc.rwth-aachen.de>
Date: Sun, 10 Dec 2023 17:21:01 +0100
Subject: [PATCH] Fix wrong use of y_nominal

---
 .../RefrigerantCycle/ConstantQualityGrade.mo                | 4 ++--
 .../ModularReversible/RefrigerantCycle/TableData2D.mo       | 4 ++--
 .../RefrigerantCycle/ConstantQualityGrade.mo                | 6 +++---
 .../ModularReversible/RefrigerantCycle/TableData2D.mo       | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/IBPSA/Fluid/Chillers/ModularReversible/RefrigerantCycle/ConstantQualityGrade.mo b/IBPSA/Fluid/Chillers/ModularReversible/RefrigerantCycle/ConstantQualityGrade.mo
index bc3b220f4b..e13dbacc48 100644
--- a/IBPSA/Fluid/Chillers/ModularReversible/RefrigerantCycle/ConstantQualityGrade.mo
+++ b/IBPSA/Fluid/Chillers/ModularReversible/RefrigerantCycle/ConstantQualityGrade.mo
@@ -3,7 +3,7 @@ model ConstantQualityGrade "Carnot EER with a constant quality grade"
   extends
     IBPSA.Fluid.Chillers.ModularReversible.RefrigerantCycle.BaseClasses.PartialChillerCycle(
       useInChi=true,
-      PEle_nominal=QUse_flow_nominal/EER_nominal,
+      PEle_nominal=QUse_flow_nominal/EER_nominal/y_nominal,
       QUseNoSca_flow_nominal=QUse_flow_nominal,
       datSou="ConstantQualityGradeCarnot");
   extends
@@ -12,7 +12,7 @@ model ConstantQualityGrade "Carnot EER with a constant quality grade"
      final QEva_flow_nominal=QUse_flow_nominal,
      final QCon_flow_nominal=QUse_flow_nominal+PEle_nominal,
      constPEle(final k=PEle_nominal));
-  parameter Real EER_nominal = quaGra*y_nominal *
+  parameter Real EER_nominal = quaGra *
     (TEva_nominal - TAppEva_nominal) /
     (TCon_nominal + TAppCon_nominal - (TEva_nominal - TAppEva_nominal))
     "Nominal EER";
diff --git a/IBPSA/Fluid/Chillers/ModularReversible/RefrigerantCycle/TableData2D.mo b/IBPSA/Fluid/Chillers/ModularReversible/RefrigerantCycle/TableData2D.mo
index 6857a67adc..73cd1cb28a 100644
--- a/IBPSA/Fluid/Chillers/ModularReversible/RefrigerantCycle/TableData2D.mo
+++ b/IBPSA/Fluid/Chillers/ModularReversible/RefrigerantCycle/TableData2D.mo
@@ -9,12 +9,12 @@ model TableData2D
     PEle_nominal=Modelica.Blocks.Tables.Internal.getTable2DValueNoDer2(
         tabIdePEle,
         TEva_nominal,
-        TCon_nominal) * scaFac,
+        TCon_nominal) * scaFac * y_nominal,
     QUseNoSca_flow_nominal=
         Modelica.Blocks.Tables.Internal.getTable2DValueNoDer2(
         tabIdeQUse_flow,
         TEva_nominal,
-        TCon_nominal));
+        TCon_nominal) * y_nominal);
   extends
     IBPSA.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.BaseClasses.PartialTableData2D(
     final use_TConOutForTab=datTab.use_TConOutForTab,
diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/ConstantQualityGrade.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/ConstantQualityGrade.mo
index 75c31fcb08..7fc6383d49 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/ConstantQualityGrade.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/ConstantQualityGrade.mo
@@ -3,7 +3,7 @@ model ConstantQualityGrade "Carnot COP with a constant quality grade"
   extends
     IBPSA.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.BaseClasses.PartialHeatPumpCycle(
       useInHeaPum=true,
-      PEle_nominal=QUse_flow_nominal / COP_nominal,
+      PEle_nominal=QUse_flow_nominal / COP_nominal / y_nominal,
       QUseNoSca_flow_nominal=QUse_flow_nominal,
       datSou="ConstantQualityGradeCarnot");
   extends
@@ -12,10 +12,10 @@ model ConstantQualityGrade "Carnot COP with a constant quality grade"
      final QEva_flow_nominal=QUse_flow_nominal-PEle_nominal,
      final QCon_flow_nominal=QUse_flow_nominal,
      constPEle(final k=PEle_nominal));
-  parameter Real COP_nominal = quaGra*y_nominal *
+  parameter Real COP_nominal = quaGra *
     (TCon_nominal + TAppCon_nominal) /
     (TCon_nominal + TAppCon_nominal - (TEva_nominal - TAppEva_nominal))
-    "Nominal EER";
+    "Nominal coefficient of performance";
 equation
 
   connect(pasThrYSet.u, sigBus.ySet) annotation (Line(points={{18,70},{0,70},{0,
diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/TableData2D.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/TableData2D.mo
index 7d090e984e..116223082a 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/TableData2D.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/TableData2D.mo
@@ -8,12 +8,12 @@ model TableData2D "Performance data based on condenser outlet and evaporator inl
     PEle_nominal=Modelica.Blocks.Tables.Internal.getTable2DValueNoDer2(
         tabIdePEle,
         TCon_nominal,
-        TEva_nominal) * scaFac,
+        TEva_nominal) * scaFac * y_nominal,
     QUseNoSca_flow_nominal=
         Modelica.Blocks.Tables.Internal.getTable2DValueNoDer2(
         tabIdeQUse_flow,
         TCon_nominal,
-        TEva_nominal));
+        TEva_nominal) * y_nominal);
   extends
     IBPSA.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.BaseClasses.PartialTableData2D(
     final use_TConOutForTab=datTab.use_TConOutForTab,