From 46df4a6510e656bf8cb99b9726ba288fba3ecb71 Mon Sep 17 00:00:00 2001 From: jowr Date: Fri, 18 Jul 2014 12:40:48 +0200 Subject: [PATCH] Added all pure fluids from Melinder's book, incompressible JSON files now check hashes before write, equation based fluids can be fitted as well --- dev/incompressible_liquids/AS10.json | 46 ++-- dev/incompressible_liquids/AS20.json | 46 ++-- dev/incompressible_liquids/AS30.json | 46 ++-- dev/incompressible_liquids/AS40.json | 46 ++-- dev/incompressible_liquids/AS55.json | 46 ++-- .../CPIncomp/.gitignore | 1 + .../CPIncomp/BaseObjects.py | 3 +- .../CPIncomp/DataObjects.py | 5 +- .../CPIncomp/DigitalFluids.py | 37 ++- .../CPIncomp/MelinderFluids.py | 259 ++++++++++++++---- .../CPIncomp/PureFluids.py | 33 +-- .../CPIncomp/WriterObjects.py | 57 +++- dev/incompressible_liquids/DEB.json | 75 +++++ dev/incompressible_liquids/DowJ.json | 54 ++-- dev/incompressible_liquids/DowQ.json | 54 ++-- .../ExampleMelinder.json | 254 ++++++++--------- dev/incompressible_liquids/ExamplePure.json | 54 ++-- .../ExampleSecCool.json | 216 +++++++-------- .../ExampleSolution.json | 110 ++++---- dev/incompressible_liquids/HC10.json | 54 ++-- dev/incompressible_liquids/HC20.json | 54 ++-- dev/incompressible_liquids/HC30.json | 54 ++-- dev/incompressible_liquids/HC40.json | 54 ++-- dev/incompressible_liquids/HC50.json | 54 ++-- dev/incompressible_liquids/HCB.json | 75 +++++ dev/incompressible_liquids/HCM.json | 75 +++++ dev/incompressible_liquids/HFE.json | 75 +++++ dev/incompressible_liquids/LiBr.json | 158 +++++------ dev/incompressible_liquids/NaK.json | 46 ++-- dev/incompressible_liquids/PMS1.json | 75 +++++ dev/incompressible_liquids/PMS2.json | 75 +++++ dev/incompressible_liquids/SAB.json | 75 +++++ dev/incompressible_liquids/T66.json | 54 ++-- dev/incompressible_liquids/T72.json | 54 ++-- dev/incompressible_liquids/TCO.json | 75 +++++ dev/incompressible_liquids/TD12.json | 54 ++-- dev/incompressible_liquids/TVP1.json | 54 ++-- dev/incompressible_liquids/TX22.json | 54 ++-- dev/incompressible_liquids/XLT.json | 46 ++-- dev/incompressible_liquids/ZS10.json | 46 ++-- dev/incompressible_liquids/ZS25.json | 46 ++-- dev/incompressible_liquids/ZS40.json | 46 ++-- dev/incompressible_liquids/ZS45.json | 46 ++-- dev/incompressible_liquids/ZS55.json | 46 ++-- .../all_incompressibles.py | 52 +++- .../Incompressible/IncompressibleBackend.cpp | 10 + 46 files changed, 1943 insertions(+), 1106 deletions(-) create mode 100644 dev/incompressible_liquids/CPIncomp/.gitignore create mode 100644 dev/incompressible_liquids/DEB.json create mode 100644 dev/incompressible_liquids/HCB.json create mode 100644 dev/incompressible_liquids/HCM.json create mode 100644 dev/incompressible_liquids/HFE.json create mode 100644 dev/incompressible_liquids/PMS1.json create mode 100644 dev/incompressible_liquids/PMS2.json create mode 100644 dev/incompressible_liquids/SAB.json create mode 100644 dev/incompressible_liquids/TCO.json diff --git a/dev/incompressible_liquids/AS10.json b/dev/incompressible_liquids/AS10.json index 2d7cf798..415f20c0 100644 --- a/dev/incompressible_liquids/AS10.json +++ b/dev/incompressible_liquids/AS10.json @@ -3,23 +3,23 @@ "coeffs": "null", "type": "notdefined" }, - "Tbase": 2.825000000000000e+02, - "Tmax": 3.000000000000000e+02, - "Tmin": 2.650000000000000e+02, - "TminPsat": 3.000000000000000e+02, + "Tbase": 2.82500000e+02, + "Tmax": 3.00000000e+02, + "Tmin": 2.65000000e+02, + "TminPsat": 3.00000000e+02, "conductivity": { "coeffs": [ [ - 5.281000000000021e-01 + 5.28100000e-01 ], [ - 1.481922799422808e-03 + 1.48192280e-03 ], [ - 1.904761904670052e-07 + 1.90476190e-07 ], [ - 4.040404040531042e-09 + 4.04040404e-09 ] ], "type": "polynomial" @@ -27,16 +27,16 @@ "density": { "coeffs": [ [ - 1.088100000000004e+03 + 1.08810000e+03 ], [ - -2.000000000000093e-01 + -2.00000000e-01 ], [ - -1.962319196024964e-14 + -2.08721929e-14 ], [ - 6.001220809234302e-17 + 4.41257034e-17 ] ], "type": "polynomial" @@ -55,16 +55,16 @@ "specific_heat": { "coeffs": [ [ - 3.559468750000013e+03 + 3.55946875e+03 ], [ - 1.760000000000010e+00 + 1.76000000e+00 ], [ - -1.328571428577607e-02 + -1.32857143e-02 ], [ - 1.543287291462564e-16 + 4.72137323e-16 ] ], "type": "polynomial" @@ -72,16 +72,16 @@ "viscosity": { "coeffs": [ [ - -6.215795740371730e+00 + -6.21579574e+00 ], [ - -3.389533627074049e-02 + -3.38953363e-02 ], [ - 2.819366230160936e-04 + 2.81936623e-04 ], [ - 4.968724861396629e-06 + 4.96872486e-06 ] ], "type": "exppolynomial" @@ -90,7 +90,7 @@ "coeffs": "null", "type": "notdefined" }, - "xbase": 0.000000000000000e+00, - "xmax": 1.000000000000000e+00, - "xmin": 0.000000000000000e+00 + "xbase": 0.00000000e+00, + "xmax": 1.00000000e+00, + "xmin": 0.00000000e+00 } \ No newline at end of file diff --git a/dev/incompressible_liquids/AS20.json b/dev/incompressible_liquids/AS20.json index ee8bef9f..39bc3acd 100644 --- a/dev/incompressible_liquids/AS20.json +++ b/dev/incompressible_liquids/AS20.json @@ -3,23 +3,23 @@ "coeffs": "null", "type": "notdefined" }, - "Tbase": 2.775000000000000e+02, - "Tmax": 3.000000000000000e+02, - "Tmin": 2.550000000000000e+02, - "TminPsat": 3.000000000000000e+02, + "Tbase": 2.77500000e+02, + "Tmax": 3.00000000e+02, + "Tmin": 2.55000000e+02, + "TminPsat": 3.00000000e+02, "conductivity": { "coeffs": [ [ - 4.866000000000000e-01 + 4.86600000e-01 ], [ - 1.345876068376132e-03 + 1.34587607e-03 ], [ - 4.336808689942018e-19 + -2.16840434e-19 ], [ - -7.770007770018526e-09 + -7.77000777e-09 ] ], "type": "polynomial" @@ -27,16 +27,16 @@ "density": { "coeffs": [ [ - 1.146029375000000e+03 + 1.14602938e+03 ], [ - -2.332837995337918e-01 + -2.33283800e-01 ], [ - -1.500000000000390e-03 + -1.50000000e-03 ], [ - -4.662004661563674e-07 + -4.66200466e-07 ] ], "type": "polynomial" @@ -55,16 +55,16 @@ "specific_heat": { "coeffs": [ [ - 3.274725625000000e+03 + 3.27472563e+03 ], [ - 2.752479603729474e+00 + 2.75247960e+00 ], [ - -1.219696969697237e-02 + -1.21969697e-02 ], [ - 2.331002330738957e-06 + 2.33100233e-06 ] ], "type": "polynomial" @@ -72,16 +72,16 @@ "viscosity": { "coeffs": [ [ - -5.841832378535313e+00 + -5.84183238e+00 ], [ - -3.570587454574967e-02 + -3.57058745e-02 ], [ - 3.090792348276125e-04 + 3.09079235e-04 ], [ - 1.633138668671204e-06 + 1.63313867e-06 ] ], "type": "exppolynomial" @@ -90,7 +90,7 @@ "coeffs": "null", "type": "notdefined" }, - "xbase": 0.000000000000000e+00, - "xmax": 1.000000000000000e+00, - "xmin": 0.000000000000000e+00 + "xbase": 0.00000000e+00, + "xmax": 1.00000000e+00, + "xmin": 0.00000000e+00 } \ No newline at end of file diff --git a/dev/incompressible_liquids/AS30.json b/dev/incompressible_liquids/AS30.json index 749ddd7b..b8a1960b 100644 --- a/dev/incompressible_liquids/AS30.json +++ b/dev/incompressible_liquids/AS30.json @@ -3,23 +3,23 @@ "coeffs": "null", "type": "notdefined" }, - "Tbase": 2.725000000000000e+02, - "Tmax": 3.000000000000000e+02, - "Tmin": 2.450000000000000e+02, - "TminPsat": 3.000000000000000e+02, + "Tbase": 2.72500000e+02, + "Tmax": 3.00000000e+02, + "Tmin": 2.45000000e+02, + "TminPsat": 3.00000000e+02, "conductivity": { "coeffs": [ [ - 4.595883928571428e-01 + 4.59588393e-01 ], [ - 1.255878658378725e-03 + 1.25587866e-03 ], [ - -4.495504495483776e-08 + -4.49550450e-08 ], [ - 5.180005180322996e-10 + 5.18000518e-10 ] ], "type": "polynomial" @@ -27,16 +27,16 @@ "density": { "coeffs": [ [ - 1.184064285714286e+03 + 1.18406429e+03 ], [ - -3.083657083657132e-01 + -3.08365708e-01 ], [ - -1.054945054944634e-03 + -1.05494505e-03 ], [ - 1.574721574718361e-05 + 1.57472157e-05 ] ], "type": "polynomial" @@ -55,16 +55,16 @@ "specific_heat": { "coeffs": [ [ - 3.073104464285714e+03 + 3.07310446e+03 ], [ - 3.026641414141602e+00 + 3.02664141e+00 ], [ - -2.706393606393398e-02 + -2.70639361e-02 ], [ - -3.418803418807522e-06 + -3.41880342e-06 ] ], "type": "polynomial" @@ -72,16 +72,16 @@ "viscosity": { "coeffs": [ [ - -5.503676000196893e+00 + -5.50367600e+00 ], [ - -4.059910791070042e-02 + -4.05991079e-02 ], [ - 3.653967386776785e-04 + 3.65396739e-04 ], [ - 2.170715099644642e-06 + 2.17071510e-06 ] ], "type": "exppolynomial" @@ -90,7 +90,7 @@ "coeffs": "null", "type": "notdefined" }, - "xbase": 0.000000000000000e+00, - "xmax": 1.000000000000000e+00, - "xmin": 0.000000000000000e+00 + "xbase": 0.00000000e+00, + "xmax": 1.00000000e+00, + "xmin": 0.00000000e+00 } \ No newline at end of file diff --git a/dev/incompressible_liquids/AS40.json b/dev/incompressible_liquids/AS40.json index 2d43649c..5fd2cc5f 100644 --- a/dev/incompressible_liquids/AS40.json +++ b/dev/incompressible_liquids/AS40.json @@ -3,23 +3,23 @@ "coeffs": "null", "type": "notdefined" }, - "Tbase": 2.675000000000000e+02, - "Tmax": 3.000000000000000e+02, - "Tmin": 2.350000000000000e+02, - "TminPsat": 3.000000000000000e+02, + "Tbase": 2.67500000e+02, + "Tmax": 3.00000000e+02, + "Tmin": 2.35000000e+02, + "TminPsat": 3.00000000e+02, "conductivity": { "coeffs": [ [ - 4.371531250000000e-01 + 4.37153125e-01 ], [ - 1.099425770308176e-03 + 1.09942577e-03 ], [ - -6.043956043977339e-08 + -6.04395604e-08 ], [ - -1.206636500654293e-09 + -1.20663650e-09 ] ], "type": "polynomial" @@ -27,16 +27,16 @@ "density": { "coeffs": [ [ - 1.216917410714286e+03 + 1.21691741e+03 ], [ - -3.648707909737565e-01 + -3.64870791e-01 ], [ - -1.379120879121565e-03 + -1.37912088e-03 ], [ - 1.735911147674232e-05 + 1.73591115e-05 ] ], "type": "polynomial" @@ -55,16 +55,16 @@ "specific_heat": { "coeffs": [ [ - 2.963758035714286e+03 + 2.96375804e+03 ], [ - 2.719425770308237e+00 + 2.71942577e+00 ], [ - -3.873626373626671e-02 + -3.87362637e-02 ], [ - -1.206636500528271e-06 + -1.20663650e-06 ] ], "type": "polynomial" @@ -72,16 +72,16 @@ "viscosity": { "coeffs": [ [ - -5.059184310876148e+00 + -5.05918431e+00 ], [ - -4.113405065661888e-02 + -4.11340507e-02 ], [ - 4.272709063727342e-04 + 4.27270906e-04 ], [ - -4.665818962723568e-06 + -4.66581896e-06 ] ], "type": "exppolynomial" @@ -90,7 +90,7 @@ "coeffs": "null", "type": "notdefined" }, - "xbase": 0.000000000000000e+00, - "xmax": 1.000000000000000e+00, - "xmin": 0.000000000000000e+00 + "xbase": 0.00000000e+00, + "xmax": 1.00000000e+00, + "xmin": 0.00000000e+00 } \ No newline at end of file diff --git a/dev/incompressible_liquids/AS55.json b/dev/incompressible_liquids/AS55.json index 03bf765d..957a04fb 100644 --- a/dev/incompressible_liquids/AS55.json +++ b/dev/incompressible_liquids/AS55.json @@ -3,23 +3,23 @@ "coeffs": "null", "type": "notdefined" }, - "Tbase": 2.600000000000000e+02, - "Tmax": 3.000000000000000e+02, - "Tmin": 2.200000000000000e+02, - "TminPsat": 3.000000000000000e+02, + "Tbase": 2.60000000e+02, + "Tmax": 3.00000000e+02, + "Tmin": 2.20000000e+02, + "TminPsat": 3.00000000e+02, "conductivity": { "coeffs": [ [ - 4.138541795665635e-01 + 4.13854180e-01 ], [ - 8.782120743035587e-04 + 8.78212074e-04 ], [ - 2.282249742002079e-06 + 2.28224974e-06 ], [ - -2.063983489261200e-10 + -2.06398349e-10 ] ], "type": "polynomial" @@ -27,16 +27,16 @@ "density": { "coeffs": [ [ - 1.255758204334366e+03 + 1.25575820e+03 ], [ - -4.348151014792544e-01 + -4.34815101e-01 ], [ - -1.940144478844275e-03 + -1.94014448e-03 ], [ - 1.943584451334826e-05 + 1.94358445e-05 ] ], "type": "polynomial" @@ -55,16 +55,16 @@ "specific_heat": { "coeffs": [ [ - 2.805432507739939e+03 + 2.80543251e+03 ], [ - 2.944659442724977e+00 + 2.94465944e+00 ], [ - -2.486790505675929e-02 + -2.48679051e-02 ], [ - -4.127966982175591e-07 + -4.12796698e-07 ] ], "type": "polynomial" @@ -72,16 +72,16 @@ "viscosity": { "coeffs": [ [ - -4.488370275019721e+00 + -4.48837028e+00 ], [ - -4.788028699446189e-02 + -4.78802870e-02 ], [ - 5.153213531288309e-04 + 5.15321353e-04 ], [ - -8.219705023597747e-06 + -8.21970502e-06 ] ], "type": "exppolynomial" @@ -90,7 +90,7 @@ "coeffs": "null", "type": "notdefined" }, - "xbase": 0.000000000000000e+00, - "xmax": 1.000000000000000e+00, - "xmin": 0.000000000000000e+00 + "xbase": 0.00000000e+00, + "xmax": 1.00000000e+00, + "xmin": 0.00000000e+00 } \ No newline at end of file diff --git a/dev/incompressible_liquids/CPIncomp/.gitignore b/dev/incompressible_liquids/CPIncomp/.gitignore new file mode 100644 index 00000000..82f0c3ac --- /dev/null +++ b/dev/incompressible_liquids/CPIncomp/.gitignore @@ -0,0 +1 @@ +/data/ diff --git a/dev/incompressible_liquids/CPIncomp/BaseObjects.py b/dev/incompressible_liquids/CPIncomp/BaseObjects.py index 8efb11a7..ff78b9f0 100644 --- a/dev/incompressible_liquids/CPIncomp/BaseObjects.py +++ b/dev/incompressible_liquids/CPIncomp/BaseObjects.py @@ -83,7 +83,8 @@ class IncompressibleData(object): return np.polynomial.polynomial.polyval(x-offset, coeffs) - def shapeArray(self, array, axs=0): + @staticmethod + def shapeArray(array, axs=0): """ A function that promotes a 1D array to 2D and also returns the columns and rows. diff --git a/dev/incompressible_liquids/CPIncomp/DataObjects.py b/dev/incompressible_liquids/CPIncomp/DataObjects.py index dfdb501f..44a2aa87 100644 --- a/dev/incompressible_liquids/CPIncomp/DataObjects.py +++ b/dev/incompressible_liquids/CPIncomp/DataObjects.py @@ -194,11 +194,12 @@ class DigitalData(SolutionData): def getFromFile(self, data): fullPath = self.getFile(data) - return np.loadtxt(fullPath) + _,_,res = IncompressibleData.shapeArray(np.loadtxt(fullPath)) + return res def writeToFile(self, data, array): fullPath = self.getFile(data) - return np.savetxt(fullPath, array, fmt='%1.5e') + return np.savetxt(fullPath, array, fmt='%1.8e') def getTrange(self): if self.Tmin m2/s * kg/m3 = kg/s/m = Pa s - self.viscosity.data = f_mu(temp)/1e3 - self.Tmin = np.min(self.temperature.data) - self.Tmax = np.max(self.temperature.data) - self.TminPsat = self.Tmax - self.name = "NaK" - self.description = "NitrateSalt" - self.reference = "Solar Power Tower Design Basis Document, Alexis B. Zavoico, Sandia Labs, USA" - self.reshapeAll() - + class SylthermXLT(PureData): """ diff --git a/dev/incompressible_liquids/CPIncomp/WriterObjects.py b/dev/incompressible_liquids/CPIncomp/WriterObjects.py index f5e6f24a..8c02068d 100644 --- a/dev/incompressible_liquids/CPIncomp/WriterObjects.py +++ b/dev/incompressible_liquids/CPIncomp/WriterObjects.py @@ -7,6 +7,9 @@ import CPIncomp.CoefficientObjects as CO from CoolProp.CoolProp import FluidsList import CoolProp.CoolProp as CP +import hashlib +import os, CPIncomp +import json class SolutionDataWriter(object): """ @@ -126,9 +129,30 @@ class SolutionDataWriter(object): # except errList as ve: # if self.verbose: print(name, ": Could not fit M2M coefficients: ", ve) # pass - + + def get_hash(self,data): + return hashlib.sha224(data).hexdigest() - def toJSON(self,data): + def get_hash_file(self): + return os.path.join(CPIncomp.__path__[0], 'data', "hashes.json") + + def load_hashes(self): + hashes_fname = self.get_hash_file() + if os.path.exists(hashes_fname): + hashes = json.load(open(hashes_fname,'r')) + else: + hashes = dict() + return hashes + + def write_hashes(self, hashes): + hashes_fname = self.get_hash_file() + fp = open(hashes_fname,'w') + fp.write(json.dumps(hashes)) + fp.close() + return True + + + def toJSON(self,data,quiet=False): jobj = {} jobj['name'] = data.name # Name of the current fluid @@ -153,21 +177,34 @@ class SolutionDataWriter(object): jobj['T_freeze'] = data.T_freeze.toJSON() # Freezing temperature in K jobj['volume2mass'] = data.volume2mass.toJSON() # dd jobj['mass2mole'] = data.mass2mole.toJSON() # dd - - import json - - + original_float_repr = json.encoder.FLOAT_REPR - json.encoder.FLOAT_REPR = lambda o: format(o, ' .15e') #print json.dumps(1.0001) + json.encoder.FLOAT_REPR = lambda o: format(o, ' .8e') dump = json.dumps(jobj, indent = 2, sort_keys = True) json.encoder.FLOAT_REPR = original_float_repr #print dump + hashes = self.load_hashes() + hash = self.get_hash(dump) + + name = jobj['name'] + + if name not in hashes or \ + hashes[name] != hash: # update hashes and write file + + hashes[name] = hash + self.write_hashes(hashes) + + fp = open(name+'.json', 'w') + fp.write(dump) + fp.close() + + if not quiet: print(" ({0})".format("w"), end="") + else: + if not quiet: print(" ({0})".format("i"), end="") - fp = open(jobj['name']+'.json', 'w') - fp.write(dump) - fp.close() + diff --git a/dev/incompressible_liquids/DEB.json b/dev/incompressible_liquids/DEB.json new file mode 100644 index 00000000..72264faf --- /dev/null +++ b/dev/incompressible_liquids/DEB.json @@ -0,0 +1,75 @@ +{ + "T_freeze": { + "coeffs": "null", + "type": "notdefined" + }, + "Tbase": 0.00000000e+00, + "Tmax": 3.73150000e+02, + "Tmin": 1.93150000e+02, + "TminPsat": 3.73150000e+02, + "conductivity": { + "coeffs": [ + [ + 1.89132000e-04 + ], + [ + -2.06364000e-07 + ] + ], + "type": "polynomial" + }, + "density": { + "coeffs": [ + [ + 1.07650000e+03 + ], + [ + -7.31182000e-01 + ] + ], + "type": "polynomial" + }, + "description": "Diethylbenzene mixture - Dowtherm J Dow Chemical Co.", + "mass2mole": { + "coeffs": "null", + "type": "notdefined" + }, + "name": "DEB", + "reference": "Melinder-BOOK-2010", + "saturation_pressure": { + "coeffs": "null", + "type": "notdefined" + }, + "specific_heat": { + "coeffs": [ + [ + 9.99729000e+02 + ], + [ + 2.87576000e+00 + ] + ], + "type": "polynomial" + }, + "viscosity": { + "coeffs": [ + [ + 3.55030000e+00 + ], + [ + -5.66396000e-02 + ], + [ + 7.03331000e-05 + ] + ], + "type": "exppolynomial" + }, + "volume2mass": { + "coeffs": "null", + "type": "notdefined" + }, + "xbase": 0.00000000e+00, + "xmax": 1.00000000e+00, + "xmin": 0.00000000e+00 +} \ No newline at end of file diff --git a/dev/incompressible_liquids/DowJ.json b/dev/incompressible_liquids/DowJ.json index 9261a369..a4aba207 100644 --- a/dev/incompressible_liquids/DowJ.json +++ b/dev/incompressible_liquids/DowJ.json @@ -3,23 +3,23 @@ "coeffs": "null", "type": "notdefined" }, - "Tbase": 4.056500000000000e+02, - "Tmax": 6.181500000000000e+02, - "Tmin": 1.931500000000000e+02, - "TminPsat": 3.231500000000000e+02, + "Tbase": 4.05650000e+02, + "Tmax": 6.18150000e+02, + "Tmin": 1.93150000e+02, + "TminPsat": 3.23150000e+02, "conductivity": { "coeffs": [ [ - 1.045181597218628e-01 + 1.04518160e-01 ], [ - -2.128427362618795e-04 + -2.12842736e-04 ], [ - -3.453265039125692e-09 + -3.45326504e-09 ], [ - 3.580081778958827e-11 + 3.58008178e-11 ] ], "type": "polynomial" @@ -27,16 +27,16 @@ "density": { "coeffs": [ [ - 7.754588897578709e+02 + 7.75458890e+02 ], [ - -8.534277347697664e-01 + -8.53427735e-01 ], [ - -1.065803641008288e-03 + -1.06580364e-03 ], [ - -2.922265175507404e-06 + -2.92226518e-06 ] ], "type": "polynomial" @@ -51,16 +51,16 @@ "saturation_pressure": { "coeffs": [ [ - 1.012985880267094e+01 + 1.01298588e+01 ], [ - 3.443626046038295e-02 + 3.44362605e-02 ], [ - -1.149447100932215e-04 + -1.14944710e-04 ], [ - 2.278226641970620e-07 + 2.27822664e-07 ] ], "type": "exppolynomial" @@ -68,16 +68,16 @@ "specific_heat": { "coeffs": [ [ - 2.200295671418527e+03 + 2.20029567e+03 ], [ - 3.581551217140324e+00 + 3.58155122e+00 ], [ - 4.047385759359970e-03 + 4.04738576e-03 ], [ - 6.782714586058610e-06 + 6.78271459e-06 ] ], "type": "polynomial" @@ -85,16 +85,16 @@ "viscosity": { "coeffs": [ [ - -8.080822002422533e+00 + -8.08082200e+00 ], [ - -5.678878613784653e-03 + -5.67887861e-03 ], [ - 2.807776353226428e-05 + 2.80777635e-05 ], [ - -8.609571913429892e-08 + -8.60957191e-08 ] ], "type": "exppolynomial" @@ -103,7 +103,7 @@ "coeffs": "null", "type": "notdefined" }, - "xbase": 0.000000000000000e+00, - "xmax": 1.000000000000000e+00, - "xmin": 0.000000000000000e+00 + "xbase": 0.00000000e+00, + "xmax": 1.00000000e+00, + "xmin": 0.00000000e+00 } \ No newline at end of file diff --git a/dev/incompressible_liquids/DowQ.json b/dev/incompressible_liquids/DowQ.json index de9274fb..15700d25 100644 --- a/dev/incompressible_liquids/DowQ.json +++ b/dev/incompressible_liquids/DowQ.json @@ -3,23 +3,23 @@ "coeffs": "null", "type": "notdefined" }, - "Tbase": 4.356500000000000e+02, - "Tmax": 6.331500000000000e+02, - "Tmin": 2.381500000000000e+02, - "TminPsat": 3.931500000000000e+02, + "Tbase": 4.35650000e+02, + "Tmax": 6.33150000e+02, + "Tmin": 2.38150000e+02, + "TminPsat": 3.93150000e+02, "conductivity": { "coeffs": [ [ - 1.024267387898695e-01 + 1.02426739e-01 ], [ - -1.502677105266767e-04 + -1.50267711e-04 ], [ - -6.168555064486651e-08 + -6.16855506e-08 ], [ - 2.017077878870585e-10 + 2.01707788e-10 ] ], "type": "polynomial" @@ -27,16 +27,16 @@ "density": { "coeffs": [ [ - 8.575027788575609e+02 + 8.57502779e+02 ], [ - -7.530279480267433e-01 + -7.53027948e-01 ], [ - 1.626521243222229e-05 + 1.62652124e-05 ], [ - -1.775611968579411e-07 + -1.77561197e-07 ] ], "type": "polynomial" @@ -51,16 +51,16 @@ "saturation_pressure": { "coeffs": [ [ - 8.469541123786945e+00 + 8.46954112e+00 ], [ - 4.138126356429132e-02 + 4.13812636e-02 ], [ - -1.604817853020160e-04 + -1.60481785e-04 ], [ - 3.635619412853435e-07 + 3.63561941e-07 ] ], "type": "exppolynomial" @@ -68,16 +68,16 @@ "specific_heat": { "coeffs": [ [ - 2.095463520990945e+03 + 2.09546352e+03 ], [ - 3.029661769483991e+00 + 3.02966177e+00 ], [ - -5.398471597201684e-04 + -5.39847160e-04 ], [ - -8.597050011227743e-08 + -8.59705001e-08 ] ], "type": "polynomial" @@ -85,16 +85,16 @@ "viscosity": { "coeffs": [ [ - -7.872198144659531e+00 + -7.87219814e+00 ], [ - -7.907183787261247e-03 + -7.90718379e-03 ], [ - 4.338654280283766e-05 + 4.33865428e-05 ], [ - -1.506059158632480e-07 + -1.50605916e-07 ] ], "type": "exppolynomial" @@ -103,7 +103,7 @@ "coeffs": "null", "type": "notdefined" }, - "xbase": 0.000000000000000e+00, - "xmax": 1.000000000000000e+00, - "xmin": 0.000000000000000e+00 + "xbase": 0.00000000e+00, + "xmax": 1.00000000e+00, + "xmin": 0.00000000e+00 } \ No newline at end of file diff --git a/dev/incompressible_liquids/ExampleMelinder.json b/dev/incompressible_liquids/ExampleMelinder.json index 18ca7228..0a6a0494 100644 --- a/dev/incompressible_liquids/ExampleMelinder.json +++ b/dev/incompressible_liquids/ExampleMelinder.json @@ -2,77 +2,77 @@ "T_freeze": { "coeffs": [ [ - -2.629000000000000e+01, - -1.187000000000000e+02, - -1.218000000000000e+02, - -6.823000000000000e+01, - 1.297000000000000e+01, - 2.363000000000000e+02 + -2.62900000e+01, + -1.18700000e+02, + -1.21800000e+02, + -6.82300000e+01, + 1.29700000e+01, + 2.36300000e+02 ], [ - -2.575000000000000e-06, - -1.609000000000000e-03, - 3.865000000000000e-03, - 2.137000000000000e-02, - -5.407000000000000e-02, - 0.000000000000000e+00 + -2.57500000e-06, + -1.60900000e-03, + 3.86500000e-03, + 2.13700000e-02, + -5.40700000e-02, + 0.00000000e+00 ], [ - -6.732000000000000e-06, - 3.420000000000000e-05, - 8.768000000000000e-05, - -4.271000000000000e-04, - 0.000000000000000e+00, - 0.000000000000000e+00 + -6.73200000e-06, + 3.42000000e-05, + 8.76800000e-05, + -4.27100000e-04, + 0.00000000e+00, + 0.00000000e+00 ], [ - 1.630000000000000e-07, - 5.687000000000000e-08, - -2.095000000000000e-06, - 0.000000000000000e+00, - 0.000000000000000e+00, - 0.000000000000000e+00 + 1.63000000e-07, + 5.68700000e-08, + -2.09500000e-06, + 0.00000000e+00, + 0.00000000e+00, + 0.00000000e+00 ] ], "type": "polynomial" }, - "Tbase": 2.766859000000000e+02, - "Tmax": 3.131500000000000e+02, - "Tmin": 2.231500000000000e+02, - "TminPsat": 3.131500000000000e+02, + "Tbase": 2.76685900e+02, + "Tmax": 3.13150000e+02, + "Tmin": 2.23150000e+02, + "TminPsat": 3.13150000e+02, "conductivity": { "coeffs": [ [ - 4.175000000000000e-01, - -4.420999999999999e-01, - 2.044000000000000e-01, - 2.943000000000000e-01, - -8.666000000000000e-02, - -2.033000000000000e+00 + 4.17500000e-01, + -4.42100000e-01, + 2.04400000e-01, + 2.94300000e-01, + -8.66600000e-02, + -2.03300000e+00 ], [ - 7.270999999999999e-04, - -2.952000000000000e-03, - 3.413000000000000e-03, - -9.645999999999999e-04, - -4.573000000000000e-05, - 0.000000000000000e+00 + 7.27100000e-04, + -2.95200000e-03, + 3.41300000e-03, + -9.64600000e-04, + -4.57300000e-05, + 0.00000000e+00 ], [ - 2.823000000000000e-07, - 7.336000000000001e-06, - -3.665000000000000e-05, - 3.174000000000000e-05, - 0.000000000000000e+00, - 0.000000000000000e+00 + 2.82300000e-07, + 7.33600000e-06, + -3.66500000e-05, + 3.17400000e-05, + 0.00000000e+00, + 0.00000000e+00 ], [ - 9.718000000000000e-09, - 4.328000000000000e-08, - -2.791000000000000e-07, - 0.000000000000000e+00, - 0.000000000000000e+00, - 0.000000000000000e+00 + 9.71800000e-09, + 4.32800000e-08, + -2.79100000e-07, + 0.00000000e+00, + 0.00000000e+00, + 0.00000000e+00 ] ], "type": "polynomial" @@ -80,36 +80,36 @@ "density": { "coeffs": [ [ - 9.581000000000000e+02, - -1.391000000000000e+02, - -1.105000000000000e+02, - -1.208000000000000e+02, - 4.926999999999999e+02, - -7.727000000000000e+02 + 9.58100000e+02, + -1.39100000e+02, + -1.10500000e+02, + -1.20800000e+02, + 4.92700000e+02, + -7.72700000e+02 ], [ - -4.151000000000000e-01, - -1.510000000000000e+00, - 1.828000000000000e+00, - 2.992000000000000e+00, - -1.325000000000000e+01, - 0.000000000000000e+00 + -4.15100000e-01, + -1.51000000e+00, + 1.82800000e+00, + 2.99200000e+00, + -1.32500000e+01, + 0.00000000e+00 ], [ - -2.261000000000000e-03, - 1.113000000000000e-02, - -1.641000000000000e-02, - 1.455000000000000e-03, - 0.000000000000000e+00, - 0.000000000000000e+00 + -2.26100000e-03, + 1.11300000e-02, + -1.64100000e-02, + 1.45500000e-03, + 0.00000000e+00, + 0.00000000e+00 ], [ - 2.998000000000000e-07, - -3.264000000000000e-05, - 1.510000000000000e-04, - 0.000000000000000e+00, - 0.000000000000000e+00, - 0.000000000000000e+00 + 2.99800000e-07, + -3.26400000e-05, + 1.51000000e-04, + 0.00000000e+00, + 0.00000000e+00, + 0.00000000e+00 ] ], "type": "polynomial" @@ -128,36 +128,36 @@ "specific_heat": { "coeffs": [ [ - 3.887000000000000e+03, - -1.850000000000000e+03, - -3.769000000000000e+02, - -3.776000000000000e+03, - -1.504000000000000e+04, - 6.433000000000000e+04 + 3.88700000e+03, + -1.85000000e+03, + -3.76900000e+02, + -3.77600000e+03, + -1.50400000e+04, + 6.43300000e+04 ], [ - 7.201000000000000e+00, - 2.984000000000000e+01, - -1.196000000000000e+02, - -5.611000000000001e+01, - 7.373000000000001e+02, - 0.000000000000000e+00 + 7.20100000e+00, + 2.98400000e+01, + -1.19600000e+02, + -5.61100000e+01, + 7.37300000e+02, + 0.00000000e+00 ], [ - -8.978999999999999e-02, - -1.865000000000000e-01, - 9.801000000000001e-01, - -7.811000000000000e-01, - 0.000000000000000e+00, - 0.000000000000000e+00 + -8.97900000e-02, + -1.86500000e-01, + 9.80100000e-01, + -7.81100000e-01, + 0.00000000e+00, + 0.00000000e+00 ], [ - -4.390000000000000e-04, - -1.718000000000000e-03, - 6.659999999999999e-03, - 0.000000000000000e+00, - 0.000000000000000e+00, - 0.000000000000000e+00 + -4.39000000e-04, + -1.71800000e-03, + 6.66000000e-03, + 0.00000000e+00, + 0.00000000e+00, + 0.00000000e+00 ] ], "type": "polynomial" @@ -165,36 +165,36 @@ "viscosity": { "coeffs": [ [ - 1.153000000000000e+00, - 5.448000000000000e-01, - -5.552000000000000e+00, - 3.038000000000000e+00, - 6.669000000000000e+00, - -8.472000000000000e+00 + 1.15300000e+00, + 5.44800000e-01, + -5.55200000e+00, + 3.03800000e+00, + 6.66900000e+00, + -8.47200000e+00 ], [ - -3.866000000000000e-02, - 1.008000000000000e-02, - 8.384000000000000e-02, - -7.435000000000000e-02, - -9.105000000000001e-02, - 0.000000000000000e+00 + -3.86600000e-02, + 1.00800000e-02, + 8.38400000e-02, + -7.43500000e-02, + -9.10500000e-02, + 0.00000000e+00 ], [ - 2.779000000000000e-04, - -2.809000000000000e-04, - -3.997000000000000e-04, - 7.442000000000000e-04, - 0.000000000000000e+00, - 0.000000000000000e+00 + 2.77900000e-04, + -2.80900000e-04, + -3.99700000e-04, + 7.44200000e-04, + 0.00000000e+00, + 0.00000000e+00 ], [ - -1.543000000000000e-06, - 9.811000000000000e-07, - -3.466000000000000e-06, - 0.000000000000000e+00, - 0.000000000000000e+00, - 0.000000000000000e+00 + -1.54300000e-06, + 9.81100000e-07, + -3.46600000e-06, + 0.00000000e+00, + 0.00000000e+00, + 0.00000000e+00 ] ], "type": "polynomial" @@ -203,7 +203,7 @@ "coeffs": "null", "type": "notdefined" }, - "xbase": 3.051280000000000e-01, - "xmax": 6.000000000000000e-01, - "xmin": 0.000000000000000e+00 + "xbase": 3.05128000e-01, + "xmax": 6.00000000e-01, + "xmin": 0.00000000e+00 } \ No newline at end of file diff --git a/dev/incompressible_liquids/ExamplePure.json b/dev/incompressible_liquids/ExamplePure.json index e99c6b13..64f64e5e 100644 --- a/dev/incompressible_liquids/ExamplePure.json +++ b/dev/incompressible_liquids/ExamplePure.json @@ -3,23 +3,23 @@ "coeffs": "null", "type": "notdefined" }, - "Tbase": 3.731500000000000e+02, - "Tmax": 4.231500000000000e+02, - "Tmin": 3.231500000000000e+02, - "TminPsat": 4.231500000000000e+02, + "Tbase": 3.73150000e+02, + "Tmax": 4.23150000e+02, + "Tmin": 3.23150000e+02, + "TminPsat": 4.23150000e+02, "conductivity": { "coeffs": [ [ - 9.648018648018647e-02 + 9.64801865e-02 ], [ - -1.800893550893292e-04 + -1.80089355e-04 ], [ - -1.165501165501155e-07 + -1.16550117e-07 ], [ - -9.712509712375223e-10 + -9.71250971e-10 ] ], "type": "polynomial" @@ -27,16 +27,16 @@ "density": { "coeffs": [ [ - 7.024452214452213e+02 + 7.02445221e+02 ], [ - -7.703185703184593e-01 + -7.70318570e-01 ], [ - -5.361305361305524e-04 + -5.36130536e-04 ], [ - -5.439005438915205e-06 + -5.43900544e-06 ] ], "type": "polynomial" @@ -51,16 +51,16 @@ "saturation_pressure": { "coeffs": [ [ - 1.758406480398250e+00 + 1.75840648e+00 ], [ - 4.163045637749924e-02 + 4.16304564e-02 ], [ - -1.429827445583037e-04 + -1.42982745e-04 ], [ - 7.709858382251525e-08 + 7.70985838e-08 ] ], "type": "exppolynomial" @@ -68,16 +68,16 @@ "specific_heat": { "coeffs": [ [ - 2.446529137529137e+03 + 2.44652914e+03 ], [ - 4.096017871017286e+00 + 4.09601787e+00 ], [ - -2.074592074591486e-03 + -2.07459207e-03 ], [ - 1.942501940163629e-07 + 1.94250194e-07 ] ], "type": "polynomial" @@ -85,16 +85,16 @@ "viscosity": { "coeffs": [ [ - -7.952555049439570e-01 + -7.95255505e-01 ], [ - -9.663911227114340e-03 + -9.66391123e-03 ], [ - 2.713113951297377e-05 + 2.71311395e-05 ], [ - -2.190286143086986e-07 + -2.19028614e-07 ] ], "type": "exppolynomial" @@ -103,7 +103,7 @@ "coeffs": "null", "type": "notdefined" }, - "xbase": 0.000000000000000e+00, - "xmax": 1.000000000000000e+00, - "xmin": 0.000000000000000e+00 + "xbase": 0.00000000e+00, + "xmax": 1.00000000e+00, + "xmin": 0.00000000e+00 } \ No newline at end of file diff --git a/dev/incompressible_liquids/ExampleSecCool.json b/dev/incompressible_liquids/ExampleSecCool.json index b8d7e828..1d9b1189 100644 --- a/dev/incompressible_liquids/ExampleSecCool.json +++ b/dev/incompressible_liquids/ExampleSecCool.json @@ -1,51 +1,51 @@ { "T_freeze": { "coeffs": [ - 2.775555560000000e-01, - -2.297322170000000e+01, - -1.104050720000000e+02, - -1.207622810000000e+02, - -9.343458000000001e+01 + 2.77555556e-01, + -2.29732217e+01, + -1.10405072e+02, + -1.20762281e+02, + -9.34345800e+01 ], "type": "polyoffset" }, - "Tbase": 2.686700000000000e+02, - "Tmax": 2.931500000000000e+02, - "Tmin": 2.231500000000000e+02, - "TminPsat": 2.931500000000000e+02, + "Tbase": 2.68670000e+02, + "Tmax": 2.93150000e+02, + "Tmin": 2.23150000e+02, + "TminPsat": 2.93150000e+02, "conductivity": { "coeffs": [ [ - 4.082066700000000e-01, - -3.981687000000000e-01, - 1.583368000000000e-01, - -3.552049000000000e-01, - -9.884176000000000e-02, - 4.460000000000000e+00 + 4.08206670e-01, + -3.98168700e-01, + 1.58336800e-01, + -3.55204900e-01, + -9.88417600e-02, + 4.46000000e+00 ], [ - 6.629321000000000e-04, - -2.686475000000000e-03, - 9.039150000000001e-03, - -2.128257000000000e-02, - -5.562000000000000e-02, - 0.000000000000000e+00 + 6.62932100e-04, + -2.68647500e-03, + 9.03915000e-03, + -2.12825700e-02, + -5.56200000e-02, + 0.00000000e+00 ], [ - 3.685975000000000e-07, - 7.188415999999999e-06, - -1.041773000000000e-04, - 2.278001000000000e-04, - 0.000000000000000e+00, - 0.000000000000000e+00 + 3.68597500e-07, + 7.18841600e-06, + -1.04177300e-04, + 2.27800100e-04, + 0.00000000e+00, + 0.00000000e+00 ], [ - 4.703395000000000e-08, - 7.612361000000000e-09, - -2.734000000000000e-06, - 0.000000000000000e+00, - 0.000000000000000e+00, - 0.000000000000000e+00 + 4.70339500e-08, + 7.61236100e-09, + -2.73400000e-06, + 0.00000000e+00, + 0.00000000e+00, + 0.00000000e+00 ] ], "type": "polynomial" @@ -53,36 +53,36 @@ "density": { "coeffs": [ [ - 9.602466580000000e+02, - -1.290383910000000e+02, - -1.610425200000000e+02, - -1.969888000000000e+02, - 1.131559000000000e+03, - 9.181999000000000e+02 + 9.60246658e+02, + -1.29038391e+02, + -1.61042520e+02, + -1.96988800e+02, + 1.13155900e+03, + 9.18199900e+02 ], [ - -4.020348270000000e-01, - -1.624639890000000e+00, - 1.623301000000000e+00, - 4.367343000000000e+00, - 1.199000000000000e+00, - 0.000000000000000e+00 + -4.02034827e-01, + -1.62463989e+00, + 1.62330100e+00, + 4.36734300e+00, + 1.19900000e+00, + 0.00000000e+00 ], [ - -2.520477600000000e-03, - 1.101514000000000e-02, - -2.320217000000000e-03, - 7.794999000000000e-02, - 0.000000000000000e+00, - 0.000000000000000e+00 + -2.52047760e-03, + 1.10151400e-02, + -2.32021700e-03, + 7.79499900e-02, + 0.00000000e+00, + 0.00000000e+00 ], [ - 9.937482999999999e-06, - -1.346886000000000e-04, - 4.141999000000000e-04, - 0.000000000000000e+00, - 0.000000000000000e+00, - 0.000000000000000e+00 + 9.93748300e-06, + -1.34688600e-04, + 4.14199900e-04, + 0.00000000e+00, + 0.00000000e+00, + 0.00000000e+00 ] ], "type": "polynomial" @@ -101,36 +101,36 @@ "specific_heat": { "coeffs": [ [ - 3.822971230000000e+03, - -2.312240950000000e+03, - 6.787758260000001e+02, - 2.241389300000000e+03, - -3.045332000000000e+04, - -4.758000000000000e+04 + 3.82297123e+03, + -2.31224095e+03, + 6.78775826e+02, + 2.24138930e+03, + -3.04533200e+04, + -4.75800000e+04 ], [ - 2.350144950000000e+00, - 1.788839410000000e+01, - 6.828000000000000e+00, - 2.101166000000000e+02, - -9.812000000000000e+02, - 0.000000000000000e+00 + 2.35014495e+00, + 1.78883941e+01, + 6.82800000e+00, + 2.10116600e+02, + -9.81200000e+02, + 0.00000000e+00 ], [ - -4.724176000000000e-04, - -3.317949000000000e-02, - 1.002032000000000e+00, - -5.306000000000000e+00, - 0.000000000000000e+00, - 0.000000000000000e+00 + -4.72417600e-04, + -3.31794900e-02, + 1.00203200e+00, + -5.30600000e+00, + 0.00000000e+00, + 0.00000000e+00 ], [ - 4.242194000000000e-05, - 2.347190000000000e-03, - -1.894000000000000e-02, - 0.000000000000000e+00, - 0.000000000000000e+00, - 0.000000000000000e+00 + 4.24219400e-05, + 2.34719000e-03, + -1.89400000e-02, + 0.00000000e+00, + 0.00000000e+00, + 0.00000000e+00 ] ], "type": "polynomial" @@ -138,36 +138,36 @@ "viscosity": { "coeffs": [ [ - 1.472552550000000e+00, - 2.221899800000000e-01, - -4.406139000000000e+00, - 6.047984000000000e+00, - -1.954730000000000e+01, - -2.372000000000000e+01 + 1.47255255e+00, + 2.22189980e-01, + -4.40613900e+00, + 6.04798400e+00, + -1.95473000e+01, + -2.37200000e+01 ], [ - -4.118415660000000e-02, - 1.784479000000000e-02, - -3.564413000000000e-02, - 4.064671000000000e-02, - 1.915000000000000e+00, - 0.000000000000000e+00 + -4.11841566e-02, + 1.78447900e-02, + -3.56441300e-02, + 4.06467100e-02, + 1.91500000e+00, + 0.00000000e+00 ], [ - 2.572862000000000e-04, - -9.226343000000000e-05, - -2.178577000000000e-04, - -9.529999000000000e-04, - 0.000000000000000e+00, - 0.000000000000000e+00 + 2.57286200e-04, + -9.22634300e-05, + -2.17857700e-04, + -9.52999900e-04, + 0.00000000e+00, + 0.00000000e+00 ], [ - -1.699844000000000e-06, - -1.023552000000000e-05, - 4.482000000000000e-05, - 0.000000000000000e+00, - 0.000000000000000e+00, - 0.000000000000000e+00 + -1.69984400e-06, + -1.02355200e-05, + 4.48200000e-05, + 0.00000000e+00, + 0.00000000e+00, + 0.00000000e+00 ] ], "type": "polynomial" @@ -176,7 +176,7 @@ "coeffs": "null", "type": "notdefined" }, - "xbase": 3.157000000000000e-01, - "xmax": 5.000000000000000e-01, - "xmin": 0.000000000000000e+00 + "xbase": 3.15700000e-01, + "xmax": 5.00000000e-01, + "xmin": 0.00000000e+00 } \ No newline at end of file diff --git a/dev/incompressible_liquids/ExampleSolution.json b/dev/incompressible_liquids/ExampleSolution.json index ddf915b1..02b55af7 100644 --- a/dev/incompressible_liquids/ExampleSolution.json +++ b/dev/incompressible_liquids/ExampleSolution.json @@ -3,10 +3,10 @@ "coeffs": "null", "type": "notdefined" }, - "Tbase": 2.456500000000000e+02, - "Tmax": 2.631500000000000e+02, - "Tmin": 2.281500000000000e+02, - "TminPsat": 2.631500000000000e+02, + "Tbase": 2.45650000e+02, + "Tmax": 2.63150000e+02, + "Tmin": 2.28150000e+02, + "TminPsat": 2.63150000e+02, "conductivity": { "coeffs": "null", "type": "notdefined" @@ -14,36 +14,36 @@ "density": { "coeffs": [ [ - 1.026080708874463e+03, - -1.590170634919809e+02, - 2.363230519487098e+01, - -5.555555556031459e+01, - 3.787878787435842e+01, - 1.500000000001633e+03 + 1.02608071e+03, + -1.59017063e+02, + 2.36323052e+01, + -5.55555556e+01, + 3.78787879e+01, + 1.50000000e+03 ], [ - -8.565823197961835e-01, - 1.584394540610013e+00, - -4.885161135173223e-01, - 5.820105820079813e-01, - -1.298701298673707e+00, - 0.000000000000000e+00 + -8.56582320e-01, + 1.58439454e+00, + -4.88516114e-01, + 5.82010582e-01, + -1.29870130e+00, + 0.00000000e+00 ], [ - -2.059637188207991e-02, - 2.962207105057909e-02, - -3.287981859486457e-03, - 2.645502645515989e-02, - 0.000000000000000e+00, - 0.000000000000000e+00 + -2.05963719e-02, + 2.96220711e-02, + -3.28798186e-03, + 2.64550265e-02, + 0.00000000e+00, + 0.00000000e+00 ], [ - -2.976430976448491e-04, - 3.477633480047034e-04, - 1.827801827859139e-04, - 0.000000000000000e+00, - 0.000000000000000e+00, - 0.000000000000000e+00 + -2.97643098e-04, + 3.47763348e-04, + 1.82780183e-04, + 0.00000000e+00, + 0.00000000e+00, + 0.00000000e+00 ] ], "type": "polynomial" @@ -62,36 +62,36 @@ "specific_heat": { "coeffs": [ [ - 1.026080708874463e+03, - -1.590170634919809e+02, - 2.363230519487098e+01, - -5.555555556031459e+01, - 3.787878787435842e+01, - 1.500000000001633e+03 + 1.02608071e+03, + -1.59017063e+02, + 2.36323052e+01, + -5.55555556e+01, + 3.78787879e+01, + 1.50000000e+03 ], [ - -8.565823197961835e-01, - 1.584394540610013e+00, - -4.885161135173223e-01, - 5.820105820079813e-01, - -1.298701298673707e+00, - 0.000000000000000e+00 + -8.56582320e-01, + 1.58439454e+00, + -4.88516114e-01, + 5.82010582e-01, + -1.29870130e+00, + 0.00000000e+00 ], [ - -2.059637188207991e-02, - 2.962207105057909e-02, - -3.287981859486457e-03, - 2.645502645515989e-02, - 0.000000000000000e+00, - 0.000000000000000e+00 + -2.05963719e-02, + 2.96220711e-02, + -3.28798186e-03, + 2.64550265e-02, + 0.00000000e+00, + 0.00000000e+00 ], [ - -2.976430976448491e-04, - 3.477633480047034e-04, - 1.827801827859139e-04, - 0.000000000000000e+00, - 0.000000000000000e+00, - 0.000000000000000e+00 + -2.97643098e-04, + 3.47763348e-04, + 1.82780183e-04, + 0.00000000e+00, + 0.00000000e+00, + 0.00000000e+00 ] ], "type": "polynomial" @@ -104,7 +104,7 @@ "coeffs": "null", "type": "notdefined" }, - "xbase": 2.000000000000000e-01, - "xmax": 1.000000000000000e+00, - "xmin": 0.000000000000000e+00 + "xbase": 2.00000000e-01, + "xmax": 1.00000000e+00, + "xmin": 0.00000000e+00 } \ No newline at end of file diff --git a/dev/incompressible_liquids/HC10.json b/dev/incompressible_liquids/HC10.json index b35ce242..1d94bea3 100644 --- a/dev/incompressible_liquids/HC10.json +++ b/dev/incompressible_liquids/HC10.json @@ -3,23 +3,23 @@ "coeffs": "null", "type": "notdefined" }, - "Tbase": 3.771500000000000e+02, - "Tmax": 4.911500000000000e+02, - "Tmin": 2.631500000000000e+02, - "TminPsat": 2.931500000000000e+02, + "Tbase": 3.77150000e+02, + "Tmax": 4.91150000e+02, + "Tmin": 2.63150000e+02, + "TminPsat": 2.93150000e+02, "conductivity": { "coeffs": [ [ - 6.079999999999989e-01 + 6.08000000e-01 ], [ - 9.999999999991324e-04 + 1.00000000e-03 ], [ - -1.159376346554324e-19 + -1.15937635e-19 ], [ - 8.157986073242980e-20 + 8.15798607e-20 ] ], "type": "polynomial" @@ -27,16 +27,16 @@ "density": { "coeffs": [ [ - 1.151987186296818e+03 + 1.15198719e+03 ], [ - -4.536123288752369e-01 + -4.53612329e-01 ], [ - 2.842970556859919e-05 + 2.84297056e-05 ], [ - 1.128433665071389e-07 + 1.12843367e-07 ] ], "type": "polynomial" @@ -51,16 +51,16 @@ "saturation_pressure": { "coeffs": [ [ - 1.144458935079141e+01 + 1.14445894e+01 ], [ - 3.624261796264709e-02 + 3.62426180e-02 ], [ - -1.098889682558386e-04 + -1.09888968e-04 ], [ - 1.789974775108680e-07 + 1.78997478e-07 ] ], "type": "exppolynomial" @@ -68,16 +68,16 @@ "specific_heat": { "coeffs": [ [ - 3.528715338561430e+03 + 3.52871534e+03 ], [ - 2.480640203850739e+00 + 2.48064020e+00 ], [ - 2.493117174351281e-06 + 2.49311717e-06 ], [ - -1.047586312109220e-07 + -1.04758631e-07 ] ], "type": "polynomial" @@ -85,16 +85,16 @@ "viscosity": { "coeffs": [ [ - -7.363668852742614e+00 + -7.36366885e+00 ], [ - -9.458058087455288e-03 + -9.45805809e-03 ], [ - 2.790786644457495e-05 + 2.79078664e-05 ], [ - -7.439362499251957e-08 + -7.43936250e-08 ] ], "type": "exppolynomial" @@ -103,7 +103,7 @@ "coeffs": "null", "type": "notdefined" }, - "xbase": 0.000000000000000e+00, - "xmax": 1.000000000000000e+00, - "xmin": 0.000000000000000e+00 + "xbase": 0.00000000e+00, + "xmax": 1.00000000e+00, + "xmin": 0.00000000e+00 } \ No newline at end of file diff --git a/dev/incompressible_liquids/HC20.json b/dev/incompressible_liquids/HC20.json index 6b4e5767..562a299c 100644 --- a/dev/incompressible_liquids/HC20.json +++ b/dev/incompressible_liquids/HC20.json @@ -3,23 +3,23 @@ "coeffs": "null", "type": "notdefined" }, - "Tbase": 3.681500000000000e+02, - "Tmax": 4.831500000000000e+02, - "Tmin": 2.531500000000000e+02, - "TminPsat": 2.931500000000000e+02, + "Tbase": 3.68150000e+02, + "Tmax": 4.83150000e+02, + "Tmin": 2.53150000e+02, + "TminPsat": 2.93150000e+02, "conductivity": { "coeffs": [ [ - 5.980000000000004e-01 + 5.98000000e-01 ], [ - 9.999999999990381e-04 + 1.00000000e-03 ], [ - 0.000000000000000e+00 + 0.00000000e+00 ], [ - 2.498817412294797e-20 + 2.49881741e-20 ] ], "type": "polynomial" @@ -27,16 +27,16 @@ "density": { "coeffs": [ [ - 1.198284527972028e+03 + 1.19828453e+03 ], [ - -5.182762594351785e-01 + -5.18276259e-01 ], [ - 1.018546670716880e-05 + 1.01854667e-05 ], [ - -2.852756477618634e-08 + -2.85275647e-08 ] ], "type": "polynomial" @@ -51,16 +51,16 @@ "saturation_pressure": { "coeffs": [ [ - 1.101947186227161e+01 + 1.10194719e+01 ], [ - 3.824312196805470e-02 + 3.82431220e-02 ], [ - -1.117765511658832e-04 + -1.11776551e-04 ], [ - 1.458138936210469e-07 + 1.45813894e-07 ] ], "type": "exppolynomial" @@ -68,16 +68,16 @@ "specific_heat": { "coeffs": [ [ - 3.388619755244757e+03 + 3.38861976e+03 ], [ - 2.359983850017814e+00 + 2.35998385e+00 ], [ - -7.601094557330157e-06 + -7.60109456e-06 ], [ - 1.876813891411619e-09 + 1.87681389e-09 ] ], "type": "polynomial" @@ -85,16 +85,16 @@ "viscosity": { "coeffs": [ [ - -7.119903362214322e+00 + -7.11990336e+00 ], [ - -1.031326041935612e-02 + -1.03132604e-02 ], [ - 2.997932751408645e-05 + 2.99793275e-05 ], [ - -7.457142756634492e-08 + -7.45714276e-08 ] ], "type": "exppolynomial" @@ -103,7 +103,7 @@ "coeffs": "null", "type": "notdefined" }, - "xbase": 0.000000000000000e+00, - "xmax": 1.000000000000000e+00, - "xmin": 0.000000000000000e+00 + "xbase": 0.00000000e+00, + "xmax": 1.00000000e+00, + "xmin": 0.00000000e+00 } \ No newline at end of file diff --git a/dev/incompressible_liquids/HC30.json b/dev/incompressible_liquids/HC30.json index 10d7d1df..cb55e9f1 100644 --- a/dev/incompressible_liquids/HC30.json +++ b/dev/incompressible_liquids/HC30.json @@ -3,23 +3,23 @@ "coeffs": "null", "type": "notdefined" }, - "Tbase": 3.631500000000000e+02, - "Tmax": 4.831500000000000e+02, - "Tmin": 2.431500000000000e+02, - "TminPsat": 2.931500000000000e+02, + "Tbase": 3.63150000e+02, + "Tmax": 4.83150000e+02, + "Tmin": 2.43150000e+02, + "TminPsat": 2.93150000e+02, "conductivity": { "coeffs": [ [ - 5.889999999999985e-01 + 5.89000000e-01 ], [ - 1.000000000000384e-03 + 1.00000000e-03 ], [ - -1.110671952087201e-19 + -1.11067195e-19 ], [ - -4.889920943435029e-20 + -4.88992094e-20 ] ], "type": "polynomial" @@ -27,16 +27,16 @@ "density": { "coeffs": [ [ - 1.239435555555556e+03 + 1.23943556e+03 ], [ - -5.102213889172384e-01 + -5.10221389e-01 ], [ - -2.991452991457530e-05 + -2.99145299e-05 ], [ - 1.142979404003291e-07 + 1.14297940e-07 ] ], "type": "polynomial" @@ -51,16 +51,16 @@ "saturation_pressure": { "coeffs": [ [ - 1.073982045835613e+01 + 1.07398205e+01 ], [ - 3.952905649199533e-02 + 3.95290565e-02 ], [ - -1.214466500426901e-04 + -1.21446650e-04 ], [ - 1.919921689481911e-07 + 1.91992169e-07 ] ], "type": "exppolynomial" @@ -68,16 +68,16 @@ "specific_heat": { "coeffs": [ [ - 3.238461256038644e+03 + 3.23846126e+03 ], [ - 2.307299640778787e+00 + 2.30729964e+00 ], [ - -4.087699739841648e-06 + -4.08769974e-06 ], [ - 3.220611913957834e-07 + 3.22061191e-07 ] ], "type": "polynomial" @@ -85,16 +85,16 @@ "viscosity": { "coeffs": [ [ - -6.921105344003167e+00 + -6.92110534e+00 ], [ - -1.091724003898206e-02 + -1.09172400e-02 ], [ - 3.303914373864232e-05 + 3.30391437e-05 ], [ - -9.224024027340288e-08 + -9.22402403e-08 ] ], "type": "exppolynomial" @@ -103,7 +103,7 @@ "coeffs": "null", "type": "notdefined" }, - "xbase": 0.000000000000000e+00, - "xmax": 1.000000000000000e+00, - "xmin": 0.000000000000000e+00 + "xbase": 0.00000000e+00, + "xmax": 1.00000000e+00, + "xmin": 0.00000000e+00 } \ No newline at end of file diff --git a/dev/incompressible_liquids/HC40.json b/dev/incompressible_liquids/HC40.json index 896b00d1..8b828263 100644 --- a/dev/incompressible_liquids/HC40.json +++ b/dev/incompressible_liquids/HC40.json @@ -3,23 +3,23 @@ "coeffs": "null", "type": "notdefined" }, - "Tbase": 3.531500000000000e+02, - "Tmax": 4.731500000000000e+02, - "Tmin": 2.331500000000000e+02, - "TminPsat": 2.931500000000000e+02, + "Tbase": 3.53150000e+02, + "Tmax": 4.73150000e+02, + "Tmin": 2.33150000e+02, + "TminPsat": 2.93150000e+02, "conductivity": { "coeffs": [ [ - 5.689999999999950e-01 + 5.69000000e-01 ], [ - 1.000000000001211e-03 + 1.00000000e-03 ], [ - -2.427543487271621e-19 + -2.42754349e-19 ], [ - -1.708888971085551e-19 + -1.70888897e-19 ] ], "type": "polynomial" @@ -27,16 +27,16 @@ "density": { "coeffs": [ [ - 1.281448669324891e+03 + 1.28144867e+03 ], [ - -5.604561716518403e-01 + -5.60456172e-01 ], [ - -1.531593172395216e-05 + -1.53159317e-05 ], [ - 1.222892311724560e-07 + 1.22289231e-07 ] ], "type": "polynomial" @@ -51,16 +51,16 @@ "saturation_pressure": { "coeffs": [ [ - 1.023251297159317e+01 + 1.02325130e+01 ], [ - 4.175478699115832e-02 + 4.17547870e-02 ], [ - -1.256691106246827e-04 + -1.25669111e-04 ], [ - 3.463987229863258e-07 + 3.46398723e-07 ] ], "type": "exppolynomial" @@ -68,16 +68,16 @@ "specific_heat": { "coeffs": [ [ - 3.071229553850247e+03 + 3.07122955e+03 ], [ - 2.289047179121243e+00 + 2.28904718e+00 ], [ - 9.909497606522469e-05 + 9.90949761e-05 ], [ - -2.209947854165794e-07 + -2.20994785e-07 ] ], "type": "polynomial" @@ -85,16 +85,16 @@ "viscosity": { "coeffs": [ [ - -6.748083913726515e+00 + -6.74808391e+00 ], [ - -9.889349792050792e-03 + -9.88934979e-03 ], [ - 4.988867271448485e-05 + 4.98886727e-05 ], [ - -2.914046226845630e-07 + -2.91404623e-07 ] ], "type": "exppolynomial" @@ -103,7 +103,7 @@ "coeffs": "null", "type": "notdefined" }, - "xbase": 0.000000000000000e+00, - "xmax": 1.000000000000000e+00, - "xmin": 0.000000000000000e+00 + "xbase": 0.00000000e+00, + "xmax": 1.00000000e+00, + "xmin": 0.00000000e+00 } \ No newline at end of file diff --git a/dev/incompressible_liquids/HC50.json b/dev/incompressible_liquids/HC50.json index fdd37614..420cd7bc 100644 --- a/dev/incompressible_liquids/HC50.json +++ b/dev/incompressible_liquids/HC50.json @@ -3,23 +3,23 @@ "coeffs": "null", "type": "notdefined" }, - "Tbase": 3.531500000000000e+02, - "Tmax": 4.831500000000000e+02, - "Tmin": 2.231500000000000e+02, - "TminPsat": 2.931500000000000e+02, + "Tbase": 3.53150000e+02, + "Tmax": 4.83150000e+02, + "Tmin": 2.23150000e+02, + "TminPsat": 2.93150000e+02, "conductivity": { "coeffs": [ [ - 5.650229885057473e-01 + 5.65022989e-01 ], [ - 1.000763242717344e-03 + 1.00076324e-03 ], [ - -6.841817186582777e-09 + -6.84181719e-09 ], [ - -1.064282675261688e-10 + -1.06428267e-10 ] ], "type": "polynomial" @@ -27,16 +27,16 @@ "density": { "coeffs": [ [ - 1.306294252873563e+03 + 1.30629425e+03 ], [ - -5.553179983065445e-01 + -5.55317998e-01 ], [ - -5.768178181986272e-06 + -5.76817818e-06 ], [ - 6.221960248058524e-08 + 6.22196025e-08 ] ], "type": "polynomial" @@ -51,16 +51,16 @@ "saturation_pressure": { "coeffs": [ [ - 1.009944164316716e+01 + 1.00994416e+01 ], [ - 4.207958646442476e-02 + 4.20795865e-02 ], [ - -1.159691514320557e-04 + -1.15969151e-04 ], [ - 1.048304075051943e-07 + 1.04830408e-07 ] ], "type": "exppolynomial" @@ -68,16 +68,16 @@ "specific_heat": { "coeffs": [ [ - 2.818935632183909e+03 + 2.81893563e+03 ], [ - 1.970978812588164e+00 + 1.97097881e+00 ], [ - 4.505073470495446e-06 + 4.50507347e-06 ], [ - -1.211644891770898e-07 + -1.21164489e-07 ] ], "type": "polynomial" @@ -85,16 +85,16 @@ "viscosity": { "coeffs": [ [ - -6.584184633571888e+00 + -6.58418463e+00 ], [ - -9.171608677415153e-03 + -9.17160868e-03 ], [ - 6.165745210517763e-05 + 6.16574521e-05 ], [ - -3.960301862890916e-07 + -3.96030186e-07 ] ], "type": "exppolynomial" @@ -103,7 +103,7 @@ "coeffs": "null", "type": "notdefined" }, - "xbase": 0.000000000000000e+00, - "xmax": 1.000000000000000e+00, - "xmin": 0.000000000000000e+00 + "xbase": 0.00000000e+00, + "xmax": 1.00000000e+00, + "xmin": 0.00000000e+00 } \ No newline at end of file diff --git a/dev/incompressible_liquids/HCB.json b/dev/incompressible_liquids/HCB.json new file mode 100644 index 00000000..591e5f4d --- /dev/null +++ b/dev/incompressible_liquids/HCB.json @@ -0,0 +1,75 @@ +{ + "T_freeze": { + "coeffs": "null", + "type": "notdefined" + }, + "Tbase": 0.00000000e+00, + "Tmax": 3.73150000e+02, + "Tmin": 1.93150000e+02, + "TminPsat": 3.73150000e+02, + "conductivity": { + "coeffs": [ + [ + 2.03186000e-04 + ], + [ + -2.38690000e-07 + ] + ], + "type": "polynomial" + }, + "density": { + "coeffs": [ + [ + 1.07178000e+03 + ], + [ + -7.72024000e-01 + ] + ], + "type": "polynomial" + }, + "description": "Hydrocarbon blend - Dynalene MV", + "mass2mole": { + "coeffs": "null", + "type": "notdefined" + }, + "name": "HCB", + "reference": "Melinder-BOOK-2010", + "saturation_pressure": { + "coeffs": "null", + "type": "notdefined" + }, + "specific_heat": { + "coeffs": [ + [ + 7.61393000e+02 + ], + [ + 3.52976000e+00 + ] + ], + "type": "polynomial" + }, + "viscosity": { + "coeffs": [ + [ + 7.16819000e+00 + ], + [ + -8.63212000e-02 + ], + [ + 1.30604000e-04 + ] + ], + "type": "exppolynomial" + }, + "volume2mass": { + "coeffs": "null", + "type": "notdefined" + }, + "xbase": 0.00000000e+00, + "xmax": 1.00000000e+00, + "xmin": 0.00000000e+00 +} \ No newline at end of file diff --git a/dev/incompressible_liquids/HCM.json b/dev/incompressible_liquids/HCM.json new file mode 100644 index 00000000..47891e69 --- /dev/null +++ b/dev/incompressible_liquids/HCM.json @@ -0,0 +1,75 @@ +{ + "T_freeze": { + "coeffs": "null", + "type": "notdefined" + }, + "Tbase": 0.00000000e+00, + "Tmax": 3.73150000e+02, + "Tmin": 1.93150000e+02, + "TminPsat": 3.73150000e+02, + "conductivity": { + "coeffs": [ + [ + 1.53716000e-04 + ], + [ + -1.51212000e-07 + ] + ], + "type": "polynomial" + }, + "density": { + "coeffs": [ + [ + 9.71725000e+02 + ], + [ + -7.18788000e-01 + ] + ], + "type": "polynomial" + }, + "description": "Hydrocarbon mixture (synthetic) - Therminol D12 (Gilotherm D12) Solutia", + "mass2mole": { + "coeffs": "null", + "type": "notdefined" + }, + "name": "HCM", + "reference": "Melinder-BOOK-2010", + "saturation_pressure": { + "coeffs": "null", + "type": "notdefined" + }, + "specific_heat": { + "coeffs": [ + [ + 8.44023000e+02 + ], + [ + 4.31212000e+00 + ] + ], + "type": "polynomial" + }, + "viscosity": { + "coeffs": [ + [ + 1.83237000e+01 + ], + [ + -1.47060000e-01 + ], + [ + 2.09096000e-04 + ] + ], + "type": "exppolynomial" + }, + "volume2mass": { + "coeffs": "null", + "type": "notdefined" + }, + "xbase": 0.00000000e+00, + "xmax": 1.00000000e+00, + "xmin": 0.00000000e+00 +} \ No newline at end of file diff --git a/dev/incompressible_liquids/HFE.json b/dev/incompressible_liquids/HFE.json new file mode 100644 index 00000000..bddf0824 --- /dev/null +++ b/dev/incompressible_liquids/HFE.json @@ -0,0 +1,75 @@ +{ + "T_freeze": { + "coeffs": "null", + "type": "notdefined" + }, + "Tbase": 0.00000000e+00, + "Tmax": 3.73150000e+02, + "Tmin": 1.93150000e+02, + "TminPsat": 3.73150000e+02, + "conductivity": { + "coeffs": [ + [ + 9.92958000e-05 + ], + [ + -8.33333000e-08 + ] + ], + "type": "polynomial" + }, + "density": { + "coeffs": [ + [ + 1.82237000e+03 + ], + [ + -9.18485000e-01 + ] + ], + "type": "polynomial" + }, + "description": "Hydrofluoroether - HFE-7100 3M Novec", + "mass2mole": { + "coeffs": "null", + "type": "notdefined" + }, + "name": "HFE", + "reference": "Melinder-BOOK-2010", + "saturation_pressure": { + "coeffs": "null", + "type": "notdefined" + }, + "specific_heat": { + "coeffs": [ + [ + 8.71834000e+02 + ], + [ + 8.58788000e+05 + ] + ], + "type": "polynomial" + }, + "viscosity": { + "coeffs": [ + [ + -4.22878000e+00 + ], + [ + -1.14765000e-02 + ], + [ + 7.39823000e-06 + ] + ], + "type": "exppolynomial" + }, + "volume2mass": { + "coeffs": "null", + "type": "notdefined" + }, + "xbase": 0.00000000e+00, + "xmax": 1.00000000e+00, + "xmin": 0.00000000e+00 +} \ No newline at end of file diff --git a/dev/incompressible_liquids/LiBr.json b/dev/incompressible_liquids/LiBr.json index edca315e..b78ce565 100644 --- a/dev/incompressible_liquids/LiBr.json +++ b/dev/incompressible_liquids/LiBr.json @@ -3,10 +3,10 @@ "coeffs": "null", "type": "notdefined" }, - "Tbase": 3.865000000000000e+02, - "Tmax": 5.000000000000000e+02, - "Tmin": 2.730000000000000e+02, - "TminPsat": 2.730000000000000e+02, + "Tbase": 3.86500000e+02, + "Tmax": 5.00000000e+02, + "Tmin": 2.73000000e+02, + "TminPsat": 2.73000000e+02, "conductivity": { "coeffs": "null", "type": "notdefined" @@ -14,36 +14,36 @@ "density": { "coeffs": [ [ - 1.300434849817688e+03, - 1.277505461957751e+03, - 1.188418334008458e+03, - 1.079899778718945e+03, - 1.347998045134753e+03, - 1.192020937522815e+03 + 1.30043485e+03, + 1.27750546e+03, + 1.18841833e+03, + 1.07989978e+03, + 1.34799805e+03, + 1.19202094e+03 ], [ - -8.175046033259777e-01, - 4.808614248956841e-02, - 1.134735274361064e+00, - 5.492049147624435e+00, - 9.087443374967824e+00, - 0.000000000000000e+00 + -8.17504603e-01, + 4.80861425e-02, + 1.13473527e+00, + 5.49204915e+00, + 9.08744337e+00, + 0.00000000e+00 ], [ - -2.093539602241345e-03, - 3.345921267564196e-03, - 1.634227641942040e-02, - 3.010251642710887e-02, - 0.000000000000000e+00, - 0.000000000000000e+00 + -2.09353960e-03, + 3.34592127e-03, + 1.63422764e-02, + 3.01025164e-02, + 0.00000000e+00, + 0.00000000e+00 ], [ - 7.368598302280326e-06, - 2.864459893307354e-05, - 5.365252556890968e-05, - 0.000000000000000e+00, - 0.000000000000000e+00, - 0.000000000000000e+00 + 7.36859830e-06, + 2.86445989e-05, + 5.36525256e-05, + 0.00000000e+00, + 0.00000000e+00, + 0.00000000e+00 ] ], "type": "polynomial" @@ -58,36 +58,36 @@ "saturation_pressure": { "coeffs": [ [ - 1.152444261504785e+01, - -3.377041106715590e+00, - -1.102727134758349e+01, - -1.515928012912529e+01, - 1.679889745043772e+01, - 4.914120085495698e+01 + 1.15244426e+01, + -3.37704111e+00, + -1.10272713e+01, + -1.51592801e+01, + 1.67988975e+01, + 4.91412009e+01 ], [ - 3.339006563050251e-02, - 1.034651595324264e-02, - 5.967663163025750e-02, - 2.264925250033760e-02, - -2.192617721901149e-01, - 0.000000000000000e+00 + 3.33900656e-02, + 1.03465160e-02, + 5.96766316e-02, + 2.26492525e-02, + -2.19261772e-01, + 0.00000000e+00 ], [ - -1.079102037532141e-04, - -2.742843821094286e-05, - -9.951978460494595e-05, - -5.303767881485182e-05, - 0.000000000000000e+00, - 0.000000000000000e+00 + -1.07910204e-04, + -2.74284382e-05, + -9.95197845e-05, + -5.30376788e-05, + 0.00000000e+00, + 0.00000000e+00 ], [ - 3.082843985424886e-07, - 5.253064991868726e-08, - 2.549298660375690e-07, - 0.000000000000000e+00, - 0.000000000000000e+00, - 0.000000000000000e+00 + 3.08284395e-07, + 5.25306482e-08, + 2.54929866e-07, + 0.00000000e+00, + 0.00000000e+00, + 0.00000000e+00 ] ], "type": "exppolynomial" @@ -95,36 +95,36 @@ "specific_heat": { "coeffs": [ [ - 2.641343207335110e+03, - -3.426995920705237e+03, - 3.324191539261456e+03, - -1.539905943128639e+03, - -1.179863454183219e+04, - 2.485745519039293e+03 + 2.64134321e+03, + -3.42699592e+03, + 3.32419154e+03, + -1.53990594e+03, + -1.17986345e+04, + 2.48574552e+03 ], [ - 5.857670169838242e-01, - -1.308165411403285e+00, - 2.465628662302519e+00, - 1.232913918374295e+00, - 1.103372294487103e+01, - 0.000000000000000e+00 + 5.85767017e-01, + -1.30816541e+00, + 2.46562866e+00, + 1.23291392e+00, + 1.10337229e+01, + 0.00000000e+00 ], [ - -8.169416192793655e-05, - -3.525631568848944e-02, - 1.711579873363409e-02, - -8.649933285153993e-03, - 0.000000000000000e+00, - 0.000000000000000e+00 + -8.16941619e-05, + -3.52563157e-02, + 1.71157987e-02, + -8.64993329e-03, + 0.00000000e+00, + 0.00000000e+00 ], [ - 1.468641294206231e-04, - 1.548412188139297e-04, - -4.128610838277893e-04, - 0.000000000000000e+00, - 0.000000000000000e+00, - 0.000000000000000e+00 + 1.46864129e-04, + 1.54841219e-04, + -4.12861084e-04, + 0.00000000e+00, + 0.00000000e+00, + 0.00000000e+00 ] ], "type": "polynomial" @@ -137,7 +137,7 @@ "coeffs": "null", "type": "notdefined" }, - "xbase": 3.750000000000000e-01, - "xmax": 7.500000000000000e-01, - "xmin": 0.000000000000000e+00 + "xbase": 3.75000000e-01, + "xmax": 7.50000000e-01, + "xmin": 0.00000000e+00 } \ No newline at end of file diff --git a/dev/incompressible_liquids/NaK.json b/dev/incompressible_liquids/NaK.json index 4c7e2843..c7997907 100644 --- a/dev/incompressible_liquids/NaK.json +++ b/dev/incompressible_liquids/NaK.json @@ -3,23 +3,23 @@ "coeffs": "null", "type": "notdefined" }, - "Tbase": 7.231500000000000e+02, - "Tmax": 8.731500000000000e+02, - "Tmin": 5.731500000000000e+02, - "TminPsat": 8.731500000000000e+02, + "Tbase": 7.23150000e+02, + "Tmax": 8.73150000e+02, + "Tmin": 5.73150000e+02, + "TminPsat": 8.73150000e+02, "conductivity": { "coeffs": [ [ - 5.284999999999999e-01 + 5.28500000e-01 ], [ - 1.900000000001592e-04 + 1.90000000e-04 ], [ - 0.000000000000000e+00 + 0.00000000e+00 ], [ - 3.170559838799492e-21 + 2.50868954e-21 ] ], "type": "polynomial" @@ -27,16 +27,16 @@ "density": { "coeffs": [ [ - 1.803800000000000e+03 + 1.80380000e+03 ], [ - -6.360000000005357e-01 + -6.36007848e-01 ], [ - 0.000000000000000e+00 + 0.00000000e+00 ], [ - 1.071743045227905e-18 + 7.94436257e-11 ] ], "type": "polynomial" @@ -55,16 +55,16 @@ "specific_heat": { "coeffs": [ [ - 1.520400000000000e+06 + 1.52040000e+03 ], [ - 1.720000000001437e+02 + 1.72016302e-01 ], [ - -2.842170943040401e-14 + 0.00000000e+00 ], [ - -1.017703801529014e-14 + -1.28836916e-09 ] ], "type": "polynomial" @@ -72,16 +72,16 @@ "viscosity": { "coeffs": [ [ - -6.506231138491504e+00 + -6.50575747e+00 ], [ - -2.894216834122611e-03 + -2.89369670e-03 ], [ - 9.367638971117479e-06 + 9.26676133e-06 ], [ - -4.763059512414808e-08 + -4.76839935e-08 ] ], "type": "exppolynomial" @@ -90,7 +90,7 @@ "coeffs": "null", "type": "notdefined" }, - "xbase": 0.000000000000000e+00, - "xmax": 1.000000000000000e+00, - "xmin": 0.000000000000000e+00 + "xbase": 0.00000000e+00, + "xmax": 1.00000000e+00, + "xmin": 0.00000000e+00 } \ No newline at end of file diff --git a/dev/incompressible_liquids/PMS1.json b/dev/incompressible_liquids/PMS1.json new file mode 100644 index 00000000..3a84de19 --- /dev/null +++ b/dev/incompressible_liquids/PMS1.json @@ -0,0 +1,75 @@ +{ + "T_freeze": { + "coeffs": "null", + "type": "notdefined" + }, + "Tbase": 0.00000000e+00, + "Tmax": 3.73150000e+02, + "Tmin": 1.93150000e+02, + "TminPsat": 3.73150000e+02, + "conductivity": { + "coeffs": [ + [ + 2.07526000e-04 + ], + [ + -2.84167000e-07 + ] + ], + "type": "polynomial" + }, + "density": { + "coeffs": [ + [ + 1.17235000e+03 + ], + [ + -9.02500000e-01 + ] + ], + "type": "polynomial" + }, + "description": "Polydimethylsiloxan 1. - Baysilone KT3", + "mass2mole": { + "coeffs": "null", + "type": "notdefined" + }, + "name": "PMS1", + "reference": "Melinder-BOOK-2010", + "saturation_pressure": { + "coeffs": "null", + "type": "notdefined" + }, + "specific_heat": { + "coeffs": [ + [ + 1.22369000e+03 + ], + [ + 1.48417000e+00 + ] + ], + "type": "polynomial" + }, + "viscosity": { + "coeffs": [ + [ + 6.36183000e+00 + ], + [ + -6.36352000e-02 + ], + [ + 7.51428000e-05 + ] + ], + "type": "exppolynomial" + }, + "volume2mass": { + "coeffs": "null", + "type": "notdefined" + }, + "xbase": 0.00000000e+00, + "xmax": 1.00000000e+00, + "xmin": 0.00000000e+00 +} \ No newline at end of file diff --git a/dev/incompressible_liquids/PMS2.json b/dev/incompressible_liquids/PMS2.json new file mode 100644 index 00000000..798578b7 --- /dev/null +++ b/dev/incompressible_liquids/PMS2.json @@ -0,0 +1,75 @@ +{ + "T_freeze": { + "coeffs": "null", + "type": "notdefined" + }, + "Tbase": 0.00000000e+00, + "Tmax": 3.73150000e+02, + "Tmin": 1.93150000e+02, + "TminPsat": 3.73150000e+02, + "conductivity": { + "coeffs": [ + [ + 1.72305000e-04 + ], + [ + -2.11212000e-07 + ] + ], + "type": "polynomial" + }, + "density": { + "coeffs": [ + [ + 1.15594000e+03 + ], + [ + -1.02576000e+00 + ] + ], + "type": "polynomial" + }, + "description": "Polydimethylsiloxan 2. - Syltherm XLT Dow Corning Co.", + "mass2mole": { + "coeffs": "null", + "type": "notdefined" + }, + "name": "PMS2", + "reference": "Melinder-BOOK-2010", + "saturation_pressure": { + "coeffs": "null", + "type": "notdefined" + }, + "specific_heat": { + "coeffs": [ + [ + 1.15355000e+03 + ], + [ + 2.10788000e+00 + ] + ], + "type": "polynomial" + }, + "viscosity": { + "coeffs": [ + [ + 5.66926000e+00 + ], + [ + -6.55820000e-02 + ], + [ + 8.09988000e-05 + ] + ], + "type": "exppolynomial" + }, + "volume2mass": { + "coeffs": "null", + "type": "notdefined" + }, + "xbase": 0.00000000e+00, + "xmax": 1.00000000e+00, + "xmin": 0.00000000e+00 +} \ No newline at end of file diff --git a/dev/incompressible_liquids/SAB.json b/dev/incompressible_liquids/SAB.json new file mode 100644 index 00000000..59afa8b5 --- /dev/null +++ b/dev/incompressible_liquids/SAB.json @@ -0,0 +1,75 @@ +{ + "T_freeze": { + "coeffs": "null", + "type": "notdefined" + }, + "Tbase": 0.00000000e+00, + "Tmax": 3.73150000e+02, + "Tmin": 1.93150000e+02, + "TminPsat": 3.73150000e+02, + "conductivity": { + "coeffs": [ + [ + 2.08374000e-04 + ], + [ + -2.61667000e-07 + ] + ], + "type": "polynomial" + }, + "density": { + "coeffs": [ + [ + 1.10234000e+03 + ], + [ + -8.01667000e-01 + ] + ], + "type": "polynomial" + }, + "description": "Synthetic alkyl benzene - Marlotherm X", + "mass2mole": { + "coeffs": "null", + "type": "notdefined" + }, + "name": "SAB", + "reference": "Melinder-BOOK-2010", + "saturation_pressure": { + "coeffs": "null", + "type": "notdefined" + }, + "specific_heat": { + "coeffs": [ + [ + 1.36094000e+03 + ], + [ + 1.51667000e+00 + ] + ], + "type": "polynomial" + }, + "viscosity": { + "coeffs": [ + [ + 5.21288000e+00 + ], + [ + -6.65792000e-02 + ], + [ + 8.50660000e-05 + ] + ], + "type": "exppolynomial" + }, + "volume2mass": { + "coeffs": "null", + "type": "notdefined" + }, + "xbase": 0.00000000e+00, + "xmax": 1.00000000e+00, + "xmin": 0.00000000e+00 +} \ No newline at end of file diff --git a/dev/incompressible_liquids/T66.json b/dev/incompressible_liquids/T66.json index fdbe3ba7..cd88736b 100644 --- a/dev/incompressible_liquids/T66.json +++ b/dev/incompressible_liquids/T66.json @@ -3,23 +3,23 @@ "coeffs": "null", "type": "notdefined" }, - "Tbase": 4.631500000000000e+02, - "Tmax": 6.531500000000000e+02, - "Tmin": 2.731500000000000e+02, - "TminPsat": 3.431500000000000e+02, + "Tbase": 4.63150000e+02, + "Tmax": 6.53150000e+02, + "Tmin": 2.73150000e+02, + "TminPsat": 3.43150000e+02, "conductivity": { "coeffs": [ [ - 1.066090000000000e-01 + 1.06609000e-01 ], [ - -8.999999999973396e-05 + -9.00000000e-05 ], [ - -1.500000000000036e-07 + -1.50000000e-07 ], [ - 4.406525912036535e-21 + -7.96008070e-21 ] ], "type": "polynomial" @@ -27,16 +27,16 @@ "density": { "coeffs": [ [ - 8.923236400000001e+02 + 8.92323640e+02 ], [ - -7.362339999978240e-01 + -7.36234000e-01 ], [ - -3.210000000000157e-04 + -3.21000000e-04 ], [ - -4.708068873106051e-17 + -8.07236983e-17 ] ], "type": "polynomial" @@ -51,16 +51,16 @@ "saturation_pressure": { "coeffs": [ [ - 7.417705661727600e+00 + 7.41770566e+00 ], [ - 3.220414309868296e-02 + 3.22041431e-02 ], [ - -6.917732895066891e-05 + -6.91773290e-05 ], [ - 1.353345151648428e-07 + 1.35334515e-07 ] ], "type": "exppolynomial" @@ -68,16 +68,16 @@ "specific_heat": { "coeffs": [ [ - 2.157859533850000e+03 + 2.15785953e+03 ], [ - 3.653889829999767e+00 + 3.65388983e+00 ], [ - 8.970784999999815e-04 + 8.97078500e-04 ], [ - 3.146808071851947e-16 + 3.14680807e-16 ] ], "type": "polynomial" @@ -85,16 +85,16 @@ "viscosity": { "coeffs": [ [ - -7.162463856202438e+00 + -7.16246386e+00 ], [ - -7.748985869963807e-03 + -7.74898587e-03 ], [ - 7.417345684792177e-05 + 7.41734568e-05 ], [ - -3.641925451571307e-07 + -3.64192545e-07 ] ], "type": "exppolynomial" @@ -103,7 +103,7 @@ "coeffs": "null", "type": "notdefined" }, - "xbase": 0.000000000000000e+00, - "xmax": 1.000000000000000e+00, - "xmin": 0.000000000000000e+00 + "xbase": 0.00000000e+00, + "xmax": 1.00000000e+00, + "xmin": 0.00000000e+00 } \ No newline at end of file diff --git a/dev/incompressible_liquids/T72.json b/dev/incompressible_liquids/T72.json index fbbff9b2..704b80b8 100644 --- a/dev/incompressible_liquids/T72.json +++ b/dev/incompressible_liquids/T72.json @@ -3,23 +3,23 @@ "coeffs": "null", "type": "notdefined" }, - "Tbase": 4.581500000000000e+02, - "Tmax": 6.531500000000000e+02, - "Tmin": 2.631500000000000e+02, - "TminPsat": 2.631500000000000e+02, + "Tbase": 4.58150000e+02, + "Tmax": 6.53150000e+02, + "Tmin": 2.63150000e+02, + "TminPsat": 2.63150000e+02, "conductivity": { "coeffs": [ [ - 1.195536973106593e-01 + 1.19553697e-01 ], [ - -1.213119666972365e-04 + -1.21311967e-04 ], [ - -4.098105364715339e-11 + -4.09810536e-11 ], [ - -1.669403637224229e-12 + -1.66940364e-12 ] ], "type": "polynomial" @@ -27,16 +27,16 @@ "density": { "coeffs": [ [ - 9.293047229376340e+02 + 9.29304723e+02 ], [ - -9.031913359504752e-01 + -9.03191336e-01 ], [ - 1.258703790352200e-05 + 1.25870379e-05 ], [ - -1.189302793086069e-07 + -1.18930279e-07 ] ], "type": "polynomial" @@ -51,16 +51,16 @@ "saturation_pressure": { "coeffs": [ [ - 1.012429931897214e+01 + 1.01242993e+01 ], [ - 1.638718500575798e-02 + 1.63871850e-02 ], [ - -1.584428905982566e-06 + -1.58442891e-06 ], [ - 1.406210699716879e-11 + 1.40621054e-11 ] ], "type": "exppolynomial" @@ -68,16 +68,16 @@ "specific_heat": { "coeffs": [ [ - 1.999375886654367e+03 + 1.99937589e+03 ], [ - 2.709807560923489e+00 + 2.70980756e+00 ], [ - -6.767728284451380e-07 + -6.76772829e-07 ], [ - 4.271709160228777e-09 + 4.27170965e-09 ] ], "type": "polynomial" @@ -85,16 +85,16 @@ "viscosity": { "coeffs": [ [ - -7.611759265802962e+00 + -7.61175927e+00 ], [ - -7.339485859808524e-03 + -7.33948586e-03 ], [ - 4.785661268059700e-05 + 4.78566127e-05 ], [ - -2.590097783080292e-07 + -2.59009778e-07 ] ], "type": "exppolynomial" @@ -103,7 +103,7 @@ "coeffs": "null", "type": "notdefined" }, - "xbase": 0.000000000000000e+00, - "xmax": 1.000000000000000e+00, - "xmin": 0.000000000000000e+00 + "xbase": 0.00000000e+00, + "xmax": 1.00000000e+00, + "xmin": 0.00000000e+00 } \ No newline at end of file diff --git a/dev/incompressible_liquids/TCO.json b/dev/incompressible_liquids/TCO.json new file mode 100644 index 00000000..ff7a72bb --- /dev/null +++ b/dev/incompressible_liquids/TCO.json @@ -0,0 +1,75 @@ +{ + "T_freeze": { + "coeffs": "null", + "type": "notdefined" + }, + "Tbase": 0.00000000e+00, + "Tmax": 3.73150000e+02, + "Tmin": 1.93150000e+02, + "TminPsat": 3.73150000e+02, + "conductivity": { + "coeffs": [ + [ + 1.74156000e-04 + ], + [ + -1.85052000e-07 + ] + ], + "type": "polynomial" + }, + "density": { + "coeffs": [ + [ + 1.07102000e+03 + ], + [ + -7.78166000e-01 + ] + ], + "type": "polynomial" + }, + "description": "Terpene from citrus oils - d-Limonene", + "mass2mole": { + "coeffs": "null", + "type": "notdefined" + }, + "name": "TCO", + "reference": "Melinder-BOOK-2010", + "saturation_pressure": { + "coeffs": "null", + "type": "notdefined" + }, + "specific_heat": { + "coeffs": [ + [ + 2.23775000e+02 + ], + [ + 5.21590000e+00 + ] + ], + "type": "polynomial" + }, + "viscosity": { + "coeffs": [ + [ + -3.47971000e+00 + ], + [ + -1.07031000e-02 + ], + [ + 1.14086000e-06 + ] + ], + "type": "exppolynomial" + }, + "volume2mass": { + "coeffs": "null", + "type": "notdefined" + }, + "xbase": 0.00000000e+00, + "xmax": 1.00000000e+00, + "xmin": 0.00000000e+00 +} \ No newline at end of file diff --git a/dev/incompressible_liquids/TD12.json b/dev/incompressible_liquids/TD12.json index ecee9252..3eea90d5 100644 --- a/dev/incompressible_liquids/TD12.json +++ b/dev/incompressible_liquids/TD12.json @@ -3,23 +3,23 @@ "coeffs": "null", "type": "notdefined" }, - "Tbase": 3.456500000000000e+02, - "Tmax": 5.031500000000000e+02, - "Tmin": 1.881500000000000e+02, - "TminPsat": 1.881500000000000e+02, + "Tbase": 3.45650000e+02, + "Tmax": 5.03150000e+02, + "Tmin": 1.88150000e+02, + "TminPsat": 1.88150000e+02, "conductivity": { "coeffs": [ [ - 1.014253184567449e-01 + 1.01425318e-01 ], [ - -1.712411812932666e-04 + -1.71241181e-04 ], [ - -1.608431890689935e-07 + -1.60843189e-07 ], [ - 4.555711864798817e-12 + 4.55571186e-12 ] ], "type": "polynomial" @@ -27,16 +27,16 @@ "density": { "coeffs": [ [ - 7.240174234787393e+02 + 7.24017423e+02 ], [ - -7.568357478311305e-01 + -7.56835748e-01 ], [ - -5.533243638082830e-04 + -5.53324364e-04 ], [ - -1.549811353851720e-06 + -1.54981135e-06 ] ], "type": "polynomial" @@ -51,16 +51,16 @@ "saturation_pressure": { "coeffs": [ [ - 7.665312706298518e+00 + 7.66531271e+00 ], [ - 4.720558658888303e-02 + 4.72055866e-02 ], [ - -2.783269341006395e-04 + -2.78326934e-04 ], [ - 1.182836963364229e-06 + 1.18283696e-06 ] ], "type": "exppolynomial" @@ -68,16 +68,16 @@ "specific_heat": { "coeffs": [ [ - 2.300990641037390e+03 + 2.30099064e+03 ], [ - 4.029815585947277e+00 + 4.02981559e+00 ], [ - 1.442488962649868e-03 + 1.44248896e-03 ], [ - 2.343557598635370e-06 + 2.34355760e-06 ] ], "type": "polynomial" @@ -85,16 +85,16 @@ "viscosity": { "coeffs": [ [ - -7.566943611174307e+00 + -7.56694361e+00 ], [ - -8.910077379901160e-03 + -8.91007738e-03 ], [ - 8.654288976071324e-05 + 8.65428898e-05 ], [ - -5.748235394722682e-07 + -5.74823539e-07 ] ], "type": "exppolynomial" @@ -103,7 +103,7 @@ "coeffs": "null", "type": "notdefined" }, - "xbase": 0.000000000000000e+00, - "xmax": 1.000000000000000e+00, - "xmin": 0.000000000000000e+00 + "xbase": 0.00000000e+00, + "xmax": 1.00000000e+00, + "xmin": 0.00000000e+00 } \ No newline at end of file diff --git a/dev/incompressible_liquids/TVP1.json b/dev/incompressible_liquids/TVP1.json index 683cdf87..3cc8c794 100644 --- a/dev/incompressible_liquids/TVP1.json +++ b/dev/incompressible_liquids/TVP1.json @@ -3,23 +3,23 @@ "coeffs": "null", "type": "notdefined" }, - "Tbase": 4.776500000000000e+02, - "Tmax": 6.701500000000000e+02, - "Tmin": 2.851500000000000e+02, - "TminPsat": 2.851500000000000e+02, + "Tbase": 4.77650000e+02, + "Tmax": 6.70150000e+02, + "Tmin": 2.85150000e+02, + "TminPsat": 2.85150000e+02, "conductivity": { "coeffs": [ [ - 1.130678580465587e-01 + 1.13067858e-01 ], [ - -1.579086057018512e-04 + -1.57908606e-04 ], [ - -1.729844106592956e-07 + -1.72984411e-07 ], [ - 3.523507828900156e-12 + 3.52350783e-12 ] ], "type": "polynomial" @@ -27,16 +27,16 @@ "density": { "coeffs": [ [ - 9.094492661943316e+02 + 9.09449266e+02 ], [ - -8.926962289206544e-01 + -8.92696229e-01 ], [ - -6.292874347504362e-04 + -6.29287435e-04 ], [ - -1.931069426860175e-06 + -1.93106943e-06 ] ], "type": "polynomial" @@ -51,16 +51,16 @@ "saturation_pressure": { "coeffs": [ [ - 1.029170422244552e+01 + 1.02917042e+01 ], [ - 2.773291692405491e-02 + 2.77329169e-02 ], [ - -9.223681490939245e-05 + -9.22368149e-05 ], [ - 2.535129865144887e-07 + 2.53512987e-07 ] ], "type": "exppolynomial" @@ -68,16 +68,16 @@ "specific_heat": { "coeffs": [ [ - 2.057847355769230e+03 + 2.05784736e+03 ], [ - 2.640437391857266e+00 + 2.64043739e+00 ], [ - 8.488347095925164e-05 + 8.48834710e-05 ], [ - 4.844177188811822e-06 + 4.84417719e-06 ] ], "type": "polynomial" @@ -85,16 +85,16 @@ "viscosity": { "coeffs": [ [ - -7.898082579951590e+00 + -7.89808258e+00 ], [ - -6.552698415362529e-03 + -6.55269842e-03 ], [ - 2.138246493645080e-05 + 2.13824649e-05 ], [ - -7.121997973383087e-08 + -7.12199797e-08 ] ], "type": "exppolynomial" @@ -103,7 +103,7 @@ "coeffs": "null", "type": "notdefined" }, - "xbase": 0.000000000000000e+00, - "xmax": 1.000000000000000e+00, - "xmin": 0.000000000000000e+00 + "xbase": 0.00000000e+00, + "xmax": 1.00000000e+00, + "xmin": 0.00000000e+00 } \ No newline at end of file diff --git a/dev/incompressible_liquids/TX22.json b/dev/incompressible_liquids/TX22.json index e4539f2b..4a8df121 100644 --- a/dev/incompressible_liquids/TX22.json +++ b/dev/incompressible_liquids/TX22.json @@ -3,23 +3,23 @@ "coeffs": "null", "type": "notdefined" }, - "Tbase": 4.481500000000000e+02, - "Tmax": 6.231500000000000e+02, - "Tmin": 2.731500000000000e+02, - "TminPsat": 3.131500000000000e+02, + "Tbase": 4.48150000e+02, + "Tmax": 6.23150000e+02, + "Tmin": 2.73150000e+02, + "TminPsat": 3.13150000e+02, "conductivity": { "coeffs": [ [ - 1.227788896029532e-01 + 1.22778890e-01 ], [ - -7.574045090701878e-05 + -7.57404509e-05 ], [ - -1.454092167075849e-08 + -1.45409217e-08 ], [ - 1.394755783756309e-10 + 1.39475578e-10 ] ], "type": "polynomial" @@ -27,16 +27,16 @@ "density": { "coeffs": [ [ - 7.593228145039494e+02 + 7.59322815e+02 ], [ - -6.908328423272476e-01 + -6.90832842e-01 ], [ - -3.579964397273630e-04 + -3.57996440e-04 ], [ - -9.536542340014896e-07 + -9.53654234e-07 ] ], "type": "polynomial" @@ -51,16 +51,16 @@ "saturation_pressure": { "coeffs": [ [ - 2.412772578665294e+00 + 2.41277258e+00 ], [ - 6.238442114696400e-02 + 6.23844211e-02 ], [ - -1.418307199584109e-04 + -1.41830720e-04 ], [ - -8.170467311242828e-08 + -8.17046731e-08 ] ], "type": "exppolynomial" @@ -68,16 +68,16 @@ "specific_heat": { "coeffs": [ [ - 2.449689895200121e+03 + 2.44968990e+03 ], [ - 3.634082120970069e+00 + 3.63408212e+00 ], [ - -2.150675915078805e-04 + -2.15067592e-04 ], [ - 4.319118293940639e-08 + 4.31911829e-08 ] ], "type": "polynomial" @@ -85,16 +85,16 @@ "viscosity": { "coeffs": [ [ - -6.427437402987576e+00 + -6.42743740e+00 ], [ - -9.749360140609988e-03 + -9.74936014e-03 ], [ - 8.866217426226579e-06 + 8.86621743e-06 ], [ - -6.683054106310319e-07 + -6.68305411e-07 ] ], "type": "exppolynomial" @@ -103,7 +103,7 @@ "coeffs": "null", "type": "notdefined" }, - "xbase": 0.000000000000000e+00, - "xmax": 1.000000000000000e+00, - "xmin": 0.000000000000000e+00 + "xbase": 0.00000000e+00, + "xmax": 1.00000000e+00, + "xmin": 0.00000000e+00 } \ No newline at end of file diff --git a/dev/incompressible_liquids/XLT.json b/dev/incompressible_liquids/XLT.json index c4b02c8c..0cf486c9 100644 --- a/dev/incompressible_liquids/XLT.json +++ b/dev/incompressible_liquids/XLT.json @@ -3,23 +3,23 @@ "coeffs": "null", "type": "notdefined" }, - "Tbase": 3.531500000000000e+02, - "Tmax": 5.331500000000000e+02, - "Tmin": 1.731500000000000e+02, - "TminPsat": 5.331500000000000e+02, + "Tbase": 3.53150000e+02, + "Tmax": 5.33150000e+02, + "Tmin": 1.73150000e+02, + "TminPsat": 5.33150000e+02, "conductivity": { "coeffs": [ [ - 9.727307698244263e-02 + 9.72730770e-02 ], [ - -2.341492108172176e-04 + -2.34149211e-04 ], [ - -1.439523876568046e-07 + -1.43952388e-07 ], [ - 1.120310375181147e-10 + 1.12031038e-10 ] ], "type": "polynomial" @@ -27,16 +27,16 @@ "density": { "coeffs": [ [ - 7.936461315840248e+02 + 7.93646132e+02 ], [ - -1.027177318977021e+00 + -1.02717732e+00 ], [ - 1.633893202956926e-07 + 1.63389320e-07 ], [ - 1.036811678831579e-09 + 1.03681183e-09 ] ], "type": "polynomial" @@ -55,16 +55,16 @@ "specific_heat": { "coeffs": [ [ - 1.897744858190238e+03 + 1.89774486e+03 ], [ - 2.100000000001232e+00 + 2.10000000e+00 ], [ - 7.717538106355448e-07 + 7.71753811e-07 ], [ - -2.833928469673541e-16 + -2.55438032e-16 ] ], "type": "polynomial" @@ -72,16 +72,16 @@ "viscosity": { "coeffs": [ [ - -7.425222634979222e+00 + -7.42522263e+00 ], [ - -1.029019714446087e-02 + -1.02901971e-02 ], [ - 4.867175388598502e-05 + 4.86717539e-05 ], [ - -1.752403577466207e-07 + -1.75240358e-07 ] ], "type": "exppolynomial" @@ -90,7 +90,7 @@ "coeffs": "null", "type": "notdefined" }, - "xbase": 0.000000000000000e+00, - "xmax": 1.000000000000000e+00, - "xmin": 0.000000000000000e+00 + "xbase": 0.00000000e+00, + "xmax": 1.00000000e+00, + "xmin": 0.00000000e+00 } \ No newline at end of file diff --git a/dev/incompressible_liquids/ZS10.json b/dev/incompressible_liquids/ZS10.json index 241b914c..e838dcb9 100644 --- a/dev/incompressible_liquids/ZS10.json +++ b/dev/incompressible_liquids/ZS10.json @@ -3,23 +3,23 @@ "coeffs": "null", "type": "notdefined" }, - "Tbase": 3.125000000000000e+02, - "Tmax": 3.600000000000000e+02, - "Tmin": 2.650000000000000e+02, - "TminPsat": 3.600000000000000e+02, + "Tbase": 3.12500000e+02, + "Tmax": 3.60000000e+02, + "Tmin": 2.65000000e+02, + "TminPsat": 3.60000000e+02, "conductivity": { "coeffs": [ [ - 5.622541666666663e-01 + 5.62254167e-01 ], [ - 1.302142758080736e-03 + 1.30214276e-03 ], [ - -3.057644110272383e-07 + -3.05764411e-07 ], [ - 2.773732751206571e-10 + 2.77373275e-10 ] ], "type": "polynomial" @@ -27,16 +27,16 @@ "density": { "coeffs": [ [ - 1.080460113636364e+03 + 1.08046011e+03 ], [ - -4.640222577484530e-01 + -4.64022258e-01 ], [ - -6.151742994064957e-06 + -6.15174299e-06 ], [ - -2.170037976172929e-07 + -2.17003798e-07 ] ], "type": "polynomial" @@ -55,16 +55,16 @@ "specific_heat": { "coeffs": [ [ - 3.642974242424242e+03 + 3.64297424e+03 ], [ - 1.671716558892846e+00 + 1.67171656e+00 ], [ - -9.292321713374685e-03 + -9.29232171e-03 ], [ - -1.729503949688242e-07 + -1.72950395e-07 ] ], "type": "polynomial" @@ -72,16 +72,16 @@ "viscosity": { "coeffs": [ [ - -6.778759513134596e+00 + -6.77875951e+00 ], [ - -2.094840496999851e-02 + -2.09484050e-02 ], [ - 1.421960313890518e-04 + 1.42196031e-04 ], [ - -5.924776944065352e-07 + -5.92477694e-07 ] ], "type": "exppolynomial" @@ -90,7 +90,7 @@ "coeffs": "null", "type": "notdefined" }, - "xbase": 0.000000000000000e+00, - "xmax": 1.000000000000000e+00, - "xmin": 0.000000000000000e+00 + "xbase": 0.00000000e+00, + "xmax": 1.00000000e+00, + "xmin": 0.00000000e+00 } \ No newline at end of file diff --git a/dev/incompressible_liquids/ZS25.json b/dev/incompressible_liquids/ZS25.json index 3de37f4e..3beb29d9 100644 --- a/dev/incompressible_liquids/ZS25.json +++ b/dev/incompressible_liquids/ZS25.json @@ -3,23 +3,23 @@ "coeffs": "null", "type": "notdefined" }, - "Tbase": 3.050000000000000e+02, - "Tmax": 3.600000000000000e+02, - "Tmin": 2.500000000000000e+02, - "TminPsat": 3.600000000000000e+02, + "Tbase": 3.05000000e+02, + "Tmax": 3.60000000e+02, + "Tmin": 2.50000000e+02, + "TminPsat": 3.60000000e+02, "conductivity": { "coeffs": [ [ - 5.127017391304347e-01 + 5.12701739e-01 ], [ - 1.200849194283396e-03 + 1.20084919e-03 ], [ - -1.199209486166166e-06 + -1.19920949e-06 ], [ - 3.405290362172632e-10 + 3.40529036e-10 ] ], "type": "polynomial" @@ -27,16 +27,16 @@ "density": { "coeffs": [ [ - 1.176939751552795e+03 + 1.17693975e+03 ], [ - -5.327117664941265e-01 + -5.32711766e-01 ], [ - -4.517221908972857e-06 + -4.51722191e-06 ], [ - 1.216175117848473e-08 + 1.21617512e-08 ] ], "type": "polynomial" @@ -55,16 +55,16 @@ "specific_heat": { "coeffs": [ [ - 3.199794409937888e+03 + 3.19979441e+03 ], [ - 4.304501874934394e-01 + 4.30450187e-01 ], [ - 2.382834556740043e-04 + 2.38283456e-04 ], [ - 3.324212020996785e-07 + 3.32421202e-07 ] ], "type": "polynomial" @@ -72,16 +72,16 @@ "viscosity": { "coeffs": [ [ - -6.390125574512139e+00 + -6.39012557e+00 ], [ - -2.058143066987581e-02 + -2.05814307e-02 ], [ - 1.705460222709912e-04 + 1.70546022e-04 ], [ - -1.217886333268190e-06 + -1.21788633e-06 ] ], "type": "exppolynomial" @@ -90,7 +90,7 @@ "coeffs": "null", "type": "notdefined" }, - "xbase": 0.000000000000000e+00, - "xmax": 1.000000000000000e+00, - "xmin": 0.000000000000000e+00 + "xbase": 0.00000000e+00, + "xmax": 1.00000000e+00, + "xmin": 0.00000000e+00 } \ No newline at end of file diff --git a/dev/incompressible_liquids/ZS40.json b/dev/incompressible_liquids/ZS40.json index ec1002a0..c6ce740d 100644 --- a/dev/incompressible_liquids/ZS40.json +++ b/dev/incompressible_liquids/ZS40.json @@ -3,23 +3,23 @@ "coeffs": "null", "type": "notdefined" }, - "Tbase": 2.975000000000000e+02, - "Tmax": 3.600000000000000e+02, - "Tmin": 2.350000000000000e+02, - "TminPsat": 3.600000000000000e+02, + "Tbase": 2.97500000e+02, + "Tmax": 3.60000000e+02, + "Tmin": 2.35000000e+02, + "TminPsat": 3.60000000e+02, "conductivity": { "coeffs": [ [ - 4.815498626373630e-01 + 4.81549863e-01 ], [ - 1.052429387869913e-03 + 1.05242939e-03 ], [ - -1.557997557996096e-07 + -1.55799756e-07 ], [ - 2.603826293537445e-10 + 2.60382629e-10 ] ], "type": "polynomial" @@ -27,16 +27,16 @@ "density": { "coeffs": [ [ - 1.248174553571428e+03 + 1.24817455e+03 ], [ - -5.672184409930360e-01 + -5.67218441e-01 ], [ - -3.785103785021991e-06 + -3.78510379e-06 ], [ - -6.577907629692774e-08 + -6.57790763e-08 ] ], "type": "polynomial" @@ -55,16 +55,16 @@ "specific_heat": { "coeffs": [ [ - 2.785221497252748e+03 + 2.78522150e+03 ], [ - 1.317366203650004e+00 + 1.31736620e+00 ], [ - 2.221978021978245e-03 + 2.22197802e-03 ], [ - 6.210399073986814e-05 + 6.21039907e-05 ] ], "type": "polynomial" @@ -72,16 +72,16 @@ "viscosity": { "coeffs": [ [ - -6.008438601258845e+00 + -6.00843860e+00 ], [ - -2.300412315530322e-02 + -2.30041232e-02 ], [ - 2.001534445588921e-04 + 2.00153445e-04 ], [ - -1.292733256108456e-06 + -1.29273326e-06 ] ], "type": "exppolynomial" @@ -90,7 +90,7 @@ "coeffs": "null", "type": "notdefined" }, - "xbase": 0.000000000000000e+00, - "xmax": 1.000000000000000e+00, - "xmin": 0.000000000000000e+00 + "xbase": 0.00000000e+00, + "xmax": 1.00000000e+00, + "xmin": 0.00000000e+00 } \ No newline at end of file diff --git a/dev/incompressible_liquids/ZS45.json b/dev/incompressible_liquids/ZS45.json index bcb6cf59..6ac5b533 100644 --- a/dev/incompressible_liquids/ZS45.json +++ b/dev/incompressible_liquids/ZS45.json @@ -3,23 +3,23 @@ "coeffs": "null", "type": "notdefined" }, - "Tbase": 2.950000000000000e+02, - "Tmax": 3.600000000000000e+02, - "Tmin": 2.300000000000000e+02, - "TminPsat": 3.600000000000000e+02, + "Tbase": 2.95000000e+02, + "Tmax": 3.60000000e+02, + "Tmin": 2.30000000e+02, + "TminPsat": 3.60000000e+02, "conductivity": { "coeffs": [ [ - 4.708704214559388e-01 + 4.70870421e-01 ], [ - 1.018694487717152e-03 + 1.01869449e-03 ], [ - 3.638246810660269e-07 + 3.63824681e-07 ], [ - -7.204375034271344e-11 + -7.20437503e-11 ] ], "type": "polynomial" @@ -27,16 +27,16 @@ "density": { "coeffs": [ [ - 1.270019463601533e+03 + 1.27001946e+03 ], [ - -5.525705022944539e-01 + -5.52570502e-01 ], [ - -6.231316576066348e-07 + -6.23131658e-07 ], [ - 4.715590916758874e-08 + 4.71559092e-08 ] ], "type": "polynomial" @@ -55,16 +55,16 @@ "specific_heat": { "coeffs": [ [ - 2.695800000000000e+03 + 2.69580000e+03 ], [ - 2.205700007952188e+00 + 2.20570001e+00 ], [ - 0.000000000000000e+00 + 0.00000000e+00 ], [ - 5.239545302668310e-09 + 5.23954530e-09 ] ], "type": "polynomial" @@ -72,16 +72,16 @@ "viscosity": { "coeffs": [ [ - -5.868162575839229e+00 + -5.86816258e+00 ], [ - -2.357102920713789e-02 + -2.35710292e-02 ], [ - 2.181508054831943e-04 + 2.18150805e-04 ], [ - -1.505374909365477e-06 + -1.50537491e-06 ] ], "type": "exppolynomial" @@ -90,7 +90,7 @@ "coeffs": "null", "type": "notdefined" }, - "xbase": 0.000000000000000e+00, - "xmax": 1.000000000000000e+00, - "xmin": 0.000000000000000e+00 + "xbase": 0.00000000e+00, + "xmax": 1.00000000e+00, + "xmin": 0.00000000e+00 } \ No newline at end of file diff --git a/dev/incompressible_liquids/ZS55.json b/dev/incompressible_liquids/ZS55.json index df415e60..b91c3ca1 100644 --- a/dev/incompressible_liquids/ZS55.json +++ b/dev/incompressible_liquids/ZS55.json @@ -3,23 +3,23 @@ "coeffs": "null", "type": "notdefined" }, - "Tbase": 2.900000000000000e+02, - "Tmax": 3.600000000000000e+02, - "Tmin": 2.200000000000000e+02, - "TminPsat": 3.600000000000000e+02, + "Tbase": 2.90000000e+02, + "Tmax": 3.60000000e+02, + "Tmin": 2.20000000e+02, + "TminPsat": 3.60000000e+02, "conductivity": { "coeffs": [ [ - 4.510248176986807e-01 + 4.51024818e-01 ], [ - 8.649729179481250e-04 + 8.64972918e-04 ], [ - 5.316312657792575e-07 + 5.31631266e-07 ], [ - 1.331013574413588e-11 + 1.33101357e-11 ] ], "type": "polynomial" @@ -27,16 +27,16 @@ "density": { "coeffs": [ [ - 1.313547682610319e+03 + 1.31354768e+03 ], [ - -6.046277287473645e-01 + -6.04627729e-01 ], [ - -3.601885696635277e-06 + -3.60188570e-06 ], [ - 9.935065557994127e-08 + 9.93506556e-08 ] ], "type": "polynomial" @@ -55,16 +55,16 @@ "specific_heat": { "coeffs": [ [ - 2.555728068223972e+03 + 2.55572807e+03 ], [ - 1.989115591283917e+00 + 1.98911559e+00 ], [ - 4.740611261183193e-03 + 4.74061126e-03 ], [ - -6.338159823359758e-08 + -6.33815982e-08 ] ], "type": "polynomial" @@ -72,16 +72,16 @@ "viscosity": { "coeffs": [ [ - -5.584065898627196e+00 + -5.58406590e+00 ], [ - -2.616692350392655e-02 + -2.61669235e-02 ], [ - 2.553281618882340e-04 + 2.55328162e-04 ], [ - -1.648453945906862e-06 + -1.64845395e-06 ] ], "type": "exppolynomial" @@ -90,7 +90,7 @@ "coeffs": "null", "type": "notdefined" }, - "xbase": 0.000000000000000e+00, - "xmax": 1.000000000000000e+00, - "xmin": 0.000000000000000e+00 + "xbase": 0.00000000e+00, + "xmax": 1.00000000e+00, + "xmin": 0.00000000e+00 } \ No newline at end of file diff --git a/dev/incompressible_liquids/all_incompressibles.py b/dev/incompressible_liquids/all_incompressibles.py index 6d3f06d9..40b4151c 100644 --- a/dev/incompressible_liquids/all_incompressibles.py +++ b/dev/incompressible_liquids/all_incompressibles.py @@ -68,7 +68,6 @@ def getDigitalDataObjects(): return classes def getCoefficientObjects(): - return [] classes = [] ignList = getBaseClassNames() @@ -77,11 +76,11 @@ def getCoefficientObjects(): #print(name) if not name in ignList: # Ignore the base classes classes += [obj()] - for name, obj in inspect.getmembers(CPIncomp.SecCoolFluids): - if inspect.isclass(obj): - #print(name) - if not name in ignList: # Ignore the base classes - classes += [obj()] +# for name, obj in inspect.getmembers(CPIncomp.SecCoolFluids): +# if inspect.isclass(obj): +# #print(name) +# if not name in ignList: # Ignore the base classes +# classes += [obj()] return classes @@ -101,6 +100,24 @@ def fitFluidList(fluidObjs): print(obj) print(e) pass + return + +def writeFluidList(fluidObjs): + for obj in fluidObjs: + if obj==fluidObjs[0]: + print("{0}".format(obj.name), end="") + elif obj==fluidObjs[-1]: + print(", {0}".format(obj.name), end="") + else: + print(", {0}".format(obj.name), end="") + + try: + writer.toJSON(obj) + except (TypeError, ValueError) as e: + print("An error occurred for fluid: {0}".format(obj.name)) + print(obj) + print(e) + pass return if __name__ == '__main__': @@ -113,30 +130,39 @@ if __name__ == '__main__': dataObjs += getExampleCoef() for obj in dataObjs: - writer.toJSON(obj) + writer.toJSON(obj,quiet=True) # If the examples did not cause any errors, # we can proceed to the real data. + doneObjs = [] dataObjs = getPureDataObjects() print("Fitting pure fluids:", end="") fitFluidList(dataObjs) print(" ... done") - for obj in dataObjs: - writer.toJSON(obj) + doneObjs += dataObjs[:] dataObjs = getSolutionDataObjects() print("Fitting solutions:", end="") fitFluidList(dataObjs) print(" ... done") - for obj in dataObjs: - writer.toJSON(obj) + doneObjs += dataObjs[:] dataObjs = getDigitalDataObjects() print("Fitting digital fluids:", end="") fitFluidList(dataObjs) print(" ... done") - for obj in dataObjs: - writer.toJSON(obj) + doneObjs += dataObjs[:] + + + + doneObjs += getCoefficientObjects()[:] + + + print("Writing coefficients for fluids: ", end="") + print("FluidName (w) | (i) -> (w)=written, (i)=ignored") + writeFluidList(doneObjs) + print(" ... done") + # data = SecCoolExample() diff --git a/src/Backends/Incompressible/IncompressibleBackend.cpp b/src/Backends/Incompressible/IncompressibleBackend.cpp index 785cc8c0..e7ccb824 100644 --- a/src/Backends/Incompressible/IncompressibleBackend.cpp +++ b/src/Backends/Incompressible/IncompressibleBackend.cpp @@ -493,6 +493,16 @@ TEST_CASE("Internal consistency checks and example use cases for the incompressi } } + //std::string name("INCOMP::TCO"); + double T = 50 + 273.15; + double p = 10e5; + double x = 0.3; + +// std::cout << CoolProp::PropsSI("D","T",T,"P",p,"INCOMP::TCO",std::vector(1,x)) << std::endl; +// std::cout << CoolProp::PropsSI("D","T",T,"P",p,"INCOMP::LiBr",std::vector(1,x)) << std::endl; +// std::cout << CoolProp::PropsSI("D","T",T,"P",p,"INCOMP::NaK",std::vector(1,x)) << std::endl; + + // SECTION("Tests for the hardcoded fluids") { //