fix heating carnot and change table values for heat pump

ibpsa · Nov 14, 2023 · bf879c6 · bf879c6
1 parent 8a57a87
commit bf879c6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/PartialCarnot.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/PartialCarnot.mo
@@ -91,7 +91,7 @@ protected
     swiPEle.y + swiQUse.y else swiQUse.y
     "Condenser heat flow rate";
   Modelica.Units.SI.HeatFlowRate QEva_flow_internal = if useForChi then
-    swiQUse.y else swiPEle.y + swiQUse.y
+    swiQUse.y else swiQUse.y - swiPEle.y
      "Evaporator heat flow rate";
 
 equation

diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Validation/Comparative/TableData2D.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Validation/Comparative/TableData2D.mo
@@ -6,17 +6,17 @@ model TableData2D "Validation case for table data approach"
     heaPum(redeclare model RefrigerantCycleHeatPumpHeating =
           IBPSA.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.TableData2D (
             datTab(
-            tabPEle=[0,288.15,298.15; 293.15,14122.8,14122.8; 303.15,14122.8,
-                14122.8],
+            tabPEle=[0,288.15,298.15; 293.15,12375.1,12375.1; 303.15,12375.1,
+                12375.1],
             mCon_flow_nominal=m1_flow_nominal,
             mEva_flow_nominal=m2_flow_nominal,
             dpCon_nominal=0,
             dpEva_nominal=0,
             devIde="CarnotTableData",
             use_TEvaOutForTab=false,
             use_TConOutForTab=false,
-            tabQCon_flow=[0,288.15,298.15; 293.15,49622.5,0; 303.15,44122.8,
-                50343.6],
+            tabQCon_flow=[0,288.15,298.15; 293.15,34084.9,0; 303.15,30000,34620],
+
             tabUppBou=[273.15,273.15; 273.15,273.15],
             use_TEvaOutForOpeEnv=false,
             use_TConOutForOpeEnv=false))));