RWTH-EBC · FWuellhorst · Jul 18, 2024 · Jan 27, 2022 · Jan 27, 2022 · Jan 27, 2022
diff --git a/AixLib/DataBase/Storage/Generic_New_2000l.mo b/AixLib/DataBase/Storage/Generic_New_2000l.mo
@@ -1,6 +1,6 @@
 within AixLib.DataBase.Storage;
 record Generic_New_2000l "Pseudo storage with 2000 l (standing)"
-  extends BufferStorageBaseDataDefinition(
+  extends StorageDetailedBaseDataDefinition(
     hTank=2.145,
     hLowerPortDemand=0.1,
     hUpperPortDemand=2.1,

diff --git a/...torage/BufferStorageBaseDataDefinition.mo → ...rage/StorageDetailedBaseDataDefinition.mo b/...torage/BufferStorageBaseDataDefinition.mo → ...rage/StorageDetailedBaseDataDefinition.mo
@@ -1,5 +1,5 @@
 within AixLib.DataBase.Storage;
-record BufferStorageBaseDataDefinition
+record StorageDetailedBaseDataDefinition
   "Base data definition for Buffer storage records"
   extends Modelica.Icons.Record;
 ///////////input parameters////////////
@@ -72,4 +72,4 @@ record BufferStorageBaseDataDefinition
   </li>
 </ul>
 </html>"));
-end BufferStorageBaseDataDefinition;
+end StorageDetailedBaseDataDefinition;
diff --git a/AixLib/DataBase/Storage/package.order b/AixLib/DataBase/Storage/package.order
@@ -1,2 +1,2 @@
-BufferStorageBaseDataDefinition
+StorageDetailedBaseDataDefinition
 Generic_New_2000l
diff --git a/AixLib/Fluid/Examples/GeothermalHeatPump/BaseClasses/GeothermalHeatPumpBase.mo b/AixLib/Fluid/Examples/GeothermalHeatPump/BaseClasses/GeothermalHeatPumpBase.mo
@@ -16,7 +16,7 @@ partial model GeothermalHeatPumpBase
     AixLib.Fluid.Interfaces.PartialTwoPort
     annotation (Placement(transformation(extent={{108,-56},{120,-44}})));
 
-  Storage.BufferStorage
+  Storage.StorageDetailed
                   coldStorage(
     redeclare package Medium = Medium,
     redeclare package MediumHC1 = Medium,
@@ -86,7 +86,7 @@ partial model GeothermalHeatPumpBase
         extent={{-6,-7},{6,7}},
         rotation=90,
         origin={-60,1})));
