Merge remote-tracking branch 'remotes/pp/develop' into controller_nrv

Author: ttrummel

pandapipes/create.py

@@ -170,8 +170,8 @@ def set_user_pf_options(net, reset=False, **kwargs):
     This function sets the "user_pf_options" dictionary for net. These options overrule
     net._internal_options once they are added to net. These options are used in configuration of
     load flow calculation.
-    At the same time, user-defined arguments for pandapower.runpp() always have a higher priority.
-    To remove user_pf_options, set "overwrite = True" and provide no additional arguments.
+    At the same time, user-defined arguments for `pandapipes.pipeflow()` always have a higher
+    priority. To remove user_pf_options, set "reset = True" and provide no additional arguments.
 
     :param net: pandapipes network for which to create user options
     :type net: pandapipesNet

pandapipes/pipeflow_setup.py

@@ -1,8 +1,8 @@
-263 0.7601724655675309
-273 0.7320721770940607
-283 0.7059981039503254
-293 0.6817225592492853
-303 0.6590718810611205
-313 0.637889297594854
-323 0.6180304720790736
-333 0.5993769221606164
+263 0.7614762591064257
+273 0.733332277439119
+283 0.7072104923835694
+293 0.6828947600611692
+303 0.660205611537355
+313 0.6389854855679075
+323 0.6190946329317856
+333 0.6004074588524487

pandapipes/properties/carbondioxid/density.txt renamed to pandapipes/properties/carbondioxide/density.txt

@@ -1,8 +1,8 @@
-263 2116.275649450405
-273 2133.8009387428015
-283 2153.264304632777
-293 2174.599077755464
-303 2197.6871835478196
-313 2222.437403963176
-323 2248.7721608228626
-333 2276.504072959723
+263 2111.7430409177705
+273 2129.19525821288
+283 2148.5756908384515
+293 2169.8204812997346
+303 2192.8111461983763
+313 2217.455354914997
+323 2243.67904088272
+333 2271.295613279192

pandapipes/properties/carbondioxid/heat_capacity.txt renamed to pandapipes/properties/carbondioxide/heat_capacity.txt

@@ -1 +1 @@
-16.534465
+16.604497

pandapipes/properties/carbondioxid/molar_mass.txt renamed to pandapipes/properties/carbondioxide/molar_mass.txt

@@ -1,8 +1,8 @@
-263 1.0035530617360702e-05
-273 1.0390365321293799e-05
-283 1.0692713111636964e-05
-293 1.0994950155374195e-05
-303 1.1324299455598343e-05
-313 1.1694770044987924e-05
-323 1.1997184580971867e-05
-333 1.229928445542125e-05
+263 1.0047118361853041e-05
+273 1.04021750220461e-05
+283 1.0704866480048474e-05
+293 1.1007402297863992e-05
+303 1.1337005139349375e-05
+313 1.170765177634217e-05
+323 1.2010332619395079e-05
+333 1.231274052527204e-05

pandapipes/properties/carbondioxid/viscosity.txt renamed to pandapipes/properties/carbondioxide/viscosity.txt

@@ -1,8 +1,8 @@
-263 0.8061384658565334
-273 0.776244645669407
-283 0.7486623252182165
-293 0.7228932415821546
-303 0.6988702058487433
-313 0.6764325042987719
-323 0.6553291931563104
-333 0.6355887607852605
+263 0.8306178051814026
+273 0.799922400724048
+283 0.7714316639262186
+293 0.7449139708771392
+303 0.7201700961205101
+313 0.6970224553493767
+323 0.6753263217289178
+333 0.6549476238271483

pandapipes/properties/hgas/density.txt

@@ -1,8 +1,8 @@
-263 1988.0279940929372
-273 2004.2383040682475
-283 2022.2062184118254
-293 2041.8360344488058
-303 2063.044947202759
-313 2085.72538899377
-323 2109.8124859346017
-333 2135.097361889473
+263 1912.6508646326008
+273 1927.5860535717497
+283 1944.1070056856142
+293 1962.1734284157246
+303 1981.6919875625886
+313 2002.53540838842
+323 2024.704116513856
+333 2048.0058721763976

pandapipes/properties/hgas/heat_capacity.txt

@@ -1 +1 @@
-16.671231
+18.1138902

pandapipes/properties/hgas/molar_mass.txt

