fix unit conversion and wrong nominal conditions for second operation…

… mode, and plot script
ibpsa · Nov 8, 2023 · a013d94 · a013d94
1 parent 9b916ae
commit a013d94
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 18 deletions.
diff --git a/IBPSA/Fluid/Chillers/ModularReversible/Examples/ReversibleCarnotWithLosses.mo b/IBPSA/Fluid/Chillers/ModularReversible/Examples/ReversibleCarnotWithLosses.mo
@@ -16,7 +16,8 @@ model ReversibleCarnotWithLosses
       safCtrPar(
       minOffTime=100,
       use_maxCycRat=false,
-      tabUppHea=[-10,40; 60,40],
+      tabUppHea=[263.15,313.15; 333.15,313.15],
+      tabLowCoo=[263.15,283.15; 333.15,283.15],
       use_TUseOut=true),
     TCon_nominal=313.15,
     dpCon_nominal(displayUnit="Pa") = 6000,

diff --git a/IBPSA/Fluid/Chillers/ModularReversible/ModularReversible.mo b/IBPSA/Fluid/Chillers/ModularReversible/ModularReversible.mo
@@ -38,12 +38,13 @@ model ModularReversible
     IBPSA.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.BaseClasses.PartialHeatPumpCycle(
        final QUse_flow_nominal=QHea_flow_nominal,
        final scaFac=scaFac,
-       final TCon_nominal=TEva_nominal,
-       final TEva_nominal=TCon_nominal,
-       final dTCon_nominal=dTEva_nominal,
-       final dTEva_nominal=dTCon_nominal,
-       final mCon_flow_nominal=mEva_flow_nominal,
-       final mEva_flow_nominal=mCon_flow_nominal,
+       final PEle_nominal=refCyc.refCycChiCoo.PEle_nominal,
+       final TCon_nominal=TCon_nominal,
+       final TEva_nominal=TEva_nominal,
+       final dTCon_nominal=dTCon_nominal,
+       final dTEva_nominal=dTEva_nominal,
+       final mCon_flow_nominal=mCon_flow_nominal,
+       final mEva_flow_nominal=mEva_flow_nominal,
        final y_nominal=y_nominal)
   "Refrigerant cycle module for the heating mode"
     annotation (Dialog(enable=use_rev),choicesAllMatching=true);