-  Storage.BufferStorage
+  Storage.StorageDetailed
                   heatStorage(
     redeclare package Medium = Medium,
     redeclare package MediumHC1 = Medium,
@@ -286,12 +286,12 @@ equation
   connect(heatPump.port_b2, coldStorage.portHC1Out) annotation (Line(points={{
           -33.5,-8.00002},{-33.5,-22},{16,-22},{16,7.42},{23.825,7.42}}, color=
           {0,127,255}));
-  connect(pumpEvaporator.port_a, coldStorage.portHC1In) annotation (Line(points
-        ={{14,36},{18,36},{18,12.69},{23.65,12.69}}, color={0,127,255}));
-  connect(pumpCondenser.port_a, heatStorage.portHC1Out) annotation (Line(points
-        ={{6,-98},{16,-98},{16,-74.58},{23.825,-74.58}}, color={0,127,255}));
-  connect(heatPump.port_b1, heatStorage.portHC1In) annotation (Line(points={{
-          -16.5,20},{8,20},{8,-69.31},{23.65,-69.31}}, color={0,127,255}));
+  connect(pumpEvaporator.port_a, coldStorage.portHC1In) annotation (Line(points=
+         {{14,36},{18,36},{18,12.69},{23.65,12.69}}, color={0,127,255}));
+  connect(pumpCondenser.port_a, heatStorage.portHC1Out) annotation (Line(points=
+         {{6,-98},{16,-98},{16,-74.58},{23.825,-74.58}}, color={0,127,255}));
+  connect(heatPump.port_b1, heatStorage.portHC1In) annotation (Line(points={{-16.5,
+          20},{8,20},{8,-69.31},{23.65,-69.31}},       color={0,127,255}));
   connect(heatStorage.fluidportTop2, pumpHeatConsumer.port_a) annotation (Line(
         points={{42.375,-61.83},{42.375,-50},{58,-50}}, color={0,127,255}));
   connect(resistanceHeatConsumerReturn.port_b, heatStorage.fluidportBottom2)

diff --git a/AixLib/Fluid/Storage/Examples/BufferStorage.mo b/AixLib/Fluid/Storage/Examples/BufferStorage.mo
@@ -6,7 +6,7 @@ model BufferStorage
   replaceable package Medium =
      Modelica.Media.Water.ConstantPropertyLiquidWater
      constrainedby Modelica.Media.Interfaces.PartialMedium;
-  AixLib.Fluid.Storage.BufferStorage bufferStorage(
+  AixLib.Fluid.Storage.StorageDetailed bufferStorage(
     energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
     massDynamics=Modelica.Fluid.Types.Dynamics.SteadyStateInitial,
     m1_flow_nominal=const.k,

diff --git a/AixLib/Fluid/Storage/Examples/StorageBoiler.mo b/AixLib/Fluid/Storage/Examples/StorageBoiler.mo
@@ -7,8 +7,7 @@ model StorageBoiler
      Modelica.Media.Water.ConstantPropertyLiquidWater
      constrainedby Modelica.Media.Interfaces.PartialMedium;
 
-  AixLib.Fluid.Storage.BufferStorage
-                               bufferStorage(
+  AixLib.Fluid.Storage.StorageDetailed bufferStorage(
     redeclare package MediumHC1 = Medium,
     redeclare package MediumHC2 = Medium,
     m1_flow_nominal=pipe1.m_flow_nominal,

diff --git a/AixLib/Fluid/Storage/Examples/StorageSolarCollector.mo b/AixLib/Fluid/Storage/Examples/StorageSolarCollector.mo
@@ -5,8 +5,7 @@ model StorageSolarCollector
 
   replaceable package Medium = AixLib.Media.Water;
 
-  AixLib.Fluid.Storage.BufferStorage
-                               bufferStorage(
+  AixLib.Fluid.Storage.StorageDetailed bufferStorage(
     redeclare package MediumHC1 = Medium,
     redeclare package MediumHC2 = Medium,
     m1_flow_nominal=solarThermal.m_flow_nominal,

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,8 +36,9 @@ 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"
-  annotation (choicesAllMatching);
+  replaceable parameter DataBase.Storage.StorageDetailedBaseDataDefinition data
+    constrainedby DataBase.Storage.StorageDetailedBaseDataDefinition
+    "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),
@@ -197,12 +201,14 @@ 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 =
+  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}}),
@@ -212,12 +218,14 @@ model BufferStorage
 /////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}}),
@@ -812,16 +820,16 @@ for i in 2:(n-1) loop
   </li>
 </ul>
 </html>",
-        info="<html><h4>
-  <span style=\"color: #008000\">Overview</span>
-</h4>
+        info="<html><p>
+  <b><span style=\"color: #008000;\">Overview</span></b>
+</p>
+<p>
+  Detailed thermal energy storage model with optional heating rod and
+  two heating coils based on a pipe model.
+</p>
 <p>
-  Buffer Storage Model with support for heating rod and two heating
-  coils.
+  <b><span style=\"color: #008000;\">Concept</span></b>
 </p>
-<h4>
-  <span style=\"color: #008000\">Concept</span>
-</h4>
 <p>
   It represents a buffer storage stratified into n layers where 1
   represents the bottom layer and n represents the top layer. The
@@ -873,22 +881,22 @@ for i in 2:(n-1) loop
   included. Thus external pressure loss models are required for the use
   of the model.
 </p>
-<h4>
-  <span style=\"color: #008000\">Sources</span>
-</h4>
+<p>
+  <b><span style=\"color: #008000;\">Sources</span></b>
+</p>
 <ul>
   <li>R. Viskanta, A. KaraIds: Interferometric observations of the
   temperature structure in water cooled or heated from above.
   <i>Advances in Water Resources,</i> volume 1, 1977, pages 57-69.
   Bibtex-Key [R.VISKANTA1977]
   </li>
 </ul>
-<h4>
-  <span style=\"color: #008000;\">Example Results</span>
-</h4>
+<p>
+  <b><span style=\"color: #008000;\">Example Results</span></b>
+</p>
 <p>
   <a href=
   \"AixLib.Fluid.Storage.Examples.BufferStorageCharging\">AixLib.Fluid.Storage.Examples.BufferStorageCharging</a>
 </p>
 </html>"));
-end BufferStorage;
+end StorageDetailed;