@@ -1,8 +1,8 @@
-263 1.0611887533890938e-05
-273 1.097999656553613e-05
-283 1.13003513726697e-05
-293 1.1620561612045843e-05
-303 1.1962418232021982e-05
-313 1.2342087570589509e-05
-323 1.266064664279232e-05
-333 1.2977373081403864e-05
+263 1.0819805733440352e-05
+273 1.1191812807790197e-05
+283 1.1518299476596454e-05
+293 1.1843752890043477e-05
+303 1.2190162697374919e-05
+313 1.2572974116790026e-05
+323 1.2896201894801348e-05
+333 1.3218481585118151e-05

pandapipes/properties/hgas/viscosity.txt

@@ -1,8 +1,60 @@
-263 1.284
-273 1.234
-283 1.1924
-293 1.1508
-303 1.1126
-313 1.0778
-323 1.043
-333 1.01284
+# NIST Chemistry WebBook, SRD 69
+# https://webbook.nist.gov/cgi/fluid.cgi?P=1&TLow=263.15&THigh=373.15&TInc=2&Applet=on&Digits=5&ID=C7727379&Action=Load&Type=IsoBar&TUnit=K&PUnit=bar&DUnit=kg%2Fm3&HUnit=kJ%2Fkg&WUnit=m%2Fs&VisUnit=Pa*s&STUnit=N%2Fm&RefState=DEF
+# Eric W. Lemmon, Mark O. McLinden and Daniel G. Friend, "Thermophysical Properties of Fluid Systems" in NIST Chemistry WebBook, NIST Standard Reference Database Number 69, Eds. P.J. Linstrom and W.G. Mallard, National Institute of Standards and Technology, Gaithersburg MD, 20899, https://doi.org/10.18434/T4D303, (retrieved June 10, 2020)
+# temperature in Kelvin, density in kg/m³ at 1 bar
+263.15 1.28110
+265.15 1.27140
+267.15 1.26180
+269.15 1.25240
+271.15 1.24320
+273.15 1.23400
+275.15 1.22500
+277.15 1.21620
+279.15 1.20740
+281.15 1.19880
+283.15 1.19030
+285.15 1.18190
+287.15 1.17370
+289.15 1.16550
+291.15 1.15750
+293.15 1.14960
+295.15 1.14180
+297.15 1.13410
+299.15 1.12650
+301.15 1.11900
+303.15 1.11160
+305.15 1.10430
+307.15 1.09710
+309.15 1.09000
+311.15 1.08290
+313.15 1.07600
+315.15 1.06920
+317.15 1.06240
+319.15 1.05570
+321.15 1.04910
+323.15 1.04260
+325.15 1.03620
+327.15 1.02990
+329.15 1.02360
+331.15 1.01740
+333.15 1.01130
+335.15 1.00520
+337.15 0.99927
+339.15 0.99336
+341.15 0.98753
+343.15 0.98177
+345.15 0.97607
+347.15 0.97044
+349.15 0.96487
+351.15 0.95936
+353.15 0.95392
+355.15 0.94854
+357.15 0.94323
+359.15 0.93797
+361.15 0.93276
+363.15 0.92762
+365.15 0.92253
+367.15 0.91750
+369.15 0.91252
+371.15 0.90760
+373.15 0.90273

pandapipes/properties/lgas/density.txt

@@ -1,8 +1,60 @@
-263 1.0414e3
-273 1.041e3
-283 1.041e3
-293 1.041e3
-303 1.0412e3
-313 1.0416e3
-323 1.042e3
-333 1.042e3
+# NIST Chemistry WebBook, SRD 69
+# https://webbook.nist.gov/cgi/fluid.cgi?P=1&TLow=263.15&THigh=373.15&TInc=2&Applet=on&Digits=5&ID=C7727379&Action=Load&Type=IsoBar&TUnit=K&PUnit=bar&DUnit=kg%2Fm3&HUnit=kJ%2Fkg&WUnit=m%2Fs&VisUnit=Pa*s&STUnit=N%2Fm&RefState=DEF
+# Eric W. Lemmon, Mark O. McLinden and Daniel G. Friend, "Thermophysical Properties of Fluid Systems" in NIST Chemistry WebBook, NIST Standard Reference Database Number 69, Eds. P.J. Linstrom and W.G. Mallard, National Institute of Standards and Technology, Gaithersburg MD, 20899, https://doi.org/10.18434/T4D303, (retrieved June 10, 2020)
+# temperature in Kelvin, isobaric heat capacity in J/(kg K) at 1 bar
+263.15 1041.5
+265.15 1041.5
+267.15 1041.5
+269.15 1041.4
+271.15 1041.4
+273.15 1041.4
+275.15 1041.4
+277.15 1041.4
+279.15 1041.3
+281.15 1041.3
+283.15 1041.3
+285.15 1041.3
+287.15 1041.3
+289.15 1041.3
+291.15 1041.3
+293.15 1041.3
+295.15 1041.3
+297.15 1041.3
+299.15 1041.3
+301.15 1041.3
+303.15 1041.4
+305.15 1041.4
+307.15 1041.4
+309.15 1041.4
+311.15 1041.4
+313.15 1041.4
+315.15 1041.5
+317.15 1041.5
+319.15 1041.5
+321.15 1041.6
+323.15 1041.6
+325.15 1041.6
+327.15 1041.7
+329.15 1041.7
+331.15 1041.7
+333.15 1041.8
+335.15 1041.8
+337.15 1041.9
+339.15 1041.9
+341.15 1042.0
+343.15 1042.1
+345.15 1042.1
+347.15 1042.2
+349.15 1042.3
+351.15 1042.3
+353.15 1042.4
+355.15 1042.5
+357.15 1042.5
+359.15 1042.6
+361.15 1042.7
+363.15 1042.8
+365.15 1042.9
+367.15 1043.0
+369.15 1043.1
+371.15 1043.2
+373.15 1043.3

