From a202f7f18436330d47b99b42fcb61eb2d4365bb3 Mon Sep 17 00:00:00 2001 From: "sarah.leidolf" Date: Tue, 11 Oct 2022 10:35:33 +0200 Subject: [PATCH 01/56] Pump DN25 H 0.5 to 12 --- .../PumpPolynomialBased/PumpBaseRecord.mo | 2 +- .../Pumps/PumpPolynomialBased/Pump_DN100.mo | 2 +- .../PumpPolynomialBased/Pump_DN100_H1_17.mo | 2 +- .../Pumps/PumpPolynomialBased/Pump_DN200.mo | 2 +- .../PumpPolynomialBased/Pump_DN25_H05_12.mo | 21 +++++++++++++++++++ .../PumpPolynomialBased/Pump_DN25_H1_4_V3.mo | 2 +- .../PumpPolynomialBased/Pump_DN25_H1_6_V4.mo | 2 +- .../PumpPolynomialBased/Pump_DN25_H1_6_V8.mo | 2 +- .../PumpPolynomialBased/Pump_DN25_H1_8_V5.mo | 2 +- .../PumpPolynomialBased/Pump_DN25_H1_8_V9.mo | 2 +- .../Pump_DN30_H1_12_V13.mo | 2 +- .../Pumps/PumpPolynomialBased/Pump_DN32.mo | 2 +- .../Pumps/PumpPolynomialBased/Pump_DN40.mo | 2 +- .../PumpPolynomialBased/Pump_DN40_H10.mo | 2 +- .../Pump_DN40_H1_12_V24.mo | 2 +- .../Pump_DN40_H1_16_V29.mo | 2 +- .../PumpPolynomialBased/Pump_DN40_H1_45.mo | 2 +- .../PumpPolynomialBased/Pump_DN40_H1_8_V17.mo | 2 +- .../Pumps/PumpPolynomialBased/Pump_DN50.mo | 2 +- .../PumpPolynomialBased/Pump_DN50_H10.mo | 2 +- .../PumpPolynomialBased/Pump_DN50_H1_38.mo | 2 +- .../PumpPolynomialBased/Pump_DN50_H1_9_V29.mo | 2 +- .../Pumps/PumpPolynomialBased/Pump_DN65.mo | 2 +- .../PumpPolynomialBased/Pump_DN65_H15.mo | 2 +- .../Pump_DN65_H1_12_V48.mo | 2 +- .../Pump_DN65_H1_16_V26.mo | 2 +- .../PumpPolynomialBased/Pump_DN65_H1_17.mo | 2 +- .../Pumps/PumpPolynomialBased/package.order | 1 + 28 files changed, 48 insertions(+), 26 deletions(-) create mode 100644 AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN25_H05_12.mo diff --git a/AixLib/DataBase/Pumps/PumpPolynomialBased/PumpBaseRecord.mo b/AixLib/DataBase/Pumps/PumpPolynomialBased/PumpBaseRecord.mo index 94718b3247..2e48b8db80 100644 --- a/AixLib/DataBase/Pumps/PumpPolynomialBased/PumpBaseRecord.mo +++ b/AixLib/DataBase/Pumps/PumpPolynomialBased/PumpBaseRecord.mo @@ -1,4 +1,4 @@ -within AixLib.DataBase.Pumps.PumpPolynomialBased; +within AixLib.DataBase.Pumps.PumpPolynomialBased; record PumpBaseRecord "Definition of pump data" extends Modelica.Icons.Record; // ***************************************************** diff --git a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN100.mo b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN100.mo index ba8ed5b4d3..9d9cfc1c7f 100644 --- a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN100.mo +++ b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN100.mo @@ -1,4 +1,4 @@ -within AixLib.DataBase.Pumps.PumpPolynomialBased; +within AixLib.DataBase.Pumps.PumpPolynomialBased; record Pump_DN100 "Pump with head 1 to 34m and 378.24m^3/h volume flow" extends PumpBaseRecord( maxMinHeight=[ diff --git a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN100_H1_17.mo b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN100_H1_17.mo index cfc08034dd..f2278a8f1f 100644 --- a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN100_H1_17.mo +++ b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN100_H1_17.mo @@ -1,4 +1,4 @@ -within AixLib.DataBase.Pumps.PumpPolynomialBased; +within AixLib.DataBase.Pumps.PumpPolynomialBased; record Pump_DN100_H1_17 "Pump with head 1 to 17m and 136.48m^3/h volume flow" extends PumpBaseRecord( maxMinHeight=[ diff --git a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN200.mo b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN200.mo index ba1f30920d..acc370f0fd 100644 --- a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN200.mo +++ b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN200.mo @@ -1,4 +1,4 @@ -within AixLib.DataBase.Pumps.PumpPolynomialBased; +within AixLib.DataBase.Pumps.PumpPolynomialBased; record Pump_DN200 "Pump with head 1 to 18m and 590m^3/h volume flow" extends PumpBaseRecord( maxMinHeight=[ diff --git a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN25_H05_12.mo b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN25_H05_12.mo new file mode 100644 index 0000000000..fbed062db0 --- /dev/null +++ b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN25_H05_12.mo @@ -0,0 +1,21 @@ +within AixLib.DataBase.Pumps.PumpPolynomialBased; +model Pump_DN25_H05_12 "25/0.5-12 PN 10 maximum volume flow 12.0 m^3/h" + extends AixLib.DataBase.Pumps.PumpPolynomialBased.PumpBaseRecord( + maxMinHeight= + [0,12.2,0.4; 0.5, 12.3, 0.4; 1, 12.3, 0.4; 1.5, 12.2, 0.4; + 2, 12, 0.3; 2.5, 11.8, 0.2; 3, 11.5, 0.3; + 4, 10.8, 0.5; 5, 9.9, 0.6; 6, 9, 1; + 7, 8.2, 1.4; 8, 7.4, 1.9; 9, 6.6, 2.4; + 10, 5.7, 2.9; 11, 4.8, 3.5], + maxMinSpeedCurves= + [0,4350,750; 11,4350,750], + nMin=750, + nMax=4350, + cHQN=[0,0,0; 0,0,0; 0,0,0]); + annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( + coordinateSystem(preserveAspectRatio=false)), + Documentation(info=" +

