diff --git a/IBPSA/Fluid/Chillers/ModularReversible/RefrigerantCycle/BaseClasses/PartialChillerCycle.mo b/IBPSA/Fluid/Chillers/ModularReversible/RefrigerantCycle/BaseClasses/PartialChillerCycle.mo
index 753b82c6a3..60e4b12f71 100644
--- a/IBPSA/Fluid/Chillers/ModularReversible/RefrigerantCycle/BaseClasses/PartialChillerCycle.mo
+++ b/IBPSA/Fluid/Chillers/ModularReversible/RefrigerantCycle/BaseClasses/PartialChillerCycle.mo
@@ -5,7 +5,8 @@ partial model PartialChillerCycle
     IBPSA.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.BaseClasses.PartialRefrigerantCycle;
 
   HeatPumps.ModularReversible.RefrigerantCycle.BaseClasses.CalculateCoefficientOfPerformance
-    calEER(PEleMin=PEle_nominal*0.01) "Calculate the EER"
+    calEER(PEleMin=PEle_nominal*0.01) if calEff
+                                      "Calculate the EER"
     annotation (Placement(transformation(extent={{-80,-60},{-100,-80}})));
 equation
   connect(iceFacCal.iceFac, sigBus.iceFacChiMea) annotation (Line(points={{-79,
@@ -15,8 +16,8 @@ equation
       index=1,
       extent={{6,3},{6,3}},
       horizontalAlignment=TextAlignment.Left));
-  connect(calEER.COP, sigBus.EER) annotation (Line(points={{-101,-70},{-102,-70},
-          {-102,104},{1,104}}, color={0,0,127}), Text(
+  connect(calEER.COP, sigBus.EER) annotation (Line(points={{-101,-70},{-102,-70},{
+          -102,104},{1,104}},  color={0,0,127}), Text(
       string="%second",
       index=1,
       extent={{6,3},{6,3}},
diff --git a/IBPSA/Fluid/Chillers/ModularReversible/RefrigerantCycle/TableData2D.mo b/IBPSA/Fluid/Chillers/ModularReversible/RefrigerantCycle/TableData2D.mo
index 119fdf6b1f..f9bfe4b24a 100644
--- a/IBPSA/Fluid/Chillers/ModularReversible/RefrigerantCycle/TableData2D.mo
+++ b/IBPSA/Fluid/Chillers/ModularReversible/RefrigerantCycle/TableData2D.mo
@@ -8,14 +8,13 @@ model TableData2D
     mCon_flow_nominal=datTab.mCon_flow_nominal*scaFac,
     final PEle_nominal=Modelica.Blocks.Tables.Internal.getTable2DValueNoDer2(
         tabIdePEle,
-        TEva_nominal - 273.15,
-        TCon_nominal - 273.15) * scaFac,
+        TCon_nominal,
+        TEva_nominal) * scaFac,
     QUseNoSca_flow_nominal=
         Modelica.Blocks.Tables.Internal.getTable2DValueNoDer2(
         tabIdeQUse_flow,
-        TCon_nominal - 273.15,
-        TEva_nominal - 273.15),
-    calEER(PEleMin=10));
+        TCon_nominal,
+        TEva_nominal));
   extends
     IBPSA.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.BaseClasses.PartialTableData2D(
     final use_TConOutForTab=datTab.use_TConOutForTab,
diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/PartialHeatPumpCycle.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/PartialHeatPumpCycle.mo
index f598f85fd3..5b8eba8d06 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/PartialHeatPumpCycle.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/PartialHeatPumpCycle.mo
@@ -5,7 +5,7 @@ partial model PartialHeatPumpCycle
   Modelica.Blocks.Math.Feedback feeHeaFloEva
     "Calculates evaporator heat flow with total energy balance" annotation (
       Placement(transformation(extent={{-80,-20},{-60,0}}, rotation=0)));
-  CalculateCoefficientOfPerformance calCOP(PEleMin=PEle_nominal*0.01)
+  CalculateCoefficientOfPerformance calCOP(PEleMin=PEle_nominal*0.01) if calEff
     "Calculate the COP"
     annotation (Placement(transformation(extent={{-80,-60},{-100,-80}})));
 equation
diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/PartialRefrigerantCycle.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/PartialRefrigerantCycle.mo
index f82b03cba9..cc1ec8847e 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/PartialRefrigerantCycle.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/PartialRefrigerantCycle.mo
@@ -35,7 +35,9 @@ partial model PartialRefrigerantCycle
     annotation (Dialog(group="Nominal Design"));
   parameter String datSou=""
     "Indicate where the data is coming from";
-
+  parameter Boolean calEff=true
+    "=false to disable efficiency calculation, may speed up the simulation"
+    annotation(Dialog(tab="Advanced"));
   replaceable IBPSA.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.Frosting.NoFrosting iceFacCal
   constrainedby
     IBPSA.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.Frosting.BaseClasses.PartialIcingFactor
diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/TableData2D.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/TableData2D.mo
index 4e38ed5f98..7f43bf740d 100644
--- a/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/TableData2D.mo
+++ b/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/TableData2D.mo
@@ -7,13 +7,13 @@ model TableData2D "Performance data based on condenser outlet and evaporator inl
     mCon_flow_nominal=datTab.mCon_flow_nominal*scaFac,
     final PEle_nominal=Modelica.Blocks.Tables.Internal.getTable2DValueNoDer2(
         tabIdePEle,
-        TCon_nominal - 273.15,
-        TEva_nominal - 273.15) * scaFac,
+        TCon_nominal,
+        TEva_nominal) * scaFac,
     QUseNoSca_flow_nominal=
         Modelica.Blocks.Tables.Internal.getTable2DValueNoDer2(
         tabIdeQUse_flow,
-        TCon_nominal - 273.15,
-        TEva_nominal - 273.15));
+        TCon_nominal,
+        TEva_nominal));
   extends
     IBPSA.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.BaseClasses.PartialTableData2D(
     final use_TConOutForTab=datTab.use_TConOutForTab,