RWTH-EBC · LauraMaier · Jan 27, 2022 · Jan 27, 2022 · Jan 27, 2022 · Jan 27, 2022
diff --git a/AixLib/DataBase/Storage/BufferStorageBaseDataDefinition.mo b/AixLib/DataBase/Storage/BufferStorageBaseDataDefinition.mo
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/AixLib/DataBase/Storage/StorageDetailedBaseDataDefinition.mo b/AixLib/DataBase/Storage/StorageDetailedBaseDataDefinition.mo
@@ -0,0 +1,75 @@
+within AixLib.DataBase.Storage;
+record StorageDetailedBaseDataDefinition
+  "Base data definition for Buffer storage records"
+  extends Modelica.Icons.Record;
+///////////input parameters////////////
+
+  parameter Modelica.Units.SI.Height hTank "Height of storage";
+  parameter Modelica.Units.SI.Height hLowerPortDemand "Height of lower demand port";
+  parameter Modelica.Units.SI.Height hUpperPortDemand "Height of upper demand port";
+  parameter Modelica.Units.SI.Height hLowerPortSupply "Height of lower supply port";
+  parameter Modelica.Units.SI.Height hUpperPortSupply "Height of upper supply port";
+  parameter Modelica.Units.SI.Height hHC1Up "Height of heating Coil";
+  parameter Modelica.Units.SI.Height hHC1Low "Height of heating Coil";
+  parameter Modelica.Units.SI.Height hHC2Up "Height of heating Coil";
+  parameter Modelica.Units.SI.Height hHC2Low "Height of heating Coil";
+  parameter Modelica.Units.SI.Height hHR "Height of heating Rod";
+  parameter Modelica.Units.SI.Diameter dTank "Inner diameter of storage";
+  parameter Modelica.Units.SI.Length sWall "Thickness of storage Wall";
+  parameter Modelica.Units.SI.Length sIns "Thickness of storage insulation";
+  parameter Modelica.Units.SI.ThermalConductivity lambdaWall
+    "thermal conductivity of storage wall";
+  parameter Modelica.Units.SI.ThermalConductivity lambdaIns
+    "thermal conductivity of storage insulation";
+  parameter Modelica.Units.SI.Length hTS1 "Height of lower temperature sensor";
+  parameter Modelica.Units.SI.Length hTS2 "Height of upper temperature sensor";
+  parameter Modelica.Units.SI.Density rhoIns "Density of insulation";
+  parameter Modelica.Units.SI.SpecificHeatCapacity cIns "Heat capacity of insulation";
+  parameter Modelica.Units.SI.Density rhoWall "Density of wall";
+  parameter Modelica.Units.SI.SpecificHeatCapacity cWall "Heat capacity of wall";
+  parameter Modelica.Units.SI.Length roughness "Inner roughness of storage wall";
+
+  // Heat exchanger Pipes
+
+  parameter DataBase.Pipes.PipeBaseDataDefinition pipeHC1
+    "Type of Pipe for HR1";
+  parameter DataBase.Pipes.PipeBaseDataDefinition pipeHC2
+    "Type of Pipe for HR2";
+
+  parameter Modelica.Units.SI.Length lengthHC1 "Length of Pipe for HR1";
+  parameter Modelica.Units.SI.Length lengthHC2 "Length of Pipe for HR2";
+
+  annotation (Icon(graphics),Documentation(info="<html><h4>
+  <span style=\"color:#008000\">Overview</span>
+</h4>
+<p>
+  Base data definition for detailed storage records
+</p>
+<h4>
+  <span style=\"color:#008000\">References</span>
+</h4>
+<p>
+  Base data definition for record used with
+  <a href=\"modelica://AixLib.Fluid.Storage.StorageDetailed\">AixLib.Fluid.Storage.StorageDetailed</a>
+</p>
+</html>",
+        revisions="<html><ul>
+  <li>
+  <i>November 17, 2022</i> by Laura Maier:<br/>
+  Refactor and fix documentation
+  </li>
+  <li>
+    <i>October 12, 2016&#160;</i> by Marcus Fuchs:<br/>
+    Add comments and fix documentation
+  </li>
+  <li>
+    <i>October 11, 2016&#160;</i> by Sebastian Stinner:<br/>
+    Transferred to AixLib
+  </li>
+  <li>
+    <i>July 4, 2013&#160;</i> by Ole Odendahl:<br/>
+    Added documentation and formatted appropriately
+  </li>
+</ul>
+</html>"));
+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,

diff --git a/AixLib/Fluid/Storage/BaseClasses/PartialHeatTransferLayers.mo b/AixLib/Fluid/Storage/BaseClasses/PartialHeatTransferLayers.mo
@@ -8,7 +8,7 @@ partial model PartialHeatTransferLayers "Partial for storage heat transfer model
       Modelica.Media.Interfaces.PartialMedium "Medium model" annotation(choicesAllMatching);
 
   replaceable parameter
-    AixLib.DataBase.Storage.BufferStorageBaseDataDefinition data=
+    AixLib.DataBase.Storage.StorageDetailedBaseDataDefinition data=
       AixLib.DataBase.Storage.Generic_New_2000l()
       "Storage data record"
     annotation (choicesAllMatching);

diff --git a/AixLib/Fluid/Storage/Examples/StorageBoiler.mo b/AixLib/Fluid/Storage/Examples/StorageBoiler.mo
@@ -1,21 +1,21 @@
 within AixLib.Fluid.Storage.Examples;
 model StorageBoiler
   extends Modelica.Icons.Example;
-  import AixLib;
 
   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,
     redeclare package MediumHC1 = Medium,
     redeclare package MediumHC2 = Medium,
     m1_flow_nominal=pipe1.m_flow_nominal,
     m2_flow_nominal=pipe1.m_flow_nominal,
     mHC1_flow_nominal=pipe1.m_flow_nominal,
     useHeatingCoil2=false,
     useHeatingRod=false,
+    TStart=343.15,
     redeclare AixLib.DataBase.Storage.Generic_New_2000l data(
       hTank=2,
       hUpperPortDemand=1.95,
@@ -27,89 +27,104 @@ model StorageBoiler
     hConIn=1500,
     hConOut=15,
     redeclare package Medium = Medium,
-    hConHC1=300)                       annotation (Placement(transformation(extent={{6,8},{
-            -18,38}})));
-  Modelica.Thermal.HeatTransfer.Sources.FixedTemperature fixedTemperature(T = 283.15) annotation(Placement(transformation(extent={{-56,12},
-            {-36,32}})));
-  AixLib.Obsolete.Year2021.Fluid.Movers.Pump pump(redeclare package Medium = Medium, m_flow_small=1e-4) annotation (Placement(transformation(
-        extent={{-10,-10},{10,10}},
-        rotation=270,
-        origin={6,60})));
-  AixLib.Fluid.Sources.Boundary_pT
-                     boundary_p(nPorts=1, redeclare package Medium = Medium)
-                                annotation(Placement(transformation(extent={{-48,68},
-            {-28,88}})));
-  Modelica.Blocks.Sources.BooleanExpression booleanExpression annotation(Placement(transformation(extent = {{-10, -10}, {10, 10}}, rotation = 180, origin={46,48})));
-  Modelica.Blocks.Sources.Constant const(k = 273.15 + 80) annotation(Placement(transformation(extent = {{-3, -3}, {3, 3}}, rotation = 180, origin={61,67})));
+    hConHC1=300) annotation (Placement(transformation(extent={{6,-14},{-18,16}})));
+  Modelica.Thermal.HeatTransfer.Sources.FixedTemperature fixedTemperature(T = 283.15)
+  annotation(Placement(transformation(extent={{-56,-10},{-36,10}})));
+  AixLib.Fluid.Sources.Boundary_pT boundary_p(redeclare package Medium = Medium,nPorts=1)
+	annotation(Placement(transformation(extent={{-48,46},{-28,66}})));
+  Modelica.Blocks.Sources.Constant SetTemp(k=273.15 + 80) annotation (Placement(
+        transformation(
+        extent={{-7,-7},{7,7}},
+        rotation=180,
+        origin={65,69})));
   AixLib.Fluid.FixedResistances.PressureDrop pipe(
     redeclare package Medium = Medium,
     m_flow_nominal=0.5,
     dp_nominal=200)
-    annotation (Placement(transformation(extent={{12,-12},{32,8}})));
-  AixLib.Fluid.FixedResistances.HydraulicResistance
-                                           hydraulicResistance(zeta = 1000,
+    annotation (Placement(transformation(extent={{18,-34},{38,-14}})));
+  AixLib.Fluid.FixedResistances.HydraulicResistance hydraulicResistance(zeta = 1000,
     redeclare package Medium = Medium,
     diameter=0.05,
-    m_flow_nominal=0.001)                                                   annotation(Placement(transformation(extent={{46,-12},
-            {66,8}})));
-  AixLib.Fluid.Sources.Boundary_ph
-                      boundary_ph1(use_p_in = true, h = 0.8e5,
+    m_flow_nominal=0.001) annotation(Placement(transformation(extent={{46,-34},
+            {66,-14}})));
+  AixLib.Fluid.Sources.Boundary_ph boundary_ph1(use_p_in = true,
+	h = 0.8e5,
     nPorts=1,
-    redeclare package Medium = Medium)                         annotation(Placement(transformation(extent={{-66,-22},
-            {-46,-2}})));
-  Modelica.Blocks.Sources.Ramp ramp(duration = 1000,               height = 0.00001e5,
-    offset=101325)                                                                     annotation(Placement(transformation(extent={{-96,-14},
-            {-76,6}})));
-  AixLib.Fluid.Sources.Boundary_pT
-                      boundary_ph2(nPorts=1, redeclare package Medium = Medium)
-                                                     annotation(Placement(transformation(extent = {{10, -10}, {-10, 10}}, rotation = 180, origin={-38,56})));
+    redeclare package Medium = Medium)
+	annotation(Placement(transformation(extent={{-66,-44},{-46,-24}})));
+  Modelica.Blocks.Sources.Ramp ramp(duration = 1000,
+	height = 0.00001e5,
+    offset=101325) annotation(Placement(transformation(extent={{-96,-36},{-76,-16}})));
+  AixLib.Fluid.Sources.Boundary_pT boundary_ph2(nPorts=1,
+					  redeclare package Medium = Medium)
+					  annotation(Placement(transformation(extent = {{10, -10}, {-10, 10}}, rotation = 180, origin={-38,34})));
   AixLib.Fluid.FixedResistances.PressureDrop pipe1(
     redeclare package Medium = Medium,
     m_flow_nominal=0.5,
     dp_nominal=200)
-    annotation (Placement(transformation(extent={{-36,-22},{-16,-2}})));
+    annotation (Placement(transformation(extent={{-36,-44},{-16,-24}})));
   AixLib.Fluid.HeatExchangers.Heater_T       hea(
     redeclare package Medium = Medium,
     m_flow_nominal=0.01,
     dp_nominal=0)
-    annotation (Placement(transformation(extent={{42,68},{22,88}})));
+    annotation (Placement(transformation(extent={{42,46},{22,66}})));
+  AixLib.Fluid.Movers.FlowControlled_dp pump(redeclare package Medium = Medium,
+    energyDynamics=Modelica.Fluid.Types.Dynamics.SteadyState,
+    T_start=298.15,
+      m_flow_nominal=pipe1.m_flow_nominal,
+    per(pressure(V_flow={0,pipe.m_flow_nominal/1000,pipe.m_flow_nominal/(1000*
+            0.8)}, dp={dpSet.k/0.8,dpSet.k,0}), motorCooledByFluid=false))
+		annotation (Placement(transformation(extent={{10,10},{-10,-10}},rotation=90,origin={2,42})));
+  Modelica.Blocks.Sources.Constant dpSet(k=40000)
+    "Constant set pressure difference for pump" annotation (Placement(
+        transformation(
+        extent={{-7,-7},{7,7}},
+        rotation=180,
+        origin={37,27})));
 equation
-  connect(booleanExpression.y, pump.IsNight) annotation(Line(points={{35,48},{
-          24,48},{24,60},{16.2,60}},                                                                                 color = {255, 0, 255}));
-  connect(pipe.port_b, hydraulicResistance.port_a) annotation(Line(points={{32,-2},
-          {46,-2}},                                                                            color = {0, 127, 255}));
-  connect(ramp.y, boundary_ph1.p_in) annotation(Line(points={{-75,-4},{-68,-4}},        color = {0, 0, 127}));
+  connect(pipe.port_b, hydraulicResistance.port_a) annotation(Line(points={{38,-24},
+          {46,-24}},color = {0, 127, 255}));
+  connect(ramp.y, boundary_ph1.p_in) annotation(Line(points={{-75,-26},{-68,-26}},color = {0, 0, 127}));
   connect(boundary_ph1.ports[1], pipe1.port_a) annotation (Line(
-      points={{-46,-12},{-36,-12}},
+      points={{-46,-34},{-36,-34}},
       color={0,127,255}));
-  connect(boundary_p.ports[1], pump.port_a) annotation (Line(
-      points={{-28,78},{6,78},{6,70}},
-      color={0,127,255}));
-  connect(pump.port_a, hea.port_b) annotation (Line(points={{6,70},{6,70},{6,78},
-          {6,78},{22,78}}, color={0,127,255}));
-  connect(hydraulicResistance.port_b, hea.port_a) annotation (Line(points={{66,
-          -2},{80,-2},{80,78},{42,78}}, color={0,127,255}));
-  connect(const.y, hea.TSet) annotation (Line(points={{57.7,67},{52,67},{52,86},
-          {44,86}}, color={0,0,127}));
+  connect(hydraulicResistance.port_b, hea.port_a) annotation (Line(points={{66,-24},
+          {80,-24},{80,56},{42,56}},    color={0,127,255}));
+  connect(SetTemp.y, hea.TSet) annotation (Line(points={{57.3,69},{52,69},{52,
+          64},{44,64}}, color={0,0,127}));
   connect(boundary_ph2.ports[1], bufferStorage.fluidportTop2) annotation (Line(
-        points={{-28,56},{-9.75,56},{-9.75,38.15}}, color={0,127,255}));
-  connect(bufferStorage.fluidportBottom2, pipe1.port_b) annotation (Line(points=
-         {{-9.45,7.85},{-9.45,-2},{-10,-2},{-10,-12},{-16,-12}}, color={0,127,
+        points={{-28,34},{-9.75,34},{-9.75,16.15}}, color={0,127,255}));
+  connect(bufferStorage.fluidportBottom2, pipe1.port_b) annotation (Line(points={{-9.45,
+          -14.15},{-9.45,-24},{-10,-24},{-10,-34},{-16,-34}},    color={0,127,
           255}));
-  connect(pipe.port_a, bufferStorage.portHC1Out) annotation (Line(points={{12,
-          -2},{14,-2},{14,26.9},{6.15,26.9}}, color={0,127,255}));
-  connect(pump.port_b, bufferStorage.portHC1In) annotation (Line(points={{6,50},
-          {6,44},{12,44},{12,31.55},{6.3,31.55}}, color={0,127,255}));
+  connect(pipe.port_a, bufferStorage.portHC1Out) annotation (Line(points={{18,-24},
+          {18,4.9},{6.15,4.9}},               color={0,127,255}));
   connect(fixedTemperature.port, bufferStorage.heatportOutside) annotation (
-      Line(points={{-36,22},{-28,22},{-28,23.9},{-17.7,23.9}}, color={191,0,0}));
+      Line(points={{-36,0},{-28,0},{-28,1.9},{-17.7,1.9}},     color={191,0,0}));
+  connect(pump.port_b, bufferStorage.portHC1In) annotation (Line(points={{2,32},
+          {2,26},{14,26},{14,9.55},{6.3,9.55}}, color={0,127,255}));
+  connect(pump.port_a, hea.port_b)
+    annotation (Line(points={{2,52},{2,56},{22,56}}, color={0,127,255}));
+  connect(boundary_p.ports[1], pump.port_a) annotation (Line(points={{-28,56},{
+          -18,56},{-18,58},{0,58},{0,52},{2,52}}, color={0,127,255}));
+  connect(dpSet.y, pump.dp_in) annotation (Line(points={{29.3,27},{30,27},{30,
+          28},{24,28},{24,42},{14,42}}, color={0,0,127}));
   annotation (experiment(Tolerance=1e-6, StopTime=86400, Interval=60),
-    Documentation(info = "<html><h4>
-  <span style=\"color:#008000\">Overview</span>
-</h4>
-<p>
-  This is a simple example of a storage and a boiler.
-</p>
-<ul>
+   __Dymola_Commands(file="modelica://AixLib/Resources/Scripts/Dymola/Fluid/Storage/Examples/StorageBoiler.mos" "Simulate and plot"),
+    Documentation(
+    info="<html>
+    <p>
+    This is a simple example of a storage and an ideal heater.<br/> 
+    The ideal heater has a constant supply temperature and supplies heat to a thermal energy water storage.<br/> 
+    The pressure boundary is an idealized consumer with a pressure ramp.
+    </p>
+    <ul>
+    </html>",revisions="<html>
+  <ul>
+  <li>
+  <i>November 14, 2022</i> by Laura Maier:<br/>
+  Added simulate and plot scripts, add docu and adapt parameters.
+  </li>
   <li>
     <i>December 08, 2016&#160;</i> by Moritz Lauster:<br/>
     Adapted to AixLib conventions
@@ -130,6 +145,7 @@ equation
     <i>13.12.2013</i> by Sebastian Stinner:<br/>
     implemented
   </li>
+    </ul>
 </ul>
 </html>"));
 end StorageBoiler;