diff --git a/IBPSA/Fluid/Chillers/ModularReversible/RefrigerantCycle/ConstantQualityGrade.mo b/IBPSA/Fluid/Chillers/ModularReversible/RefrigerantCycle/ConstantQualityGrade.mo
@@ -2,7 +2,7 @@ within IBPSA.Fluid.Chillers.ModularReversible.RefrigerantCycle;
 model ConstantQualityGrade "Carnot EER with a constant qualtiy grade"
   extends
     IBPSA.Fluid.Chillers.ModularReversible.RefrigerantCycle.BaseClasses.PartialChillerCycle(
-      final PEle_nominal=QUse_flow_nominal/(quaGra*(TEva_nominal - TAppEva_nominal)
+      PEle_nominal=QUse_flow_nominal/(quaGra*(TEva_nominal - TAppEva_nominal)
           *y_nominal)*(TCon_nominal + TAppCon_nominal - TEva_nominal -
           TAppEva_nominal),
       QUseNoSca_flow_nominal=QUse_flow_nominal,

diff --git a/IBPSA/Fluid/Chillers/ModularReversible/RefrigerantCycle/TableData2D.mo b/IBPSA/Fluid/Chillers/ModularReversible/RefrigerantCycle/TableData2D.mo
@@ -6,7 +6,7 @@ model TableData2D
     final datSou=datTab.devIde,
     mEva_flow_nominal=datTab.mEva_flow_nominal*scaFac,
     mCon_flow_nominal=datTab.mCon_flow_nominal*scaFac,
-    final PEle_nominal=Modelica.Blocks.Tables.Internal.getTable2DValueNoDer2(
+    PEle_nominal=Modelica.Blocks.Tables.Internal.getTable2DValueNoDer2(
         tabIdePEle,
         TCon_nominal,
         TEva_nominal) * scaFac,

diff --git a/IBPSA/Fluid/Chillers/ModularReversible/ReversibleCarnotWithLosses.mo b/IBPSA/Fluid/Chillers/ModularReversible/ReversibleCarnotWithLosses.mo
@@ -23,8 +23,6 @@ model ReversibleCarnotWithLosses
         useAirForCon=cpCon < 1500,
         useAirForEva=cpEva < 1500,
         quaGra=quaGra),
-    use_evaCap,
-    use_conCap,
     redeclare model RefrigerantCycleInertia =
         IBPSA.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.Inertias.VariableOrder
         (

diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/Controls/Safety/Data/Wuellhorst2021.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/Controls/Safety/Data/Wuellhorst2021.mo
@@ -2,7 +2,7 @@ within IBPSA.Fluid.HeatPumps.ModularReversible.Controls.Safety.Data;
 record Wuellhorst2021
   "Apply the default values according to the conference publication by Wuellhorst et al. (2021)"
   extends Generic(
-    tabLowCoo=[-10,10; 60,10],
+    tabLowCoo=[263.15,283.15; 333.15,283.15],
     dTHysAntFre=2,
     preYSet_start=false,
     ySetRed=0.3,
@@ -16,7 +16,7 @@ record Wuellhorst2021
     use_antFre=false,
     dTHysOpeEnv=5,
     use_opeEnv=true,
-    tabUppHea=[-40,70; 40,70],
+    tabUppHea=[233.15,343.15; 313.15,343.15],
     maxCycRat=3,
     minOffTime=1200,
     minOnTime=600);

diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/ModularReversible.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/ModularReversible.mo
@@ -33,8 +33,9 @@ model ModularReversible
     IBPSA.Fluid.Chillers.ModularReversible.RefrigerantCycle.BaseClasses.PartialChillerCycle(
        final QUse_flow_nominal=refCyc.refCycHeaPumCoo.QUseNoSca_flow_nominal,
        final scaFac=scaFac,
-       final TCon_nominal=TEva_nominal,
-       final TEva_nominal=TCon_nominal,
+       final PEle_nominal=refCyc.refCycHeaPumHea.PEle_nominal,
+       final TCon_nominal=TCon_nominal,
+       final TEva_nominal=TEva_nominal,
        final dTCon_nominal=dTCon_nominal,
        final dTEva_nominal=dTEva_nominal,
        final mCon_flow_nominal=mCon_flow_nominal,

diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/ConstantQualityGrade.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/ConstantQualityGrade.mo
@@ -2,7 +2,7 @@ within IBPSA.Fluid.HeatPumps.ModularReversible.RefrigerantCycle;
 model ConstantQualityGrade "Carnot COP with a constant qualtiy grade"
   extends
     IBPSA.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.BaseClasses.PartialHeatPumpCycle(
-      final PEle_nominal=QUse_flow_nominal/(quaGra*(TCon_nominal + TAppCon_nominal)
+      PEle_nominal=QUse_flow_nominal/(quaGra*(TCon_nominal + TAppCon_nominal)
           *y_nominal)*(TCon_nominal + TAppCon_nominal - TEva_nominal -
           TAppEva_nominal),
       QUseNoSca_flow_nominal=QUse_flow_nominal,

diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/TableData2D.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/TableData2D.mo
@@ -5,7 +5,7 @@ model TableData2D "Performance data based on condenser outlet and evaporator inl
     final datSou=datTab.devIde,
     mEva_flow_nominal=datTab.mEva_flow_nominal*scaFac,
     mCon_flow_nominal=datTab.mCon_flow_nominal*scaFac,
-    final PEle_nominal=Modelica.Blocks.Tables.Internal.getTable2DValueNoDer2(
+    PEle_nominal=Modelica.Blocks.Tables.Internal.getTable2DValueNoDer2(
         tabIdePEle,
         TCon_nominal,
         TEva_nominal) * scaFac,

diff --git a/...ola/Fluid/HeatPumps/ModularReversible/Examples/LargeScaleWaterToWater_OneRoomRadiator.mos b/...ola/Fluid/HeatPumps/ModularReversible/Examples/LargeScaleWaterToWater_OneRoomRadiator.mos
@@ -43,4 +43,4 @@ createPlot(id = 1,
  subPlot = 3,
  leftTitleType = 1,
  bottomTitleType = 1,
- colors = {{0, 0, 255}, {255, 0, 0}});
+ colors = {{0, 0, 255}});