move model

ibpsa · Jan 16, 2024 · 43a1c30 · 43a1c30
1 parent 857475a
commit 43a1c30
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/...rigerantCycle/BaseClasses/CalculateCOP.mo → ...rsible/BaseClasses,CalculateEfficiency.mo b/...rigerantCycle/BaseClasses/CalculateCOP.mo → ...rsible/BaseClasses,CalculateEfficiency.mo
@@ -1,5 +1,5 @@
-within IBPSA.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.BaseClasses;
-model CalculateCOP
+within IBPSA.Fluid.HeatPumps.ModularReversible;
+model BaseClasses,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 CalculateCOP;
+end BaseClasses,CalculateEfficiency;
diff --git a/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/PartialReversibleRefrigerantMachine.mo b/IBPSA/Fluid/HeatPumps/ModularReversible/BaseClasses/PartialReversibleRefrigerantMachine.mo
@@ -368,7 +368,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.RefrigerantCycle.BaseClasses.CalculateCOP
+  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/RefrigerantCycle/BaseClasses/package.order b/IBPSA/Fluid/HeatPumps/ModularReversible/RefrigerantCycle/BaseClasses/package.order
@@ -1,4 +1,3 @@
-CalculateCOP
 NoHeating
 PartialCarnot
 PartialHeatPumpCycle

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