maxMinHeight=[Q [m3/h], Hmax [m], Hmin [m]] (maximum and minimum boundaries of pump)

+

maxMinSpeedCurves=[Q [m3/h], nMax [rev/min], nMin [rev/min]](maximum and minimum boundaries of pump speed)

+")); +end Pump_DN25_H05_12; diff --git a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN25_H1_4_V3.mo b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN25_H1_4_V3.mo index 0338a81628..570a48339e 100644 --- a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN25_H1_4_V3.mo +++ b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN25_H1_4_V3.mo @@ -1,4 +1,4 @@ -within AixLib.DataBase.Pumps.PumpPolynomialBased; +within AixLib.DataBase.Pumps.PumpPolynomialBased; record Pump_DN25_H1_4_V3 "Pump with head 1 to 4m and 3.17m^3/h volume flow" extends PumpBaseRecord( maxMinHeight=[ diff --git a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN25_H1_6_V4.mo b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN25_H1_6_V4.mo index 3c8b02fe42..91679cdf1c 100644 --- a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN25_H1_6_V4.mo +++ b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN25_H1_6_V4.mo @@ -1,4 +1,4 @@ -within AixLib.DataBase.Pumps.PumpPolynomialBased; +within AixLib.DataBase.Pumps.PumpPolynomialBased; record Pump_DN25_H1_6_V4 "Pump with head 1 to 6m and 4.25m^3/h volume flow" extends PumpBaseRecord( maxMinHeight=[ diff --git a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN25_H1_6_V8.mo b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN25_H1_6_V8.mo index f7178456f8..c41081b350 100644 --- a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN25_H1_6_V8.mo +++ b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN25_H1_6_V8.mo @@ -1,4 +1,4 @@ -within AixLib.DataBase.Pumps.PumpPolynomialBased; +within AixLib.DataBase.Pumps.PumpPolynomialBased; record Pump_DN25_H1_6_V8 "Pump with head 1 to 6m and 8.87m^3/h volume flow" extends PumpBaseRecord( diff --git a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN25_H1_8_V5.mo b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN25_H1_8_V5.mo index e9eaba913b..8128cfa5b1 100644 --- a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN25_H1_8_V5.mo +++ b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN25_H1_8_V5.mo @@ -1,4 +1,4 @@ -within AixLib.DataBase.Pumps.PumpPolynomialBased; +within AixLib.DataBase.Pumps.PumpPolynomialBased; record Pump_DN25_H1_8_V5 "Pump with head 1 to 8m and 5m^3/h volume flow" extends PumpBaseRecord( diff --git a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN25_H1_8_V9.mo b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN25_H1_8_V9.mo index a8878152d9..dbc077f7ae 100644 --- a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN25_H1_8_V9.mo +++ b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN25_H1_8_V9.mo @@ -1,4 +1,4 @@ -within AixLib.DataBase.Pumps.PumpPolynomialBased; +within AixLib.DataBase.Pumps.PumpPolynomialBased; record Pump_DN25_H1_8_V9 "Pump with head 1 to 8m and 9m^3/h volume flow" extends PumpBaseRecord( diff --git a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN30_H1_12_V13.mo b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN30_H1_12_V13.mo index 39a58a01e1..7e947d0375 100644 --- a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN30_H1_12_V13.mo +++ b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN30_H1_12_V13.mo @@ -1,4 +1,4 @@ -within AixLib.DataBase.Pumps.PumpPolynomialBased; +within AixLib.DataBase.Pumps.PumpPolynomialBased; record Pump_DN30_H1_12_V13 "Pump with head 1 to 12m and 13.5m^3/h volume flow" extends PumpBaseRecord( diff --git a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN32.mo b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN32.mo index df99070e2b..caeae4f048 100644 --- a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN32.mo +++ b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN32.mo @@ -1,4 +1,4 @@ -within AixLib.DataBase.Pumps.PumpPolynomialBased; +within AixLib.DataBase.Pumps.PumpPolynomialBased; record Pump_DN32 "Pump with head 1 to 24m and 22.34m^3/h volume flow" extends PumpBaseRecord( maxMinHeight=[ diff --git a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN40.mo b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN40.mo index b35a2c8fb9..afd7061d71 100644 --- a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN40.mo +++ b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN40.mo @@ -1,4 +1,4 @@ -within AixLib.DataBase.Pumps.PumpPolynomialBased; +within AixLib.DataBase.Pumps.PumpPolynomialBased; record Pump_DN40 "Pump with head 1 to 12m and 21m^3/h volume flow" extends PumpBaseRecord( maxMinHeight=[ diff --git a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN40_H10.mo b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN40_H10.mo index e1b802be5f..0f8976fc0c 100644 --- a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN40_H10.mo +++ b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN40_H10.mo @@ -1,4 +1,4 @@ -within AixLib.DataBase.Pumps.PumpPolynomialBased; +within AixLib.DataBase.Pumps.PumpPolynomialBased; record Pump_DN40_H10 "Pump with head 10m and 21m^3/h volume flow" extends PumpBaseRecord( maxMinHeight=[ diff --git a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN40_H1_12_V24.mo b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN40_H1_12_V24.mo index c919cf86ff..55668d1724 100644 --- a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN40_H1_12_V24.mo +++ b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN40_H1_12_V24.mo @@ -1,4 +1,4 @@ -within AixLib.DataBase.Pumps.PumpPolynomialBased; +within AixLib.DataBase.Pumps.PumpPolynomialBased; record Pump_DN40_H1_12_V24 "Pump with head 1 to 12m and 24m^3/h volume flow" extends PumpBaseRecord( maxMinHeight=[ diff --git a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN40_H1_16_V29.mo b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN40_H1_16_V29.mo index 7cbd21c227..a6a5da0905 100644 --- a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN40_H1_16_V29.mo +++ b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN40_H1_16_V29.mo @@ -1,4 +1,4 @@ -within AixLib.DataBase.Pumps.PumpPolynomialBased; +within AixLib.DataBase.Pumps.PumpPolynomialBased; record Pump_DN40_H1_16_V29 "Pump with head 1 to 16m and 28.9m^3/h volume flow" extends PumpBaseRecord( maxMinHeight=[ diff --git a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN40_H1_45.mo b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN40_H1_45.mo index 85bf32b628..fcc8e9b023 100644 --- a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN40_H1_45.mo +++ b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN40_H1_45.mo @@ -1,4 +1,4 @@ -within AixLib.DataBase.Pumps.PumpPolynomialBased; +within AixLib.DataBase.Pumps.PumpPolynomialBased; record Pump_DN40_H1_45 "Pump with head 1 to 45m and 47.5m^3/h volume flow" extends PumpBaseRecord( maxMinHeight=[ diff --git a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN40_H1_8_V17.mo b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN40_H1_8_V17.mo index 63058dda71..c6febf6b82 100644 --- a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN40_H1_8_V17.mo +++ b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN40_H1_8_V17.mo @@ -1,4 +1,4 @@ -within AixLib.DataBase.Pumps.PumpPolynomialBased; +within AixLib.DataBase.Pumps.PumpPolynomialBased; record Pump_DN40_H1_8_V17 "Pump with head 1 to 8m and 17.5m^3/h volume flow" extends PumpBaseRecord( maxMinHeight=[ diff --git a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN50.mo b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN50.mo index f8702c9e34..454c3f4e29 100644 --- a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN50.mo +++ b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN50.mo @@ -1,4 +1,4 @@ -within AixLib.DataBase.Pumps.PumpPolynomialBased; +within AixLib.DataBase.Pumps.PumpPolynomialBased; record Pump_DN50 "Pump with head 1 to 12m and 43m^3/h volume flow" extends PumpBaseRecord( maxMinHeight=[ diff --git a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN50_H10.mo b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN50_H10.mo index b6b6a4c435..304ec00e25 100644 --- a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN50_H10.mo +++ b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN50_H10.mo @@ -1,4 +1,4 @@ -within AixLib.DataBase.Pumps.PumpPolynomialBased; +within AixLib.DataBase.Pumps.PumpPolynomialBased; record Pump_DN50_H10 "Pump with head 10m and 32.23m^3/h volume flow" extends PumpBaseRecord( maxMinHeight=[ diff --git a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN50_H1_38.mo b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN50_H1_38.mo index cdfa7035aa..7db0b82ff5 100644 --- a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN50_H1_38.mo +++ b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN50_H1_38.mo @@ -1,4 +1,4 @@ -within AixLib.DataBase.Pumps.PumpPolynomialBased; +within AixLib.DataBase.Pumps.PumpPolynomialBased; record Pump_DN50_H1_38 "Pump with head 1 to 38m and 52.14m^3/h volume flow" extends PumpBaseRecord( maxMinHeight=[ diff --git a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN50_H1_9_V29.mo b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN50_H1_9_V29.mo index d8c1b65516..0597b2fe06 100644 --- a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN50_H1_9_V29.mo +++ b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN50_H1_9_V29.mo @@ -1,4 +1,4 @@ -within AixLib.DataBase.Pumps.PumpPolynomialBased; +within AixLib.DataBase.Pumps.PumpPolynomialBased; record Pump_DN50_H1_9_V29 "Pump with head 1 to 9m and 29.24m^3/h volume flow" extends PumpBaseRecord( maxMinHeight=[ diff --git a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN65.mo b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN65.mo index 978b41c51b..6f783b47e3 100644 --- a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN65.mo +++ b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN65.mo @@ -1,4 +1,4 @@ -within AixLib.DataBase.Pumps.PumpPolynomialBased; +within AixLib.DataBase.Pumps.PumpPolynomialBased; record Pump_DN65 "Pump with head 1 to 32m and 100m^3/h volume flow" extends PumpBaseRecord( maxMinHeight=[ diff --git a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN65_H15.mo b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN65_H15.mo index f3cf896348..bf5fe46701 100644 --- a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN65_H15.mo +++ b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN65_H15.mo @@ -1,4 +1,4 @@ -within AixLib.DataBase.Pumps.PumpPolynomialBased; +within AixLib.DataBase.Pumps.PumpPolynomialBased; record Pump_DN65_H15 "Pump with head 15m and 52.21m^3/h volume flow" extends PumpBaseRecord( maxMinHeight=[ diff --git a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN65_H1_12_V48.mo b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN65_H1_12_V48.mo index 85275748c8..9cb0e0d1c7 100644 --- a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN65_H1_12_V48.mo +++ b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN65_H1_12_V48.mo @@ -1,4 +1,4 @@ -within AixLib.DataBase.Pumps.PumpPolynomialBased; +within AixLib.DataBase.Pumps.PumpPolynomialBased; record Pump_DN65_H1_12_V48 "Pump with head 1 to 12m and 47.88m^3/h volume flow" extends PumpBaseRecord( maxMinHeight=[ diff --git a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN65_H1_16_V26.mo b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN65_H1_16_V26.mo index 3532ee751e..b202147d7a 100644 --- a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN65_H1_16_V26.mo +++ b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN65_H1_16_V26.mo @@ -1,4 +1,4 @@ -within AixLib.DataBase.Pumps.PumpPolynomialBased; +within AixLib.DataBase.Pumps.PumpPolynomialBased; record Pump_DN65_H1_16_V26 "Pump with head 1 to 16m and 26.23m^3/h volume flow" extends PumpBaseRecord( maxMinHeight=[ diff --git a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN65_H1_17.mo b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN65_H1_17.mo index ac0e620fd5..d7ed128779 100644 --- a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN65_H1_17.mo +++ b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN65_H1_17.mo @@ -1,4 +1,4 @@ -within AixLib.DataBase.Pumps.PumpPolynomialBased; +within AixLib.DataBase.Pumps.PumpPolynomialBased; record Pump_DN65_H1_17 "Pump with head 1 to 17m and 67.9m^3/h volume flow" extends PumpBaseRecord( maxMinHeight=[ diff --git a/AixLib/DataBase/Pumps/PumpPolynomialBased/package.order b/AixLib/DataBase/Pumps/PumpPolynomialBased/package.order index ccd0aca633..2ef336fe8a 100644 --- a/AixLib/DataBase/Pumps/PumpPolynomialBased/package.order +++ b/AixLib/DataBase/Pumps/PumpPolynomialBased/package.order @@ -7,6 +7,7 @@ Pump_DN25_H1_6_V4 Pump_DN25_H1_6_V8 Pump_DN25_H1_8_V5 Pump_DN25_H1_8_V9 +Pump_DN25_H05_12 Pump_DN30_H1_12_V13 Pump_DN32 Pump_DN40 From ac686b82b2de5be03f2ddff72fe430ceb8f8d2fe Mon Sep 17 00:00:00 2001 From: "sarah.leidolf" Date: Tue, 11 Oct 2022 11:25:28 +0200 Subject: [PATCH 02/56] Pump DN50 H0.5 to 16 --- .../Examples/testMaxMinHeightTable.mo | 4 ++-- .../Examples/testPumpSpeedCalculation.mo | 4 ++-- .../PumpPolynomialBased/PumpBaseRecord.mo | 13 ++++------ .../PumpPolynomialBased/Pump_DN25_H05_12.mo | 5 +++- .../PumpPolynomialBased/Pump_DN50_H05_16.mo | 24 +++++++++++++++++++ .../Pumps/PumpPolynomialBased/package.order | 1 + 6 files changed, 37 insertions(+), 14 deletions(-) create mode 100644 AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN50_H05_16.mo diff --git a/AixLib/DataBase/Pumps/PumpPolynomialBased/Examples/testMaxMinHeightTable.mo b/AixLib/DataBase/Pumps/PumpPolynomialBased/Examples/testMaxMinHeightTable.mo index 88a5f90d8e..692c6a0830 100644 --- a/AixLib/DataBase/Pumps/PumpPolynomialBased/Examples/testMaxMinHeightTable.mo +++ b/AixLib/DataBase/Pumps/PumpPolynomialBased/Examples/testMaxMinHeightTable.mo @@ -17,13 +17,13 @@ model testMaxMinHeightTable annotation (Placement(transformation(extent={{40,10},{80,50}}))); Modelica.Blocks.Interfaces.RealOutput HminCurve annotation (Placement(transformation(extent={{40,-50},{80,-10}}))); - Modelica.Blocks.Tables.CombiTable1D maxMinTable( + Modelica.Blocks.Tables.CombiTable1Dv maxMinTable( columns={2,3}, tableName="NoName", tableOnFile=false, table=param.maxMinHeight) "Outputs static head (H). Maximum, minimum and freely selectable pump curve" - annotation (Placement(transformation(extent={{-11,-10},{9,10}}, rotation=0))); + annotation (Placement(transformation(extent={{-11,-10},{9,10}}, rotation=0))); initial equation assert( (sum(abs(param.maxMinHeight)) <> 0), diff --git a/AixLib/DataBase/Pumps/PumpPolynomialBased/Examples/testPumpSpeedCalculation.mo b/AixLib/DataBase/Pumps/PumpPolynomialBased/Examples/testPumpSpeedCalculation.mo index 87d8ad1edf..6ae4c28967 100644 --- a/AixLib/DataBase/Pumps/PumpPolynomialBased/Examples/testPumpSpeedCalculation.mo +++ b/AixLib/DataBase/Pumps/PumpPolynomialBased/Examples/testPumpSpeedCalculation.mo @@ -21,9 +21,9 @@ model testPumpSpeedCalculation parameter Real maxQ(unit="m3/h", displayUnit="m3/h") = param.maxMinHeight[ size(param.maxMinHeight, 1), 1]; - parameter Modelica.SIunits.Length maxHead = max(param.maxMinHeight[:, 2]) + parameter Modelica.Units.SI.Length maxHead=max(param.maxMinHeight[:, 2]) "maximum static head of the pump"; - parameter Modelica.SIunits.Length minHead = max(param.maxMinHeight[:, 3]) + parameter Modelica.Units.SI.Length minHead=max(param.maxMinHeight[:, 3]) "aprox. minimum static head of the pump"; Modelica.Blocks.Sources.TimeTable headTable(table=[ diff --git a/AixLib/DataBase/Pumps/PumpPolynomialBased/PumpBaseRecord.mo b/AixLib/DataBase/Pumps/PumpPolynomialBased/PumpBaseRecord.mo index 2e48b8db80..c9e599af99 100644 --- a/AixLib/DataBase/Pumps/PumpPolynomialBased/PumpBaseRecord.mo +++ b/AixLib/DataBase/Pumps/PumpPolynomialBased/PumpBaseRecord.mo @@ -10,17 +10,12 @@ record PumpBaseRecord "Definition of pump data" 5, 12, 0.75; 10, 0.5, 0.5] "maximum and minimum boundaries of pump (Q [m3/h], Hmax [m], Hmin [m])"; - parameter Modelica.SIunits.Conversions.NonSIunits.AngularVelocity_rpm[:, :] - maxMinSpeedCurves=[ - -1, nMax, nMin; - 0, nMax, nMin; - 5, 0.5*nMax, nMin; - 10, nMin, nMin] - "maximum and minimum boundaries of pump speed + parameter Modelica.Units.NonSI.AngularVelocity_rpm[:,:] maxMinSpeedCurves=[-1, + nMax,nMin; 0,nMax,nMin; 5,0.5*nMax,nMin; 10,nMin,nMin] "maximum and minimum boundaries of pump speed (Q [m3/h], nMax [rev/min], nMin [rev/min])"; - parameter Modelica.SIunits.Conversions.NonSIunits.AngularVelocity_rpm nMin=0 + parameter Modelica.Units.NonSI.AngularVelocity_rpm nMin=0 "minimum pump speed"; - parameter Modelica.SIunits.Conversions.NonSIunits.AngularVelocity_rpm nMax=0 + parameter Modelica.Units.NonSI.AngularVelocity_rpm nMax=0 "maximum pump speed"; // ***************************************************** diff --git a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN25_H05_12.mo b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN25_H05_12.mo index fbed062db0..8928b7dc52 100644 --- a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN25_H05_12.mo +++ b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN25_H05_12.mo @@ -11,7 +11,10 @@ model Pump_DN25_H05_12 "25/0.5-12 PN 10 maximum volume flow 12.0 m^3/h" [0,4350,750; 11,4350,750], nMin=750, nMax=4350, - cHQN=[0,0,0; 0,0,0; 0,0,0]); + cHQN=[ 0.00000e+00, 0.00000e+00, 5.42119e-07; + 0.00000e+00, 9.63893e-05, 0.00000e+00; + -9.40049e-02, 0.00000e+00, 0.00000e+00] + "coefficients for H = f(Q,N) from Pump_DN25_H1_8_V9 (DN25_H1_8_V9 and DN25_H1_6_V8 similar scale of the max volume flow)"); annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( coordinateSystem(preserveAspectRatio=false)), Documentation(info=" diff --git a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN50_H05_16.mo b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN50_H05_16.mo new file mode 100644 index 0000000000..43fec308bb --- /dev/null +++ b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN50_H05_16.mo @@ -0,0 +1,24 @@ +within AixLib.DataBase.Pumps.PumpPolynomialBased; +record Pump_DN50_H05_16 "50/0.5-16 PN 6/10 maximum volume flow 53.0 m^3/h" + extends AixLib.DataBase.Pumps.PumpPolynomialBased.PumpBaseRecord( + maxMinHeight= + [0,15.8,0.4; 3,16,0.4; 6,16,0.3; 9,16,0.2; + 11,15.9,0.05; 12,15.8,0; 14,15.4,0.1; 18,14.2,0.3; + 22,13,0.6; 26,11.7,0.8; 30,10.5,1; 35,9,1.2; + 40,7.6,1.8; 45,6,2.05; 50,4.3,2.7; 53,3,3], + maxMinSpeedCurves= + [0,3200,500; 53,3200,500], + nMin=500, + nMax=3200, + cHQN=[ 0, 0, 1.31E-06; + 0, 7.59E-06, 0; + -0.00316, 0, 0] "coefficients for H = f(Q,N) from Pump_DN50 (similar scale of max volume flow and maxmin Speed)"); + + annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( + coordinateSystem(preserveAspectRatio=false)), + Documentation(info=" +

