Merge pull request #1474 from RWTH-EBC/development

Merge development into issue #1465
RWTH-EBC · Oct 25, 2023 · a7b305a · a7b305a
2 parents c3b9abe + 18ef8ea
commit a7b305a
Show file tree

Hide file tree

Showing 51 changed files with 45,881 additions and 90 deletions.
diff --git a/AixLib/DataBase/Pools/ChildrensPool.mo b/AixLib/DataBase/Pools/ChildrensPool.mo
@@ -1,6 +1,6 @@
 within AixLib.DataBase.Pools;
 record ChildrensPool "Pool which is mainly used by children"
-  extends IndoorSwimmingPoolBaseDataDefinition(
+  extends AixLib.DataBase.Pools.IndoorSwimmingPoolBaseDataDefinition(
     TPool=303.15,
     VPool=126.8,
     APool=125.0,
@@ -33,9 +33,7 @@ record ChildrensPool "Pool which is mainly used by children"
     AFloInt=0.001,
     AFloExt=156.5,
     hConWatHor=50.0,
-    hConWatVer=5200.0,
-    PoolWallParam=
-        AixLib.DataBase.Pools.SwimmingPoolWalls.ConcreteInsulationConstruction());
+    hConWatVer=5200.0);
 annotation (Documentation(info="<html>
 <p>The swimming pool &quot;ChildrensPool&quot; describes a typical indoor swimming pool, which is mainly used by children and to teach children swimming. </p>
 </html>"));

diff --git a/AixLib/DataBase/Pools/IndoorSwimmingPoolBaseDataDefinition.mo b/AixLib/DataBase/Pools/IndoorSwimmingPoolBaseDataDefinition.mo
@@ -56,9 +56,6 @@ record IndoorSwimmingPoolBaseDataDefinition
   parameter Modelica.Units.SI.Area AFloExt "Area of pool floors which is connected to teh ground (pool floor with earth contact)";
   parameter Modelica.Units.SI.CoefficientOfHeatTransfer hConWatHor "Mean value for the heat transfer coefficient of free convection on horizontal pool floors";
   parameter Modelica.Units.SI.CoefficientOfHeatTransfer hConWatVer "Mean value for the heat transfer coefficient of free convection on vertical pool walls";
-  //replaceable parameter AixLib.DataBase.Walls.WallBaseDataDefinition PoolWallParam;
-  parameter AixLib.DataBase.Walls.WallBaseDataDefinition PoolWallParam
-   "Wall base data definition with all layers of pool walls"  annotation (choicesAllMatching=true);
 
   annotation (Documentation(info="<html>
 

diff --git a/AixLib/DataBase/Pools/IndoorSwimmingPoolDummy.mo b/AixLib/DataBase/Pools/IndoorSwimmingPoolDummy.mo
@@ -0,0 +1,41 @@
+within AixLib.DataBase.Pools;
+record IndoorSwimmingPoolDummy
+  "This is a dummy record with non-physical parameter values."
+  extends AixLib.DataBase.Pools.IndoorSwimmingPoolBaseDataDefinition(
+    TPool=Modelica.Constants.eps,
+    VPool=Modelica.Constants.inf,
+    APool=Modelica.Constants.inf,
+    depthPool=Modelica.Constants.inf,
+    VSto=Modelica.Constants.inf,
+    V_flow_nominal=Modelica.Constants.inf,
+    V_flow_par=Modelica.Constants.inf,
+    use_parLoa=false,
+    dpHeaExcPool=Modelica.Constants.inf,
+    use_ideHeaExc=true,
+    KHeat=Modelica.Constants.inf,
+    timeHea=Modelica.Constants.inf,
+    QMaxHeat=Modelica.Constants.inf,
+    QMinHeat=Modelica.Constants.inf,
+    betaInUse=Modelica.Constants.inf,
+    use_poolCov=false,
+    use_watRec=false,
+    x_rec=Modelica.Constants.inf,
+    m_flow_out=Modelica.Constants.inf,
+    use_HRS=false,
+    etaHRS=Modelica.Constants.eps,
+    use_wavPool=false,
+    heightWav=Modelica.Constants.inf,
+    widthWav=Modelica.Constants.inf,
+    perWavPul=Modelica.Constants.eps,
+    timeWavPul_start=Modelica.Constants.eps,
+    widthWavPul=Modelica.Constants.eps,
+    AWalInt=Modelica.Constants.inf,
+    AWalExt=Modelica.Constants.inf,
+    AFloExt=Modelica.Constants.inf,
+    AFloInt=Modelica.Constants.inf,
+    hConWatHor=Modelica.Constants.inf,
+    hConWatVer=Modelica.Constants.inf);
+  annotation (Documentation(info="<html>
+<p>This record is a place holder for zones without swimming pools to avoid error messages.</p>
+</html>"));
+end IndoorSwimmingPoolDummy;
diff --git a/AixLib/DataBase/Pools/SportPool.mo b/AixLib/DataBase/Pools/SportPool.mo
@@ -1,6 +1,6 @@
 within AixLib.DataBase.Pools;
 record SportPool "Pool which is mainly used by sport swimmers"
-  extends IndoorSwimmingPoolBaseDataDefinition(
+  extends AixLib.DataBase.Pools.IndoorSwimmingPoolBaseDataDefinition(
     TPool=301.15,
     VPool=942.956,
     APool=416.5,
@@ -33,9 +33,7 @@ record SportPool "Pool which is mainly used by sport swimmers"
     AFloInt=0.001,
     AFloExt=559.82,
     hConWatHor=50.0,
-    hConWatVer=5200.0,
-    PoolWallParam=
-        AixLib.DataBase.Pools.SwimmingPoolWalls.ConcreteInsulationConstruction());
+    hConWatVer=5200.0);
   annotation (Documentation(info="<html>
 <p>The swimming pool &quot;SportPool&quot; describes a typical indoor swimming pool, which is mainly used for sport swimming. </p>
 </html>"));

diff --git a/AixLib/DataBase/Pools/SwimmingPoolWalls/WallDummy.mo b/AixLib/DataBase/Pools/SwimmingPoolWalls/WallDummy.mo
@@ -0,0 +1,12 @@
+within AixLib.DataBase.Pools.SwimmingPoolWalls;
+record WallDummy
+  extends AixLib.DataBase.Walls.WallBaseDataDefinition(
+    n(min=1) = 1 "Number of wall layers",
+    d={1} "Thickness of wall layers",
+    rho={1} "Density of wall layers",
+    lambda={1} "Thermal conductivity of wall layers",
+    c={1} "Specific heat capacity of wall layers",
+    eps=1 "Emissivity of inner wall surface");
+  annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
+        coordinateSystem(preserveAspectRatio=false)));
+end WallDummy;
diff --git a/AixLib/DataBase/Pools/SwimmingPoolWalls/package.order b/AixLib/DataBase/Pools/SwimmingPoolWalls/package.order
@@ -1,2 +1,3 @@
 ConcreteInsulationConstruction
 StainlessSteelConstruction
+WallDummy
diff --git a/AixLib/DataBase/Pools/package.order b/AixLib/DataBase/Pools/package.order
@@ -2,3 +2,4 @@ IndoorSwimmingPoolBaseDataDefinition
 SportPool
 ChildrensPool
 SwimmingPoolWalls
+IndoorSwimmingPoolDummy
diff --git a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN25_H05_12.mo b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN25_H05_12.mo
@@ -0,0 +1,138 @@
+within AixLib.DataBase.Pumps.PumpPolynomialBased;
+record Pump_DN25_H05_12 "Pump with head 0.5 to 12,4m and 12,4m^3/h volume flow (25/0.5-12 PN)"
+   extends PumpBaseRecord(
+     maxMinHeight=[
+           0.00, 12.30,  0.367;
+           0.40, 12.37,  0.335;
+           0.79, 12.44,  0.303;
+           1.19, 12.40,  0.287;
+           1.59, 12.23,  0.288;
+           1.98, 12.07,  0.290;
+           2.38, 11.84,  0.000;
+           2.78, 11.61,  0.000;
+           3.17, 11.35,  0.000;
+           3.57, 11.07,  0.000;
+           3.97, 10.79,  0.000;
+           4.36, 10.48,  0.000;
+           4.76, 10.17,  0.000;
+           5.16,  9.83,  0.000;
+           5.55,  9.47,  0.000;
+           5.95,  9.11,  0.000;
+           6.34,  8.78,  0.000;
+           6.74,  8.47,  0.000;
+           7.14,  8.15,  0.000;
+           7.53,  7.82,  0.000;
+           7.93,  7.49,  0.000;
+           8.33,  7.14,  0.000;
+           8.72,  6.80,  0.000;
+           9.12,  6.45,  0.000;
+           9.52,  6.10,  0.000;
+           9.91,  5.75,  0.000;
+          10.31,  5.34,  0.000;
+          10.71,  4.91,  0.000;
+          11.10,  4.48,  0.000;
+          11.50,  4.05,  0.000]
+      "maximum and minimum boundaries of pump (Q,Hmax,Hmin)",
+    maxMinSpeedCurves = [
+           0.00, 4333,  739;
+           0.40, 4334,  740;
+           0.79, 4335,  741;
+           1.19, 4320,  753;
+           1.59, 4286,  777;
+           1.98, 4253,  801;
+           2.38, 4208,  802;
+           2.78, 4163,  802;
+           3.17, 4128,  802;
+           3.57, 4106,  802;
+           3.97, 4084,  802;
+           4.36, 4030,  802;
+           4.76, 3974,  802;
+           5.16, 3917,  802;
+           5.55, 3861,  802;
+           5.95, 3804,  802;
+           6.34, 3768,  802;
+           6.74, 3734,  802;
+           7.14, 3705,  802;
+           7.53, 3683,  802;
+           7.93, 3661,  802;
+           8.33, 3639,  802;
+           8.72, 3617,  802;
+           9.12, 3595,  802;
+           9.52, 3573,  802;
+           9.91, 3551,  802;
+          10.31, 3517,  802;
+          10.71, 3479,  802;
+          11.10, 3442,  802;
+          11.50, 3405,  802]
+      "maximum and minimum boundaries of pump speed (Q,nMax,nMin)",
+    nMin=750,
+    nMax=4350,
+    cHQN=[ 0.00000e+00,  0.00000e+00,  6.52362e-07;
+           0.00000e+00,  6.12540e-05,  0.00000e+00;
+          -4.34488e-02,  0.00000e+00,  0.00000e+00]
+       "coefficients for H = f(Q,N)",
+    cPQN=[1.17764e+00,  2.85662e-03, -2.38557e-06,  3.01986e-09, -2.01864e-13;
+           0.00000e+00,  0.00000e+00,  1.75607e-06,  0.00000e+00,  0.00000e+00;
+           0.00000e+00,  2.57857e-04,  0.00000e+00,  0.00000e+00,  0.00000e+00;
+          -8.92872e-02,  0.00000e+00,  0.00000e+00,  0.00000e+00,  0.00000e+00]
+       "coefficients for P = f(Q,N)");
+
+  annotation(preferredView="text", Documentation(revisions="<html><ul>
+
+  <li>2023-10-19 by Sarah Leidolf:<br/>
+    Generated
+  </li>
+</ul>
+
+</html>", info="<html><h4>
+  Measurement and Regression Data
+</h4>
+<p>
+  Impure curves at high pump speed because of inaccurate data of upper
+  and lower limit of pump speed.
+</p>
+<p>
+  <img src=
+  \"modelica://AixLib/Resources/Images/DataBase/Pumps/PumpsPolynomialBased/Pump_DN25_H05_12.png\"
+  alt=\"1\">
+
+</p>
+<p>
+  cHQN:
+</p>
+<p>
+
+  <span style=\"font-family: Courier New;\">0.00000e+00, 0.00000e+00,
+  6.52362e-07;</span>
+</p>
+<p>
+  <span style=\"font-family: Courier New;\">0.00000e+00, 6.12540e-05,
+  0.00000e+00;</span>
+</p>
+<p>
+  <span style=\"font-family: Courier New;\">-4.34488e-02, 0.00000e+00,
+  0.00000e+00</span>
+
+</p>
+<p>
+  cPQN:
+</p>
+<p>
+
+  <span style=\"font-family: Courier New;\">1.17764e+00, 2.85662e-03,
+  -2.38557e-06, 3.01986e-09, -2.01864e-13;</span>
+</p>
+<p>
+  <span style=\"font-family: Courier New;\">0.00000e+00, 0.00000e+00,
+  1.75607e-06, 0.00000e+00, 0.00000e+00;</span>
+</p>
+<p>
+  <span style=\"font-family: Courier New;\">0.00000e+00, 2.57857e-04,
+  0.00000e+00, 0.00000e+00, 0.00000e+00;</span>
+</p>
+<p>
+  <span style=\"font-family: Courier New;\">-8.92872e-02, 0.00000e+00,
+  0.00000e+00, 0.00000e+00, 0.00000e+00</span>
+</p>
+</html>"));
+end Pump_DN25_H05_12;
diff --git a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN30_H1_12.mo b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN30_H1_12.mo
@@ -0,0 +1,144 @@
+within AixLib.DataBase.Pumps.PumpPolynomialBased;
+record Pump_DN30_H1_12 "Pump with head 1 to 11m and 10,7m^3/h volume flow (Wilo Stratos 30/1-12)"
+ extends PumpBaseRecord(
+    maxMinHeight=[
+           0.00, 11.53,  0.800;
+           0.41, 11.62,  0.832;
+           0.83, 11.71,  0.865;
+           1.24, 11.79,  0.897;
+           1.66, 11.88,  0.929;
+           2.07, 11.97,  0.944;
+           2.49, 12.05,  0.825;
+           2.90, 12.14,  0.706;
+           3.32, 12.18,  0.587;
+           3.73, 11.66,  0.467;
+           4.15, 11.14,  0.000;
+           4.56, 10.62,  0.000;
+           4.98, 10.09,  0.000;
+           5.39,  9.64,  0.000;
+           5.81,  9.21,  0.000;
+           6.22,  8.78,  0.000;
+           6.63,  8.35,  0.000;
+           7.05,  7.92,  0.000;
+           7.46,  7.50,  0.000;
+           7.88,  7.09,  0.000;
+           8.29,  6.67,  0.000;
+           8.71,  6.25,  0.000;
+           9.12,  5.82,  0.000;
+           9.54,  5.34,  0.000;
+           9.95,  4.86,  0.000;
+          10.37,  4.39,  0.000;
+          10.78,  3.90,  0.000;
+          11.20,  3.32,  0.000;
+          11.61,  2.73,  0.000;
+          12.03,  2.15,  0.000]
+      "maximum and minimum boundaries of pump (Q,Hmax,Hmin)",
+    maxMinSpeedCurves = [
+            0.00, 4800, 1400;
+           0.41, 4800, 1400;
+           0.83, 4800, 1400;
+           1.24, 4800, 1400;
+           1.66, 4800, 1400;
+           2.07, 4800, 1400;
+           2.49, 4800, 1400;
+           2.90, 4800, 1400;
+           3.32, 4798, 1400;
+           3.73, 4773, 1400;
+           4.15, 4747, 1400;
+           4.56, 4722, 1400;
+           4.98, 4696, 1400;
+           5.39, 4662, 1400;
+           5.81, 4625, 1400;
+           6.22, 4588, 1400;
+           6.63, 4550, 1400;
+           7.05, 4514, 1400;
+           7.46, 4480, 1400;
+           7.88, 4447, 1400;
+           8.29, 4413, 1400;
+           8.71, 4379, 1400;
+           9.12, 4345, 1400;
+           9.54, 4309, 1400;
+           9.95, 4274, 1400;
+          10.37, 4238, 1400;
+          10.78, 4202, 1400;
+          11.20, 4168, 1400;
+          11.61, 4134, 1400;
+          12.03, 4100, 1400]
+      "maximum and minimum boundaries of pump speed (Q,nMax,nMin)",
+    nMin=1400,
+    nMax=4800,
+    cHQN=[0.00000e+00,  0.00000e+00,  5.07080e-07;
+           0.00000e+00,  6.15992e-05,  0.00000e+00;
+          -6.58190e-02,  0.00000e+00,  0.00000e+00]
+       "coefficients for H = f(Q,N)",
+    cPQN=[4.06360e-05,  2.77185e-02, -2.02099e-05,  8.49238e-09, -8.67775e-13;
+           0.00000e+00,  0.00000e+00,  1.21688e-06,  0.00000e+00,  0.00000e+00;
+           0.00000e+00,  6.87022e-06,  0.00000e+00,  0.00000e+00,  0.00000e+00;
+          -3.71130e-02,  0.00000e+00,  0.00000e+00,  0.00000e+00,  0.00000e+00]
+       "coefficients for P = f(Q,N)");
+
+  annotation(preferredView="text", Documentation(revisions="<html><ul>
+  <li>2023-10-19 by Sarah Leidolf:<br/>
+    Generated
+  </li>
+</ul>
+
+</html>", info="<html><h4>
+  Measurement and Regression Data
+</h4>
+<p>
+  Dimension estimate, but inaccuracies occur due to lack of information
+  in the data sheets.
+</p>
+<p>
+  Espacially because of missing information of upper and lower limit of
+  pump speed.
+</p>
+<p>
+  <br/>
+  <img src=
+  \"modelica://AixLib/Resources/Images/DataBase/Pumps/PumpsPolynomialBased/Pump_DN30_H1_12.png\"
+  alt=\"1\">
+
+</p>
+<p>
+  cHQN:
+</p>
+<p>
+
+  <span style=\"font-family: Courier New;\">0.00000e+00, 0.00000e+00,
+  5.07080e-07;</span>
+</p>
+<p>
+  <span style=\"font-family: Courier New;\">0.00000e+00, 6.15992e-05,
+  0.00000e+00;</span>
+</p>
+<p>
+  <span style=\"font-family: Courier New;\">-6.58190e-02, 0.00000e+00,
+  0.00000e+00</span>
+
+</p>
+<p>
+  cPQN:
+</p>
+<p>
+
+  <span style=\"font-family: Courier New;\">4.06360e-05, 2.77185e-02,
+  -2.02099e-05, 8.49238e-09, -8.67775e-13;</span>
+</p>
+<p>
+  <span style=\"font-family: Courier New;\">0.00000e+00, 0.00000e+00,
+  1.21688e-06, 0.00000e+00, 0.00000e+00;</span>
+</p>
+<p>
+  <span style=\"font-family: Courier New;\">0.00000e+00, 6.87022e-06,
+  0.00000e+00, 0.00000e+00, 0.00000e+00;</span>
+</p>
+<p>
+  <span style=\"font-family: Courier New;\">-3.71130e-02, 0.00000e+00,
+  0.00000e+00, 0.00000e+00, 0.00000e+00</span>
+
+</p>
+</html>"));
+
+end Pump_DN30_H1_12;