pandapipes/properties/lgas/heat_capacity.txt

@@ -1 +1,2 @@
-14.007
+# molar mass N2 in kg/kmol
+28.0134

pandapipes/properties/lgas/molar_mass.txt

@@ -1,8 +1,60 @@
-263 16.162e-6
-273 16.65e-6
-283 17.122e-6
-293 17.594e-6
-303 18.056e-6
-313 18.508e-6
-323 18.96e-6
-333 19.396e-6
+# NIST Chemistry WebBook, SRD 69
+# https://webbook.nist.gov/cgi/fluid.cgi?P=1&TLow=263.15&THigh=373.15&TInc=2&Applet=on&Digits=5&ID=C7727379&Action=Load&Type=IsoBar&TUnit=K&PUnit=bar&DUnit=kg%2Fm3&HUnit=kJ%2Fkg&WUnit=m%2Fs&VisUnit=Pa*s&STUnit=N%2Fm&RefState=DEF
+# Eric W. Lemmon, Mark O. McLinden and Daniel G. Friend, "Thermophysical Properties of Fluid Systems" in NIST Chemistry WebBook, NIST Standard Reference Database Number 69, Eds. P.J. Linstrom and W.G. Mallard, National Institute of Standards and Technology, Gaithersburg MD, 20899, https://doi.org/10.18434/T4D303, (retrieved June 10, 2020)
+# temperature in Kelvin, dynamic viscosity in Pa*s (or kg/(m s)) at 1 bar
+263.15 16.154E-6
+265.15 16.251E-6
+267.15 16.348E-6
+269.15 16.445E-6
+271.15 16.541E-6
+273.15 16.637E-6
+275.15 16.732E-6
+277.15 16.828E-6
+279.15 16.923E-6
+281.15 17.017E-6
+283.15 17.112E-6
+285.15 17.206E-6
+287.15 17.300E-6
+289.15 17.394E-6
+291.15 17.487E-6
+293.15 17.580E-6
+295.15 17.673E-6
+297.15 17.766E-6
+299.15 17.858E-6
+301.15 17.950E-6
+303.15 18.042E-6
+305.15 18.133E-6
+307.15 18.225E-6
+309.15 18.316E-6
+311.15 18.407E-6
+313.15 18.497E-6
+315.15 18.588E-6
+317.15 18.678E-6
+319.15 18.767E-6
+321.15 18.857E-6
+323.15 18.946E-6
+325.15 19.036E-6
+327.15 19.124E-6
+329.15 19.213E-6
+331.15 19.302E-6
+333.15 19.390E-6
+335.15 19.478E-6
+337.15 19.565E-6
+339.15 19.653E-6
+341.15 19.740E-6
+343.15 19.827E-6
+345.15 19.914E-6
+347.15 20.001E-6
+349.15 20.087E-6
+351.15 20.174E-6
+353.15 20.260E-6
+355.15 20.345E-6
+357.15 20.431E-6
+359.15 20.516E-6
+361.15 20.601E-6
+363.15 20.686E-6
+365.15 20.771E-6
+367.15 20.856E-6
+369.15 20.940E-6
+371.15 21.024E-6
+373.15 21.108E-6