maxMinHeight=[Q [m3/h], Hmax [m], Hmin [m]] (maximum and minimum boundaries of pump)

+

maxMinSpeedCurves=[Q [m3/h], nMax [rev/min], nMin [rev/min]](maximum and minimum boundaries of pump speed)

+")); + +end Pump_DN50_H05_16; diff --git a/AixLib/DataBase/Pumps/PumpPolynomialBased/package.order b/AixLib/DataBase/Pumps/PumpPolynomialBased/package.order index 2ef336fe8a..f92bac9964 100644 --- a/AixLib/DataBase/Pumps/PumpPolynomialBased/package.order +++ b/AixLib/DataBase/Pumps/PumpPolynomialBased/package.order @@ -20,6 +20,7 @@ Pump_DN50 Pump_DN50_H10 Pump_DN50_H1_38 Pump_DN50_H1_9_V29 +Pump_DN50_H05_16 Pump_DN65 Pump_DN65_H15 Pump_DN65_H1_12_V48 From 062daaf9178d94446c9c62649e413d94e941d011 Mon Sep 17 00:00:00 2001 From: "sarah.leidolf" Date: Wed, 26 Oct 2022 14:05:31 +0200 Subject: [PATCH 03/56] add coefficients for P = f(Q,N) --- .../DataBase/Pumps/PumpPolynomialBased/Pump_DN25_H05_12.mo | 7 ++++++- .../DataBase/Pumps/PumpPolynomialBased/Pump_DN50_H05_16.mo | 6 +++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN25_H05_12.mo b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN25_H05_12.mo index 8928b7dc52..05e1d08759 100644 --- a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN25_H05_12.mo +++ b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN25_H05_12.mo @@ -14,7 +14,12 @@ model Pump_DN25_H05_12 "25/0.5-12 PN 10 maximum volume flow 12.0 m^3/h" cHQN=[ 0.00000e+00, 0.00000e+00, 5.42119e-07; 0.00000e+00, 9.63893e-05, 0.00000e+00; -9.40049e-02, 0.00000e+00, 0.00000e+00] - "coefficients for H = f(Q,N) from Pump_DN25_H1_8_V9 (DN25_H1_8_V9 and DN25_H1_6_V8 similar scale of the max volume flow)"); + "coefficients for H = f(Q,N) from Pump_DN25_H1_8_V9 (DN25_H1_8_V9 and DN25_H1_6_V8 similar scale of the max volume flow)", + cPQN=[ 1.86404e-05, 1.15429e-02, -9.54392e-06, 4.26061e-09, -3.87948e-13; + 0.00000e+00, 0.00000e+00, 1.54239e-06, 0.00000e+00, 0.00000e+00; + 0.00000e+00, 1.16734e-04, 0.00000e+00, 0.00000e+00, 0.00000e+00; + -1.06179e-01, 0.00000e+00, 0.00000e+00, 0.00000e+00, 0.00000e+00] + "coefficients for P = f(Q,N) from Pump_DN25_H1_8_V9 (DN25_H1_8_V9 and DN25_H1_6_V8 similar scale of the max volume flow"); annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( coordinateSystem(preserveAspectRatio=false)), Documentation(info=" diff --git a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN50_H05_16.mo b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN50_H05_16.mo index 43fec308bb..d9c562da9d 100644 --- a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN50_H05_16.mo +++ b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN50_H05_16.mo @@ -12,7 +12,11 @@ record Pump_DN50_H05_16 "50/0.5-16 PN 6/10 maximum volume flow 53.0 m^3/h" nMax=3200, cHQN=[ 0, 0, 1.31E-06; 0, 7.59E-06, 0; - -0.00316, 0, 0] "coefficients for H = f(Q,N) from Pump_DN50 (similar scale of max volume flow and maxmin Speed)"); + -0.00316, 0, 0] "coefficients for H = f(Q,N) from Pump_DN50 (similar scale of max volume flow and maxmin Speed)", + cPQN=[-2.45477E+01, 2.82590E-01, -2.38897E-04, 1.27064E-07, -1.27494E-11; + 0, 0, 3.23573E-06, 0, 0; + 0, 8.70834E-05, 0, 0, 0; + -8.39000E-03, 0, 0, 0, 0] "coefficients for P = f(Q,N) from Pump_DN50 (similar scale of max volume flow and maxmin Speed)"); annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( coordinateSystem(preserveAspectRatio=false)), From 0256dbf468b4901a38cef7bc3989a8f1664651e2 Mon Sep 17 00:00:00 2001 From: "sarah.leidolf" Date: Wed, 2 Nov 2022 10:46:55 +0100 Subject: [PATCH 04/56] update power calculation --- .../DataBase/Pumps/PumpPolynomialBased/Pump_DN25_H05_12.mo | 4 ++-- .../DataBase/Pumps/PumpPolynomialBased/Pump_DN50_H05_16.mo | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN25_H05_12.mo b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN25_H05_12.mo index 05e1d08759..071c37fb8a 100644 --- a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN25_H05_12.mo +++ b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN25_H05_12.mo @@ -1,6 +1,6 @@ within AixLib.DataBase.Pumps.PumpPolynomialBased; model Pump_DN25_H05_12 "25/0.5-12 PN 10 maximum volume flow 12.0 m^3/h" - extends AixLib.DataBase.Pumps.PumpPolynomialBased.PumpBaseRecord( + extends AixLib.DataBase.Pumps.PumpPolynomialBased.PumpBaseRecord( maxMinHeight= [0,12.2,0.4; 0.5, 12.3, 0.4; 1, 12.3, 0.4; 1.5, 12.2, 0.4; 2, 12, 0.3; 2.5, 11.8, 0.2; 3, 11.5, 0.3; @@ -15,7 +15,7 @@ model Pump_DN25_H05_12 "25/0.5-12 PN 10 maximum volume flow 12.0 m^3/h" 0.00000e+00, 9.63893e-05, 0.00000e+00; -9.40049e-02, 0.00000e+00, 0.00000e+00] "coefficients for H = f(Q,N) from Pump_DN25_H1_8_V9 (DN25_H1_8_V9 and DN25_H1_6_V8 similar scale of the max volume flow)", - cPQN=[ 1.86404e-05, 1.15429e-02, -9.54392e-06, 4.26061e-09, -3.87948e-13; + cPQN=[ 1.86404e-05, 1.15429e-02, -9.54392e-06, 4.26061e-09, -3.87948e-13; 0.00000e+00, 0.00000e+00, 1.54239e-06, 0.00000e+00, 0.00000e+00; 0.00000e+00, 1.16734e-04, 0.00000e+00, 0.00000e+00, 0.00000e+00; -1.06179e-01, 0.00000e+00, 0.00000e+00, 0.00000e+00, 0.00000e+00] diff --git a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN50_H05_16.mo b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN50_H05_16.mo index d9c562da9d..cd4d4f676c 100644 --- a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN50_H05_16.mo +++ b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN50_H05_16.mo @@ -1,5 +1,5 @@ within AixLib.DataBase.Pumps.PumpPolynomialBased; -record Pump_DN50_H05_16 "50/0.5-16 PN 6/10 maximum volume flow 53.0 m^3/h" +record Pump_DN50_H05_16 "50/0,5-16 PN 6/10 maximum volume flow 53.0 m^3/h" extends AixLib.DataBase.Pumps.PumpPolynomialBased.PumpBaseRecord( maxMinHeight= [0,15.8,0.4; 3,16,0.4; 6,16,0.3; 9,16,0.2; @@ -13,10 +13,10 @@ record Pump_DN50_H05_16 "50/0.5-16 PN 6/10 maximum volume flow 53.0 m^3/h" cHQN=[ 0, 0, 1.31E-06; 0, 7.59E-06, 0; -0.00316, 0, 0] "coefficients for H = f(Q,N) from Pump_DN50 (similar scale of max volume flow and maxmin Speed)", - cPQN=[-2.45477E+01, 2.82590E-01, -2.38897E-04, 1.27064E-07, -1.27494E-11; + cPQN=[-4E+01, 2.3E-01, -3.1E-04, 1.27064E-07, -1.27494E-11; 0, 0, 3.23573E-06, 0, 0; 0, 8.70834E-05, 0, 0, 0; - -8.39000E-03, 0, 0, 0, 0] "coefficients for P = f(Q,N) from Pump_DN50 (similar scale of max volume flow and maxmin Speed)"); + -8.39000E-03, 0, 0, 0, 0] "coefficients for P = f(Q,N) inspired by Pump_DN50 and quick calibration by hand"); annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( coordinateSystem(preserveAspectRatio=false)), From 2190e10542c859be3b952f941b661113c235245b Mon Sep 17 00:00:00 2001 From: "sarah.leidolf" Date: Tue, 13 Dec 2022 09:15:12 +0100 Subject: [PATCH 05/56] update pump characterisic curve pump DN25_H05_12 --- .../PumpPolynomialBased/Pump_DN25_H05_12.mo | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN25_H05_12.mo b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN25_H05_12.mo index 071c37fb8a..9e3b333f1e 100644 --- a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN25_H05_12.mo +++ b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN25_H05_12.mo @@ -2,11 +2,20 @@ within AixLib.DataBase.Pumps.PumpPolynomialBased; model Pump_DN25_H05_12 "25/0.5-12 PN 10 maximum volume flow 12.0 m^3/h" extends AixLib.DataBase.Pumps.PumpPolynomialBased.PumpBaseRecord( maxMinHeight= - [0,12.2,0.4; 0.5, 12.3, 0.4; 1, 12.3, 0.4; 1.5, 12.2, 0.4; - 2, 12, 0.3; 2.5, 11.8, 0.2; 3, 11.5, 0.3; - 4, 10.8, 0.5; 5, 9.9, 0.6; 6, 9, 1; - 7, 8.2, 1.4; 8, 7.4, 1.9; 9, 6.6, 2.4; - 10, 5.7, 2.9; 11, 4.8, 3.5], + [0, 12.269209486166007, 0.29600790513834063; +0.5227272727272729, 12.334664031620553, 0.2824901185770763; +1, 12.322213438735178, 0.3091699604743088; +1.5045454545454549, 12.230790513833991, 0.21774703557312414; +2.0090909090909093, 11.943715415019762, 0.16545454545454596; +2.5, 11.65699604743083, 0.07438735177865752; +3.018181818181818, 11.291660079051383, 0.09999999999999964; +3.9863636363636363, 10.561343873517785, 0.3486561264822132; +5.009090909090909, 9.713280632411067, 0.5176284584980237; +5.990909090909091, 8.905059288537547, 0.8050592885375494; +7.490909090909091, 7.613754940711462, 1.3528853754940702; +8.990909090909092, 6.283675889328062, 2.0181027667984175; +10.477272727272727, 4.796719367588931, 2.879328063241106; +11.527272727272727, 3.5954150197628447, 3.5954150197628447], maxMinSpeedCurves= [0,4350,750; 11,4350,750], nMin=750, From 61934183ed9f16ed791a78573e8dd0be186ab5b1 Mon Sep 17 00:00:00 2001 From: "sarah.leidolf" Date: Tue, 13 Dec 2022 09:20:02 +0100 Subject: [PATCH 06/56] update pump characteristic curve pump DN50_H0.5-16/ add documentation --- .../PumpPolynomialBased/Pump_DN25_H05_12.mo | 5 ++++ .../PumpPolynomialBased/Pump_DN50_H05_16.mo | 26 +++++++++++++++---- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN25_H05_12.mo b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN25_H05_12.mo index 9e3b333f1e..a0259437b4 100644 --- a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN25_H05_12.mo +++ b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN25_H05_12.mo @@ -34,5 +34,10 @@ model Pump_DN25_H05_12 "25/0.5-12 PN 10 maximum volume flow 12.0 m^3/h" Documentation(info="

maxMinHeight=[Q [m3/h], Hmax [m], Hmin [m]] (maximum and minimum boundaries of pump)

maxMinSpeedCurves=[Q [m3/h], nMax [rev/min], nMin [rev/min]](maximum and minimum boundaries of pump speed)

+ +Data sheet: +https://wilo.com/de/de/Katalog/de/produkte-expertise/wilo-stratos-maxo/stratos-maxo-25-0-5-12-pn-10 + ")); end Pump_DN25_H05_12; diff --git a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN50_H05_16.mo b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN50_H05_16.mo index cd4d4f676c..27e1ad79df 100644 --- a/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN50_H05_16.mo +++ b/AixLib/DataBase/Pumps/PumpPolynomialBased/Pump_DN50_H05_16.mo @@ -2,10 +2,20 @@ within AixLib.DataBase.Pumps.PumpPolynomialBased; record Pump_DN50_H05_16 "50/0,5-16 PN 6/10 maximum volume flow 53.0 m^3/h" extends AixLib.DataBase.Pumps.PumpPolynomialBased.PumpBaseRecord( maxMinHeight= - [0,15.8,0.4; 3,16,0.4; 6,16,0.3; 9,16,0.2; - 11,15.9,0.05; 12,15.8,0; 14,15.4,0.1; 18,14.2,0.3; - 22,13,0.6; 26,11.7,0.8; 30,10.5,1; 35,9,1.2; - 40,7.6,1.8; 45,6,2.05; 50,4.3,2.7; 53,3,3], + [0, 15.801652892561986, 0.3801652892562011; +2.0580912863070537, 16, 0.3305785123966949; +4.091286307053942, 16, 0.3305785123966949; +6.008298755186722, 16, 0.2809917355371887; +8.04149377593361, 15.950413223140497, 0.23140495867768607; +10.016597510373446, 16, 0.08264462809917461; +12.049792531120332, 15.851239669421489, 0.033057851239671976; +13.966804979253114, 15.454545454545457, 0.18181818181817988; +17.975103734439834, 14.363636363636365, 0.23140495867768607; +21.925311203319502, 13.024793388429753, 0.4297520661157037; +27.90871369294606, 11.041322314049587, 0.8264462809917354; +33.89211618257262, 9.355371900826448, 1.1735537190082646; +41.908713692946066, 6.87603305785124, 1.8677685950413228; +52.713692946058096, 3.0578512396694233, 3.0578512396694233], maxMinSpeedCurves= [0,3200,500; 53,3200,500], nMin=500, @@ -23,6 +33,12 @@ record Pump_DN50_H05_16 "50/0,5-16 PN 6/10 maximum volume flow 53.0 m^3/h" Documentation(info="

maxMinHeight=[Q [m3/h], Hmax [m], Hmin [m]] (maximum and minimum boundaries of pump)

maxMinSpeedCurves=[Q [m3/h], nMax [rev/min], nMin [rev/min]](maximum and minimum boundaries of pump speed)

-")); + +Data sheet: +https://wilo.com/de/de/Katalog/de/produkte-expertise/wilo-stratos-maxo/stratos-maxo-50-0-5-16-pn-6-10 + + +")); end Pump_DN50_H05_16; From 32e33624339d31e597e1be0da86c34d6c5a3ba62 Mon Sep 17 00:00:00 2001 From: Larissa Date: Tue, 3 Jan 2023 11:02:37 +0100 Subject: [PATCH 07/56] Add table for opening hours for swimming pools #1417 --- .../Profile_timeOpe_pools.txt | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 AixLib/Resources/LowOrder_ExampleData/Profile_timeOpe_pools.txt diff --git a/AixLib/Resources/LowOrder_ExampleData/Profile_timeOpe_pools.txt b/AixLib/Resources/LowOrder_ExampleData/Profile_timeOpe_pools.txt new file mode 100644 index 0000000000..d1a644aedf --- /dev/null +++ b/AixLib/Resources/LowOrder_ExampleData/Profile_timeOpe_pools.txt @@ -0,0 +1,28 @@ +#1 +double OpeningHours(25,16) +0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +3600 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +7200 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +10800 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +14400 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +18000 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +21600 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +25200 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +28800 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +32400 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +36000 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +39600 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +43200 1 1 1 1 1 1 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 0.5 +46800 0.5 0.5 0.5 0.5 0.5 0.5 1 1 1 1 1 1 1 1 1 +50400 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +54000 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +57600 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +61200 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +64800 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +68400 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +72000 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +75600 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +79200 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 +82800 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 +86400 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 + From fd315912efc8bc13c48390b31e3d3c7b46edc107 Mon Sep 17 00:00:00 2001 From: Larissa Date: Tue, 3 Jan 2023 11:10:32 +0100 Subject: [PATCH 08/56] Change and add zone records for integration of swimming pools #1417 --- .../OfficePassiveHouse/OPH_1_Office.mo | 5 +- .../OPH_1_OfficeNoHeaterCooler.mo | 5 +- .../OfficePassiveHouse/package.order | 1 + .../DataBase/ThermalZones/Office_1995_1000.mo | 5 +- .../SwimmingFacility/SwimmingHall.mo | 117 ++++++++++++++++++ .../ThermalZones/SwimmingFacility/package.mo | 4 + .../SwimmingFacility/package.order | 1 + .../DataBase/ThermalZones/ZoneBaseRecord.mo | 3 + .../DataBase/ThermalZones/ZoneRecordDummy.mo | 5 +- AixLib/DataBase/ThermalZones/package.order | 1 + 10 files changed, 143 insertions(+), 4 deletions(-) create mode 100644 AixLib/DataBase/ThermalZones/SwimmingFacility/SwimmingHall.mo create mode 100644 AixLib/DataBase/ThermalZones/SwimmingFacility/package.mo create mode 100644 AixLib/DataBase/ThermalZones/SwimmingFacility/package.order diff --git a/AixLib/DataBase/ThermalZones/OfficePassiveHouse/OPH_1_Office.mo b/AixLib/DataBase/ThermalZones/OfficePassiveHouse/OPH_1_Office.mo index 5c0a38249a..5adc12493e 100644 --- a/AixLib/DataBase/ThermalZones/OfficePassiveHouse/OPH_1_Office.mo +++ b/AixLib/DataBase/ThermalZones/OfficePassiveHouse/OPH_1_Office.mo @@ -88,7 +88,10 @@ record OPH_1_Office "Office zone of office building" CoolerOn=false, TThresholdHeater=273.15 + 15, TThresholdCooler=273.15 + 22, - withIdealThresholds=false); + withIdealThresholds=false, + use_pools=false, + nPools=0, + poolParam={AixLib.DataBase.Pools.IndoorSwimmingPoolDummy()}); annotation (Documentation(revisions="