Rename storage models #1171 [skip ci]

RWTH-EBC · Jan 27, 2022 · 612b155 · 612b155
1 parent 4bdc81f
commit 612b155
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 18 deletions.
diff --git a/AixLib/Fluid/Storage/BufferStorage.mo → AixLib/Fluid/Storage/StorageDetailed.mo b/AixLib/Fluid/Storage/BufferStorage.mo → AixLib/Fluid/Storage/StorageDetailed.mo
@@ -1,5 +1,5 @@
 within AixLib.Fluid.Storage;
-model BufferStorage
+model StorageDetailed
   "Buffer Storage Model with support for heating rod and two heating coils"
   import SI = Modelica.SIunits;
 
@@ -36,7 +36,8 @@ model BufferStorage
 
   parameter SI.Temperature TStart=298.15 "Start Temperature of fluid" annotation (Dialog(tab="Initialization", group="Storage specific"));
 
-  replaceable parameter DataBase.Storage.BufferStorageBaseDataDefinition data constrainedby DataBase.Storage.BufferStorageBaseDataDefinition "Data record for Storage"
+  replaceable parameter DataBase.Storage.BufferStorageBaseDataDefinition data constrainedby
+    DataBase.Storage.BufferStorageBaseDataDefinition                                                                                         "Data record for Storage"
   annotation (choicesAllMatching);
 
   parameter Integer n(min=3)=5 " Model assumptions Number of Layers";
@@ -139,22 +140,25 @@ model BufferStorage
         extent={{-5,5},{5,-5}},
         rotation=0,
         origin={-80,-80})));
-  Modelica.Fluid.Interfaces.FluidPort_a fluidportTop1(redeclare final package Medium =
-                Medium)
+  Modelica.Fluid.Interfaces.FluidPort_a fluidportTop1(redeclare final package
+      Medium =  Medium)
     "Fluid connector a (positive design flow direction is from port_a to port_b)"
     annotation (Placement(transformation(extent={{-38,92},{-18,110}},rotation=
            0), iconTransformation(extent={{-38,92},{-18,110}})));
-  Modelica.Fluid.Interfaces.FluidPort_a fluidportBottom2(redeclare final package Medium =
+  Modelica.Fluid.Interfaces.FluidPort_a fluidportBottom2(redeclare final
+      package Medium =
                Medium)
     "Fluid connector a (positive design flow direction is from port_a to port_b)"
     annotation (Placement(transformation(extent={{14,-110},{32,-92}},rotation=
            0), iconTransformation(extent={{14,-110},{32,-92}})));
-  Modelica.Fluid.Interfaces.FluidPort_b fluidportBottom1(redeclare final package Medium =
+  Modelica.Fluid.Interfaces.FluidPort_b fluidportBottom1(redeclare final
+      package Medium =
                  Medium)
     "Fluid connector b (positive design flow direction is from port_a to port_b)"
     annotation (Placement(transformation(extent={{-36,-112},{-18,-92}},
           rotation=0), iconTransformation(extent={{-36,-112},{-18,-92}})));
-  Modelica.Fluid.Interfaces.FluidPort_b fluidportTop2(redeclare final package Medium =
+  Modelica.Fluid.Interfaces.FluidPort_b fluidportTop2(redeclare final package
+      Medium =
         Medium)
     "Fluid connector b (positive design flow direction is from port_a to port_b)"
     annotation (Placement(transformation(extent={{14,92},{36,110}},rotation=0),
@@ -166,6 +170,12 @@ model BufferStorage
       "Heat transfer model" annotation (Placement(transformation(extent={{-34,0},
             {-14,20}}, rotation=0)));
 
+  Modelica.Fluid.Interfaces.FluidPort_b portHC1Out(redeclare final package
+      Medium =
+        MediumHC1) if useHeatingCoil1
+    "Fluid connector b (positive design flow direction is from port_a to port_b)"
+    annotation (Placement(transformation(extent={{-90,2},{-70,22}}),
+        iconTransformation(extent={{-88,20},{-74,32}})));
   AixLib.Fluid.MixingVolumes.MixingVolume          layer[n](
     each final energyDynamics=energyDynamics,
     each final massDynamics=massDynamics,
@@ -197,27 +207,25 @@ model BufferStorage
 /////HEATING COIL 1 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////
 
-  Modelica.Fluid.Interfaces.FluidPort_a portHC1In(redeclare final package Medium =
+  Modelica.Fluid.Interfaces.FluidPort_a portHC1In(redeclare final package
+      Medium =
         MediumHC1) if useHeatingCoil1
     "Fluid connector a (positive design flow direction is from port_a to port_b)"
     annotation (Placement(transformation(extent={{-92,36},{-72,56}}),
         iconTransformation(extent={{-90,50},{-74,64}})));
-  Modelica.Fluid.Interfaces.FluidPort_b portHC1Out(redeclare final package Medium =
-        MediumHC1) if useHeatingCoil1
-    "Fluid connector b (positive design flow direction is from port_a to port_b)"
-    annotation (Placement(transformation(extent={{-90,2},{-70,22}}),
-        iconTransformation(extent={{-88,20},{-74,32}})));
 
 //////////////////////////////////////////////////////////////////////////////////////////
 /////HEATING COIL 2 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////
 
-  Modelica.Fluid.Interfaces.FluidPort_a portHC2In(redeclare final package Medium =
+  Modelica.Fluid.Interfaces.FluidPort_a portHC2In(redeclare final package
+      Medium =
         MediumHC2) if useHeatingCoil2
     "Fluid connector a (positive design flow direction is from port_a to port_b)"
     annotation (Placement(transformation(extent={{-92,-30},{-72,-10}}),
         iconTransformation(extent={{-88,-32},{-74,-18}})));
-  Modelica.Fluid.Interfaces.FluidPort_b portHC2Out(redeclare final package Medium =
+  Modelica.Fluid.Interfaces.FluidPort_b portHC2Out(redeclare final package
+      Medium =
         MediumHC2) if useHeatingCoil2
     "Fluid connector b (positive design flow direction is from port_a to port_b)"
     annotation (Placement(transformation(extent={{-92,-68},{-72,-48}}),
@@ -891,4 +899,4 @@ for i in 2:(n-1) loop
   \"AixLib.Fluid.Storage.Examples.BufferStorageCharging\">AixLib.Fluid.Storage.Examples.BufferStorageCharging</a>
 </p>
 </html>"));
-end BufferStorage;
+end StorageDetailed;
diff --git a/AixLib/Fluid/Storage/Storage.mo → AixLib/Fluid/Storage/StorageSimple.mo b/AixLib/Fluid/Storage/Storage.mo → AixLib/Fluid/Storage/StorageSimple.mo
@@ -1,5 +1,6 @@
 within AixLib.Fluid.Storage;
-model Storage
+model StorageSimple
+  "Simplified multi-layer storage model with volumes as heat exchangers without pressure losses"
 
   replaceable package Medium =
      Modelica.Media.Water.ConstantPropertyLiquidWater
@@ -195,4 +196,4 @@ equation
   </li>
 </ul>
 </html>"));
-end Storage;
+end StorageSimple;