revert wrong move, add Q1 and Q2_flow

ibpsa · Jan 17, 2024 · 0e8ea23 · 0e8ea23
1 parent 43a1c30
commit 0e8ea23
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/...rsible/BaseClasses,CalculateEfficiency.mo → ...rsible/BaseClasses/CalculateEfficiency.mo b/...rsible/BaseClasses,CalculateEfficiency.mo → ...rsible/BaseClasses/CalculateEfficiency.mo
@@ -1,5 +1,5 @@
-within IBPSA.Fluid.HeatPumps.ModularReversible;
-model BaseClasses,CalculateEfficiency
+within IBPSA.Fluid.HeatPumps.ModularReversible.BaseClasses;
+model CalculateEfficiency
   "Calculate the COP or EER of a device"
   extends Modelica.Blocks.Icons.Block;
   parameter Modelica.Units.SI.Power PEleMin(min=Modelica.Constants.eps)
@@ -117,4 +117,4 @@ equation
   avoid division by zero.
 </p>
 </html>"));
-end BaseClasses,CalculateEfficiency;
+end CalculateEfficiency;
diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/PartialReversibleRefrigerantMachine.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/PartialReversibleRefrigerantMachine.mo
@@ -213,6 +213,12 @@ partial model PartialReversibleRefrigerantMachine
   parameter Boolean calEff=true
     "=false to disable efficiency calculation, may speed up the simulation"
     annotation(Dialog(tab="Advanced"));
+
+  Modelica.Units.SI.HeatFlowRate Q1_flow = QCon_flow
+    "Heat transferred into the medium 1";
+  Modelica.Units.SI.HeatFlowRate Q2_flow = QEva_flow
+    "Heat transferred into the medium 2";
+
   IBPSA.Fluid.HeatPumps.ModularReversible.BaseClasses.EvaporatorCondenserWithCapacity con(
     redeclare final package Medium = MediumCon,
     final allowFlowReversal=allowFlowReversalCon,
@@ -368,7 +374,7 @@ partial model PartialReversibleRefrigerantMachine
     "Coefficient of performance" annotation (Placement(transformation(extent={{140,
             20},{160,40}}), iconTransformation(extent={{100,20},{120,40}})));
 
-  IBPSA.Fluid.HeatPumps.ModularReversible.BaseClasses,CalculateEfficiency
+  IBPSA.Fluid.HeatPumps.ModularReversible.BaseClasses.CalculateEfficiency
     eff(PEleMin=PEle_nominal*0.1) if calEff "Calculate efficiencies of device"
     annotation (Placement(transformation(
         extent={{10,10},{-10,-10}},

diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/package.order b/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/package.order
@@ -1,3 +1,4 @@
+CalculateEfficiency
 EvaporatorCondenserWithCapacity
 InflowTemperatureSensor
 LargeScaleWaterToWaterDeclarations

diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/package.order b/IBPSA/Fluid/HeatPumps/ModularReversible/package.order
@@ -1,5 +1,4 @@
 UsersGuide
-BaseClasses,CalculateEfficiency
 LargeScaleWaterToWater
 ModularReversible
 ReversibleAirToWaterTableData2D