From 3510566701a4ccae109172be0d0bf7fbea0468a6 Mon Sep 17 00:00:00 2001 From: Jorrit Wronski Date: Sun, 20 Dec 2015 15:06:41 +0100 Subject: [PATCH 1/5] Looking at the incompressible data for #390 again and again. I must have been in a hurry. --- .../CPIncomp/DigitalFluids.py | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dev/incompressible_liquids/CPIncomp/DigitalFluids.py b/dev/incompressible_liquids/CPIncomp/DigitalFluids.py index 09fc797d..fb2601be 100644 --- a/dev/incompressible_liquids/CPIncomp/DigitalFluids.py +++ b/dev/incompressible_liquids/CPIncomp/DigitalFluids.py @@ -48,8 +48,9 @@ class HyCool20(PureData,DigitalData): key = 'Mu' def funcMu(T,x): T = (T-self.Tbase) - if T <= 20: return 0.07190*np.exp(524.75/(T+142.05)) - else: return T*(0.0005524*T - 0.06281)+2.8536 + if T <= 20: mPas = 0.07190*np.exp(524.75/(T+142.05)) + else: mPas = T*(0.0005524*T - 0.06281)+2.8536 + return mPas / 1e3 self.viscosity.xData,self.viscosity.yData,self.viscosity.data = self.getArray(dataID=key,func=funcMu,x_in=self.temperature.data,y_in=self.concentration.data,DEBUG=self.viscosity.DEBUG) self.viscosity.source = self.viscosity.SOURCE_EQUATION funcMu = None @@ -90,8 +91,9 @@ class HyCool30(PureData,DigitalData): key = 'Mu' def funcMu(T,x): T = (T-self.Tbase) - if T <= 20: return 0.11100*np.exp(408.17/(T+123.15)) - else: return T*(0.000295*T - 0.0441)+2.6836 + if T <= 20: mPas = 0.11100*np.exp(408.17/(T+123.15)) + else: mPas = T*(0.000295*T - 0.0441)+2.6836 + return mPas / 1e3 self.viscosity.xData,self.viscosity.yData,self.viscosity.data = self.getArray(dataID=key,func=funcMu,x_in=self.temperature.data,y_in=self.concentration.data,DEBUG=self.viscosity.DEBUG) self.viscosity.source = self.viscosity.SOURCE_EQUATION funcMu = None @@ -127,7 +129,8 @@ class HyCool40(PureData,DigitalData): key = 'Mu' def funcMu(T,x): T = (T-self.Tbase) - return 0.07830*np.exp(498.13/(T+130.25)) + mPas = 0.07830*np.exp(498.13/(T+130.25)) + return mPas / 1e3 self.viscosity.xData,self.viscosity.yData,self.viscosity.data = self.getArray(dataID=key,func=funcMu,x_in=self.temperature.data,y_in=self.concentration.data,DEBUG=self.viscosity.DEBUG) self.viscosity.source = self.viscosity.SOURCE_EQUATION funcMu = None @@ -163,7 +166,8 @@ class HyCool45(PureData,DigitalData): key = 'Mu' def funcMu(T,x): T = (T-self.Tbase) - return 0.08990*np.exp(479.09/(T+126.55)) + mPas = 0.08990*np.exp(479.09/(T+126.55)) + return mPas / 1e3 self.viscosity.xData,self.viscosity.yData,self.viscosity.data = self.getArray(dataID=key,func=funcMu,x_in=self.temperature.data,y_in=self.concentration.data,DEBUG=self.viscosity.DEBUG) self.viscosity.source = self.viscosity.SOURCE_EQUATION funcMu = None @@ -200,8 +204,9 @@ class HyCool50(PureData,DigitalData): def funcMu(T,x): T = (T-self.Tbase) res = 0.0491*np.exp(581.12/(T+129.05)) - if T > -10: return res + 0.2 - else: return res + if T > -10: mPas = res + 0.2 + else: mPas = res + return mPas / 1e3 self.viscosity.xData,self.viscosity.yData,self.viscosity.data = self.getArray(dataID=key,func=funcMu,x_in=self.temperature.data,y_in=self.concentration.data,DEBUG=self.viscosity.DEBUG) self.viscosity.source = self.viscosity.SOURCE_EQUATION funcMu = None From 7b6f5f683af012e1970ed6ddadc9b2c415d5e28d Mon Sep 17 00:00:00 2001 From: Jorrit Wronski Date: Sun, 20 Dec 2015 18:33:40 +0100 Subject: [PATCH 2/5] SecCool data does not come with unified units, we need another parameter --- .../CPIncomp/SecCoolFluids.py | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/dev/incompressible_liquids/CPIncomp/SecCoolFluids.py b/dev/incompressible_liquids/CPIncomp/SecCoolFluids.py index 02ad006f..87729d8a 100644 --- a/dev/incompressible_liquids/CPIncomp/SecCoolFluids.py +++ b/dev/incompressible_liquids/CPIncomp/SecCoolFluids.py @@ -13,7 +13,7 @@ class SecCoolSolutionData(DigitalData): to read data files sitting in data/SecCool/xMass and data/SecCool/xVolume. """ - def __init__(self,sFile=None,sFolder=None,name=None,desc=None,ref='SecCool software'): + def __init__(self,sFile=None,sFolder=None,name=None,desc=None,ref='SecCool software',densityFactor=None,heatFactor=None,conductivityFactor=None,viscosityFactor=None): DigitalData.__init__(self) self.allowNegativeData = False @@ -48,11 +48,11 @@ class SecCoolSolutionData(DigitalData): raise ValueError("Unknown folder type specified.") self.TminPsat = self.Tmax - try: self.density.xData,self.density.yData,self.density.data = self.getArray(dataID="Rho") - while np.max(self.density.data[np.isfinite(self.density.data)])<500: # Expect values around 1e3 - self.density.data *= 10.0 + #while np.max(self.density.data[np.isfinite(self.density.data)])<500: # Expect values around 1e3 + # self.density.data *= 10.0 + if densityFactor is not None: self.density.data *= densityFactor self.density.source = self.density.SOURCE_DATA except: if self.density.DEBUG: print("Could not load {}".format(self.getFile("Rho"))) @@ -60,8 +60,9 @@ class SecCoolSolutionData(DigitalData): try: self.specific_heat.xData,self.specific_heat.yData,self.specific_heat.data = self.getArray(dataID='Cp') - while np.max(self.specific_heat.data[np.isfinite(self.specific_heat.data)])<1000: # Expect values around 2e3 - self.specific_heat.data *= 10.0 + #while np.max(self.specific_heat.data[np.isfinite(self.specific_heat.data)])<1000: # Expect values around 2e3 + # self.specific_heat.data *= 10.0 + if heatFactor is not None: self.specific_heat.data *= heatFactor self.specific_heat.source = self.specific_heat.SOURCE_DATA except: if self.specific_heat.DEBUG: print("Could not load {}".format(self.getFile("Cp"))) @@ -69,8 +70,9 @@ class SecCoolSolutionData(DigitalData): try: self.conductivity.xData,self.conductivity.yData,self.conductivity.data = self.getArray(dataID='Cond') - while np.max(self.conductivity.data[np.isfinite(self.conductivity.data)])>2: # Expect value below 1 - self.conductivity.data *= 0.1 + #while np.max(self.conductivity.data[np.isfinite(self.conductivity.data)])>2: # Expect value below 1 + # self.conductivity.data *= 0.1 + if conductivityFactor is not None: self.conductivity.data *= conductivityFactor self.conductivity.source = self.conductivity.SOURCE_DATA except: if self.conductivity.DEBUG: print("Could not load {}".format(self.getFile("Cond"))) @@ -78,8 +80,9 @@ class SecCoolSolutionData(DigitalData): try: self.viscosity.xData,self.viscosity.yData,self.viscosity.data = self.getArray(dataID='Mu') - while np.max(self.viscosity.data[np.isfinite(self.viscosity.data)])>0.2: # Expect value below 0.1 - self.viscosity.data *= 0.1 + #while np.max(self.viscosity.data[np.isfinite(self.viscosity.data)])>0.2: # Expect value below 0.1 + # self.viscosity.data *= 0.1 + if viscosityFactor is not None: self.viscosity.data *= viscosityFactor self.viscosity.source = self.viscosity.SOURCE_DATA except: if self.viscosity.DEBUG: print("Could not load {}".format(self.getFile("Mu"))) From 4cf157ff4da5d6d4c9e69e2a44b1694927376bee Mon Sep 17 00:00:00 2001 From: Jorrit Wronski Date: Sun, 20 Dec 2015 21:15:00 +0100 Subject: [PATCH 3/5] Included individual factors for SecCool fluids --- .../CPIncomp/SecCoolFluids.py | 96 +++++++++---------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/dev/incompressible_liquids/CPIncomp/SecCoolFluids.py b/dev/incompressible_liquids/CPIncomp/SecCoolFluids.py index 87729d8a..6304839c 100644 --- a/dev/incompressible_liquids/CPIncomp/SecCoolFluids.py +++ b/dev/incompressible_liquids/CPIncomp/SecCoolFluids.py @@ -302,104 +302,104 @@ class SecCoolSolutionData(DigitalData): """ print("Loading SecCool fluids: ", end="") sec = [] - sec += [SecCoolSolutionData(sFile='Antifrogen KF' ,sFolder='xVolume',name='AKF',desc='Antifrogen KF, Potassium Formate' ,ref='Clariant2000,Skovrup2013')] + sec += [SecCoolSolutionData(sFile='Antifrogen KF' ,sFolder='xVolume',name='AKF',desc='Antifrogen KF, Potassium Formate' ,ref='Clariant2000,Skovrup2013', densityFactor=None, heatFactor=1e3, conductivityFactor=None, viscosityFactor=1e-3)] print("{0}".format(sec[-1].name), end="") - sec += [SecCoolSolutionData(sFile='Antifrogen L' ,sFolder='xVolume',name='AL' ,desc='Antifrogen L, Propylene Glycol' ,ref='Clariant2000,Skovrup2013')] + sec += [SecCoolSolutionData(sFile='Antifrogen L' ,sFolder='xVolume',name='AL' ,desc='Antifrogen L, Propylene Glycol' ,ref='Clariant2000,Skovrup2013', densityFactor=None, heatFactor=1e3, conductivityFactor=None, viscosityFactor=1e-3)] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolSolutionData(sFile='Antifrogen N' ,sFolder='xVolume',name='AN' ,desc='Antifrogen N, Ethylene Glycol' ,ref='Clariant2000,Skovrup2013')] + sec += [SecCoolSolutionData(sFile='Antifrogen N' ,sFolder='xVolume',name='AN' ,desc='Antifrogen N, Ethylene Glycol' ,ref='Clariant2000,Skovrup2013', densityFactor=None, heatFactor=1e3, conductivityFactor=None, viscosityFactor=1e-3)] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolSolutionData(sFile='ASHRAE, Ethylene Glycol' ,sFolder='xVolume',name='AEG',desc='ASHRAE, Ethylene Glycol' ,ref='ASHRAE2001,Skovrup2013')] + sec += [SecCoolSolutionData(sFile='ASHRAE, Ethylene Glycol' ,sFolder='xVolume',name='AEG',desc='ASHRAE, Ethylene Glycol' ,ref='ASHRAE2001,Skovrup2013', densityFactor=None, heatFactor=None, conductivityFactor=1e-3, viscosityFactor=1e-5)] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolSolutionData(sFile='ASHRAE, Propylene Glycol',sFolder='xVolume',name='APG',desc='ASHRAE, Propylene Glycol' ,ref='ASHRAE2001,Skovrup2013')] + sec += [SecCoolSolutionData(sFile='ASHRAE, Propylene Glycol',sFolder='xVolume',name='APG',desc='ASHRAE, Propylene Glycol' ,ref='ASHRAE2001,Skovrup2013', densityFactor=None, heatFactor=None, conductivityFactor=1e-3, viscosityFactor=1e-5)] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolSolutionData(sFile='Glykosol N' ,sFolder='xVolume',name='GKN',desc='Glykosol N, Ethylene Glycol' ,ref='PKS2005,Skovrup2013')] + sec += [SecCoolSolutionData(sFile='Glykosol N' ,sFolder='xVolume',name='GKN',desc='Glykosol N, Ethylene Glycol' ,ref='PKS2005,Skovrup2013', densityFactor=1e3, heatFactor=1e3, conductivityFactor=None, viscosityFactor=1e-3)] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolSolutionData(sFile='Pekasol 2000' ,sFolder='xVolume',name='PK2',desc='Pekasol 2000, K acetate/formate' ,ref='PKS2005,Skovrup2013')] + sec += [SecCoolSolutionData(sFile='Pekasol 2000' ,sFolder='xVolume',name='PK2',desc='Pekasol 2000, K acetate/formate' ,ref='PKS2005,Skovrup2013', densityFactor=1e3, heatFactor=1e3, conductivityFactor=None, viscosityFactor=1e-3)] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolSolutionData(sFile='Pekasol L' ,sFolder='xVolume',name='PKL',desc='Pekasol L, Propylene Glycol' ,ref='PKS2005,Skovrup2013')] + sec += [SecCoolSolutionData(sFile='Pekasol L' ,sFolder='xVolume',name='PKL',desc='Pekasol L, Propylene Glycol' ,ref='PKS2005,Skovrup2013', densityFactor=1e3, heatFactor=1e3, conductivityFactor=None, viscosityFactor=1e-3)] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolSolutionData(sFile='Zitrec AC' ,sFolder='xVolume',name='ZAC',desc='Zitrec AC, Corrosion Inhibitor' ,ref='Arteco2010,Skovrup2013')] + sec += [SecCoolSolutionData(sFile='Zitrec AC' ,sFolder='xVolume',name='ZAC',desc='Zitrec AC, Corrosion Inhibitor' ,ref='Arteco2010,Skovrup2013', densityFactor=None, heatFactor=1e3, conductivityFactor=None, viscosityFactor=None)] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolSolutionData(sFile='Zitrec FC' ,sFolder='xVolume',name='ZFC',desc='Zitrec FC, Propylene Glycol' ,ref='Arteco2010,Skovrup2013')] + sec += [SecCoolSolutionData(sFile='Zitrec FC' ,sFolder='xVolume',name='ZFC',desc='Zitrec FC, Propylene Glycol' ,ref='Arteco2010,Skovrup2013', densityFactor=None, heatFactor=1e3, conductivityFactor=None, viscosityFactor=None)] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolSolutionData(sFile='Zitrec LC' ,sFolder='xVolume',name='ZLC',desc='Zitrec LC, Propylene Glycol' ,ref='Arteco2010,Skovrup2013')] + sec += [SecCoolSolutionData(sFile='Zitrec LC' ,sFolder='xVolume',name='ZLC',desc='Zitrec LC, Propylene Glycol' ,ref='Arteco2010,Skovrup2013', densityFactor=None, heatFactor=1e3, conductivityFactor=None, viscosityFactor=None)] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolSolutionData(sFile='Zitrec MC' ,sFolder='xVolume',name='ZMC',desc='Zitrec MC, Ethylene Glycol' ,ref='Arteco2010,Skovrup2013')] + sec += [SecCoolSolutionData(sFile='Zitrec MC' ,sFolder='xVolume',name='ZMC',desc='Zitrec MC, Ethylene Glycol' ,ref='Arteco2010,Skovrup2013', densityFactor=None, heatFactor=1e3, conductivityFactor=None, viscosityFactor=None)] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolSolutionData(sFile='Zitrec M' ,sFolder='xVolume',name='ZM' ,desc='Zitrec M, Ethylene Glycol' ,ref='Arteco2010,Skovrup2013')] + sec += [SecCoolSolutionData(sFile='Zitrec M' ,sFolder='xVolume',name='ZM' ,desc='Zitrec M, Ethylene Glycol' ,ref='Arteco2010,Skovrup2013', densityFactor=None, heatFactor=1e3, conductivityFactor=None, viscosityFactor=None)] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolSolutionData(sFile='Melinder, Ammonia' ,sFolder='xMass',name='MAM2',desc='Melinder, Ammonia' ,ref='Melinder2010,Skovrup2013')] + sec += [SecCoolSolutionData(sFile='Melinder, Ammonia' ,sFolder='xMass',name='MAM2',desc='Melinder, Ammonia' ,ref='Melinder2010,Skovrup2013', densityFactor=None, heatFactor=None, conductivityFactor=None, viscosityFactor=1e-5)] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolSolutionData(sFile='Melinder, Calcium Cloride' ,sFolder='xMass',name='MCA2',desc='Melinder, Calcium Chloride' ,ref='Melinder2010,Skovrup2013')] + sec += [SecCoolSolutionData(sFile='Melinder, Calcium Cloride' ,sFolder='xMass',name='MCA2',desc='Melinder, Calcium Chloride' ,ref='Melinder2010,Skovrup2013', densityFactor=None, heatFactor=None, conductivityFactor=None, viscosityFactor=1e-5)] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolSolutionData(sFile='Melinder, Ethanol' ,sFolder='xMass',name='MEA2',desc='Melinder, Ethanol' ,ref='Melinder2010,Skovrup2013')] + sec += [SecCoolSolutionData(sFile='Melinder, Ethanol' ,sFolder='xMass',name='MEA2',desc='Melinder, Ethanol' ,ref='Melinder2010,Skovrup2013', densityFactor=None, heatFactor=None, conductivityFactor=None, viscosityFactor=1e-5)] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolSolutionData(sFile='Melinder, Ethylene glycol' ,sFolder='xMass',name='MEG2',desc='Melinder, Ethylene Glycol' ,ref='Melinder2010,Skovrup2013')] + sec += [SecCoolSolutionData(sFile='Melinder, Ethylene glycol' ,sFolder='xMass',name='MEG2',desc='Melinder, Ethylene Glycol' ,ref='Melinder2010,Skovrup2013', densityFactor=None, heatFactor=None, conductivityFactor=None, viscosityFactor=1e-5)] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolSolutionData(sFile='Melinder, Glycerol' ,sFolder='xMass',name='MGL2',desc='Melinder, Glycerol' ,ref='Melinder2010,Skovrup2013')] + sec += [SecCoolSolutionData(sFile='Melinder, Glycerol' ,sFolder='xMass',name='MGL2',desc='Melinder, Glycerol' ,ref='Melinder2010,Skovrup2013', densityFactor=None, heatFactor=None, conductivityFactor=None, viscosityFactor=1e-5)] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolSolutionData(sFile='Melinder, Magnesium Chloride' ,sFolder='xMass',name='MMG2',desc='Melinder, Magnesium Chloride' ,ref='Melinder2010,Skovrup2013')] + sec += [SecCoolSolutionData(sFile='Melinder, Magnesium Chloride' ,sFolder='xMass',name='MMG2',desc='Melinder, Magnesium Chloride' ,ref='Melinder2010,Skovrup2013', densityFactor=None, heatFactor=None, conductivityFactor=None, viscosityFactor=1e-5)] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolSolutionData(sFile='Melinder, Methanol' ,sFolder='xMass',name='MMA2',desc='Melinder, Methanol' ,ref='Melinder2010,Skovrup2013')] + sec += [SecCoolSolutionData(sFile='Melinder, Methanol' ,sFolder='xMass',name='MMA2',desc='Melinder, Methanol' ,ref='Melinder2010,Skovrup2013', densityFactor=None, heatFactor=None, conductivityFactor=None, viscosityFactor=1e-5)] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolSolutionData(sFile='Melinder, Potassium Acetate' ,sFolder='xMass',name='MKA2',desc='Melinder, Potassium Acetate' ,ref='Melinder2010,Skovrup2013')] + sec += [SecCoolSolutionData(sFile='Melinder, Potassium Acetate' ,sFolder='xMass',name='MKA2',desc='Melinder, Potassium Acetate' ,ref='Melinder2010,Skovrup2013', densityFactor=None, heatFactor=None, conductivityFactor=None, viscosityFactor=1e-5)] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolSolutionData(sFile='Melinder, Potassium Carbonate',sFolder='xMass',name='MKC2',desc='Melinder, Potassium Carbonate',ref='Melinder2010,Skovrup2013')] + sec += [SecCoolSolutionData(sFile='Melinder, Potassium Carbonate',sFolder='xMass',name='MKC2',desc='Melinder, Potassium Carbonate',ref='Melinder2010,Skovrup2013', densityFactor=None, heatFactor=None, conductivityFactor=None, viscosityFactor=1e-5)] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolSolutionData(sFile='Melinder, Propylene Glycol' ,sFolder='xMass',name='MPG2',desc='Melinder, Propylene Glycol' ,ref='Melinder2010,Skovrup2013')] + sec += [SecCoolSolutionData(sFile='Melinder, Propylene Glycol' ,sFolder='xMass',name='MPG2',desc='Melinder, Propylene Glycol' ,ref='Melinder2010,Skovrup2013', densityFactor=None, heatFactor=None, conductivityFactor=None, viscosityFactor=1e-5)] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolSolutionData(sFile='Melinder, Sodium Chloride' ,sFolder='xMass',name='MNA2',desc='Melinder, Sodium Chloride' ,ref='Melinder2010,Skovrup2013')] + sec += [SecCoolSolutionData(sFile='Melinder, Sodium Chloride' ,sFolder='xMass',name='MNA2',desc='Melinder, Sodium Chloride' ,ref='Melinder2010,Skovrup2013', densityFactor=None, heatFactor=None, conductivityFactor=None, viscosityFactor=1e-5)] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolSolutionData(sFile='VDI, Calcium Cloride' ,sFolder='xMass',name='VCA' ,desc='VDI, Calcium Cloride' ,ref='Preisegger2010,Skovrup2013')] + sec += [SecCoolSolutionData(sFile='VDI, Calcium Cloride' ,sFolder='xMass',name='VCA' ,desc='VDI, Calcium Cloride' ,ref='Preisegger2010,Skovrup2013', densityFactor=None, heatFactor=None, conductivityFactor=1e-3, viscosityFactor=1e-5)] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolSolutionData(sFile='VDI, Magnesium Chloride' ,sFolder='xMass',name='VMG' ,desc='VDI, Magnesium Chloride' ,ref='Preisegger2010,Skovrup2013')] + sec += [SecCoolSolutionData(sFile='VDI, Magnesium Chloride' ,sFolder='xMass',name='VMG' ,desc='VDI, Magnesium Chloride' ,ref='Preisegger2010,Skovrup2013', densityFactor=None, heatFactor=None, conductivityFactor=1e-3, viscosityFactor=1e-5)] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolSolutionData(sFile='VDI, Methanol' ,sFolder='xMass',name='VMA' ,desc='VDI, Methanol' ,ref='Preisegger2010,Skovrup2013')] + sec += [SecCoolSolutionData(sFile='VDI, Methanol' ,sFolder='xMass',name='VMA' ,desc='VDI, Methanol' ,ref='Preisegger2010,Skovrup2013', densityFactor=None, heatFactor=None, conductivityFactor=1e-3, viscosityFactor=1e-5)] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolSolutionData(sFile='VDI, Potassium Carbonate' ,sFolder='xMass',name='VKC' ,desc='VDI, Potassium Carbonate' ,ref='Preisegger2010,Skovrup2013')] + sec += [SecCoolSolutionData(sFile='VDI, Potassium Carbonate' ,sFolder='xMass',name='VKC' ,desc='VDI, Potassium Carbonate' ,ref='Preisegger2010,Skovrup2013', densityFactor=None, heatFactor=None, conductivityFactor=1e-3, viscosityFactor=1e-5)] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolSolutionData(sFile='VDI, Sodium Chloride' ,sFolder='xMass',name='VNA' ,desc='VDI, Sodium Chloride' ,ref='Preisegger2010,Skovrup2013')] + sec += [SecCoolSolutionData(sFile='VDI, Sodium Chloride' ,sFolder='xMass',name='VNA' ,desc='VDI, Sodium Chloride' ,ref='Preisegger2010,Skovrup2013', densityFactor=None, heatFactor=None, conductivityFactor=1e-3, viscosityFactor=1e-5)] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolSolutionData(sFile='HFE-7100' ,sFolder='xPure',name='HFE2' ,desc='HFE-7100, Hydrofluoroether' ,ref='3M2007,Skovrup2013')] + sec += [SecCoolSolutionData(sFile='HFE-7100' ,sFolder='xPure',name='HFE2' ,desc='HFE-7100, Hydrofluoroether' ,ref='3M2007,Skovrup2013', densityFactor=None, heatFactor=None, conductivityFactor=None, viscosityFactor=1e-3)] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolSolutionData(sFile='NBS, Water' ,sFolder='xPure',name='NBS' ,desc='NBS, Water' ,ref='Schmidt1979,Skovrup2013')] + sec += [SecCoolSolutionData(sFile='NBS, Water' ,sFolder='xPure',name='NBS' ,desc='NBS, Water' ,ref='Schmidt1979,Skovrup2013', densityFactor=None, heatFactor=None, conductivityFactor=None, viscosityFactor=1e-6)] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolSolutionData(sFile='Paracryol' ,sFolder='xPure',name='PCL' ,desc='Paracryol, Aliphatic Hydrocarbon' ,ref='Sulzer1999,Skovrup2013')] + sec += [SecCoolSolutionData(sFile='Paracryol' ,sFolder='xPure',name='PCL' ,desc='Paracryol, Aliphatic Hydrocarbon' ,ref='Sulzer1999,Skovrup2013', densityFactor=None, heatFactor=1e3, conductivityFactor=None, viscosityFactor=1e-3)] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolSolutionData(sFile='Paratherm NF' ,sFolder='xPure',name='PNF2' ,desc='Paratherm NF, Hydrotreated mineral oil' ,ref='Paratherm2013,Skovrup2013')] + sec += [SecCoolSolutionData(sFile='Paratherm NF' ,sFolder='xPure',name='PNF2' ,desc='Paratherm NF, Hydrotreated mineral oil' ,ref='Paratherm2013,Skovrup2013', densityFactor=None, heatFactor=1e3, conductivityFactor=None, viscosityFactor=1e-3)] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolSolutionData(sFile='Tyfoxit 1.10' ,sFolder='xPure',name='TY10',desc='Tyfoxit 1.10, Potassium Acetate' ,ref='Tyfoprop1999,Skovrup2013')] + sec += [SecCoolSolutionData(sFile='Tyfoxit 1.10' ,sFolder='xPure',name='TY10',desc='Tyfoxit 1.10, Potassium Acetate' ,ref='Tyfoprop1999,Skovrup2013', densityFactor=None, heatFactor=1e3, conductivityFactor=None, viscosityFactor=1e-5)] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolSolutionData(sFile='Tyfoxit 1.15' ,sFolder='xPure',name='TY15',desc='Tyfoxit 1.15, Potassium Acetate' ,ref='Tyfoprop1999,Skovrup2013')] + sec += [SecCoolSolutionData(sFile='Tyfoxit 1.15' ,sFolder='xPure',name='TY15',desc='Tyfoxit 1.15, Potassium Acetate' ,ref='Tyfoprop1999,Skovrup2013', densityFactor=None, heatFactor=None, conductivityFactor=1e-3, viscosityFactor=1e-5)] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolSolutionData(sFile='Tyfoxit 1.20' ,sFolder='xPure',name='TY20',desc='Tyfoxit 1.20, Potassium Acetate' ,ref='Tyfoprop1999,Skovrup2013')] + sec += [SecCoolSolutionData(sFile='Tyfoxit 1.20' ,sFolder='xPure',name='TY20',desc='Tyfoxit 1.20, Potassium Acetate' ,ref='Tyfoprop1999,Skovrup2013', densityFactor=None, heatFactor=None, conductivityFactor=1e-3, viscosityFactor=1e-5)] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolSolutionData(sFile='Tyfoxit 1.24' ,sFolder='xPure',name='TY24',desc='Tyfoxit 1.24, Potassium Acetate' ,ref='Tyfoprop1999,Skovrup2013')] + sec += [SecCoolSolutionData(sFile='Tyfoxit 1.24' ,sFolder='xPure',name='TY24',desc='Tyfoxit 1.24, Potassium Acetate' ,ref='Tyfoprop1999,Skovrup2013', densityFactor=None, heatFactor=None, conductivityFactor=1e-3, viscosityFactor=1e-5)] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolSolutionData(sFile='Zitrec S10' ,sFolder='xPure',name='ZS10',desc='Zitrec S10, Potassium formate/Sodium propionate' ,ref='Arteco2010,Skovrup2013')] + sec += [SecCoolSolutionData(sFile='Zitrec S10' ,sFolder='xPure',name='ZS10',desc='Zitrec S10, Potassium formate/Sodium propionate' ,ref='Arteco2010,Skovrup2013', densityFactor=None, heatFactor=1e3, conductivityFactor=None, viscosityFactor=None)] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolSolutionData(sFile='Zitrec S25' ,sFolder='xPure',name='ZS25',desc='Zitrec S25, Potassium formate/Sodium propionate' ,ref='Arteco2010,Skovrup2013')] + sec += [SecCoolSolutionData(sFile='Zitrec S25' ,sFolder='xPure',name='ZS25',desc='Zitrec S25, Potassium formate/Sodium propionate' ,ref='Arteco2010,Skovrup2013', densityFactor=None, heatFactor=1e3, conductivityFactor=None, viscosityFactor=None)] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolSolutionData(sFile='Zitrec S40' ,sFolder='xPure',name='ZS40',desc='Zitrec S40, Potassium formate/Sodium propionate' ,ref='Arteco2010,Skovrup2013')] + sec += [SecCoolSolutionData(sFile='Zitrec S40' ,sFolder='xPure',name='ZS40',desc='Zitrec S40, Potassium formate/Sodium propionate' ,ref='Arteco2010,Skovrup2013', densityFactor=None, heatFactor=1e3, conductivityFactor=None, viscosityFactor=None)] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolSolutionData(sFile='Zitrec S45' ,sFolder='xPure',name='ZS45',desc='Zitrec S45, Potassium formate/Sodium propionate' ,ref='Arteco2010,Skovrup2013')] + sec += [SecCoolSolutionData(sFile='Zitrec S45' ,sFolder='xPure',name='ZS45',desc='Zitrec S45, Potassium formate/Sodium propionate' ,ref='Arteco2010,Skovrup2013', densityFactor=None, heatFactor=1e3, conductivityFactor=None, viscosityFactor=None)] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolSolutionData(sFile='Zitrec S55' ,sFolder='xPure',name='ZS55',desc='Zitrec S55, Potassium formate/Sodium propionate' ,ref='Arteco2010,Skovrup2013')] + sec += [SecCoolSolutionData(sFile='Zitrec S55' ,sFolder='xPure',name='ZS55',desc='Zitrec S55, Potassium formate/Sodium propionate' ,ref='Arteco2010,Skovrup2013', densityFactor=None, heatFactor=1e3, conductivityFactor=None, viscosityFactor=None)] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolSolutionData(sFile='Syltherm XLT' ,sFolder='xPure',name='XLT2',desc='Syltherm XLT, Polydimethylsiloxan' ,ref='Dow1997,Skovrup2013')] + sec += [SecCoolSolutionData(sFile='Syltherm XLT' ,sFolder='xPure',name='XLT2',desc='Syltherm XLT, Polydimethylsiloxan' ,ref='Dow1997,Skovrup2013', densityFactor=None, heatFactor=1e3, conductivityFactor=None, viscosityFactor=1e-3)] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolSolutionData(sFile='Dowtherm J' ,sFolder='xPure',name='DowJ2',desc='Dowtherm J, Diethylbenzene mixture' ,ref='Dow1997,Skovrup2013')] + sec += [SecCoolSolutionData(sFile='Dowtherm J' ,sFolder='xPure',name='DowJ2',desc='Dowtherm J, Diethylbenzene mixture' ,ref='Dow1997,Skovrup2013', densityFactor=None, heatFactor=None, conductivityFactor=None, viscosityFactor=1e-5)] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolSolutionData(sFile='Dowtherm Q' ,sFolder='xPure',name='DowQ2',desc='Dowtherm Q, Diphenylethane/alkylated aromatics' ,ref='Dow1997,Skovrup2013')] + sec += [SecCoolSolutionData(sFile='Dowtherm Q' ,sFolder='xPure',name='DowQ2',desc='Dowtherm Q, Diphenylethane/alkylated aromatics' ,ref='Dow1997,Skovrup2013', densityFactor=None, heatFactor=None, conductivityFactor=None, viscosityFactor=1e-5)] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolIceData(sFile='IceEA' ,sFolder='xMass',name='IceEA',desc='Ice slurry with Ethanol' ,ref='Kauffeld2001,Skovrup2013')] + sec += [SecCoolIceData(sFile='IceEA' ,sFolder='xMass',name='IceEA',desc='Ice slurry with Ethanol' ,ref='Kauffeld2001,Skovrup2013', densityFactor=None, heatFactor=1e3, conductivityFactor=None, viscosityFactor=1e-3)] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolIceData(sFile='IceNA' ,sFolder='xMass',name='IceNA',desc='Ice slurry with NaCl' ,ref='Kauffeld2001,Skovrup2013')] + sec += [SecCoolIceData(sFile='IceNA' ,sFolder='xMass',name='IceNA',desc='Ice slurry with NaCl' ,ref='Kauffeld2001,Skovrup2013', densityFactor=None, heatFactor=1e3, conductivityFactor=None, viscosityFactor=1e-3)] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolIceData(sFile='IcePG' ,sFolder='xMass',name='IcePG',desc='Ice slurry with Propylene Glycol' ,ref='Kauffeld2001,Skovrup2013')] + sec += [SecCoolIceData(sFile='IcePG' ,sFolder='xMass',name='IcePG',desc='Ice slurry with Propylene Glycol' ,ref='Kauffeld2001,Skovrup2013', densityFactor=None, heatFactor=1e3, conductivityFactor=None, viscosityFactor=1e-3)] print(", {0}".format(sec[-1].name), end="") sec += [ThermogenVP1869()] From 5798acff57de70d60c367d1f6277c6b554055cc8 Mon Sep 17 00:00:00 2001 From: Jorrit Wronski Date: Sun, 20 Dec 2015 23:09:19 +0100 Subject: [PATCH 4/5] Refitted incompressibles and fixed a couple of faulty viscosity, fixes #901 --- .../CPIncomp/SecCoolFluids.py | 21 +++-- .../CPIncomp/data/AS20_Mu.txt | 42 +++++----- .../CPIncomp/data/AS30_Mu.txt | 42 +++++----- .../CPIncomp/data/AS40_Mu.txt | 42 +++++----- .../CPIncomp/data/AS55_Mu.txt | 42 +++++----- .../CPIncomp/data/FRE_Mu.txt | 42 +++++----- .../CPIncomp/data/HY20_Mu.txt | 42 +++++----- .../CPIncomp/data/HY30_Mu.txt | 42 +++++----- .../CPIncomp/data/HY40_Mu.txt | 42 +++++----- .../CPIncomp/data/HY45_Mu.txt | 42 +++++----- .../CPIncomp/data/HY50_Mu.txt | 42 +++++----- dev/incompressible_liquids/json/AEG.json | 12 +-- dev/incompressible_liquids/json/AKF.json | 4 +- dev/incompressible_liquids/json/AL.json | 4 +- dev/incompressible_liquids/json/AN.json | 4 +- dev/incompressible_liquids/json/APG.json | 18 ++-- dev/incompressible_liquids/json/AS10.json | 8 +- dev/incompressible_liquids/json/AS20.json | 10 +-- dev/incompressible_liquids/json/AS30.json | 10 +-- dev/incompressible_liquids/json/AS40.json | 10 +-- dev/incompressible_liquids/json/AS55.json | 10 +-- dev/incompressible_liquids/json/DowJ2.json | 2 +- dev/incompressible_liquids/json/FRE.json | 46 +++++----- dev/incompressible_liquids/json/GKN.json | 22 ++--- dev/incompressible_liquids/json/HFE2.json | 18 ++-- dev/incompressible_liquids/json/HY20.json | 8 +- dev/incompressible_liquids/json/HY30.json | 8 +- dev/incompressible_liquids/json/HY40.json | 8 +- dev/incompressible_liquids/json/HY45.json | 8 +- dev/incompressible_liquids/json/HY50.json | 6 +- dev/incompressible_liquids/json/IcePG.json | 6 +- dev/incompressible_liquids/json/MCA2.json | 24 +++--- dev/incompressible_liquids/json/MEA2.json | 14 ++-- dev/incompressible_liquids/json/MEG2.json | 10 +-- dev/incompressible_liquids/json/MGL2.json | 10 +-- dev/incompressible_liquids/json/MKA2.json | 16 ++-- dev/incompressible_liquids/json/MKC2.json | 10 +-- dev/incompressible_liquids/json/MMA2.json | 10 +-- dev/incompressible_liquids/json/MMG2.json | 40 ++++----- dev/incompressible_liquids/json/MNA2.json | 84 +++++++++---------- dev/incompressible_liquids/json/NBS.json | 2 +- dev/incompressible_liquids/json/PCL.json | 4 +- dev/incompressible_liquids/json/PK2.json | 12 +-- dev/incompressible_liquids/json/PKL.json | 10 +-- dev/incompressible_liquids/json/PNF2.json | 2 +- dev/incompressible_liquids/json/TY10.json | 14 ++-- dev/incompressible_liquids/json/TY15.json | 14 ++-- dev/incompressible_liquids/json/TY24.json | 8 +- dev/incompressible_liquids/json/VNA.json | 20 ++--- dev/incompressible_liquids/json/ZFC.json | 6 +- dev/incompressible_liquids/json/ZLC.json | 8 +- dev/incompressible_liquids/json/ZM.json | 6 +- dev/incompressible_liquids/json/ZMC.json | 8 +- 53 files changed, 500 insertions(+), 495 deletions(-) diff --git a/dev/incompressible_liquids/CPIncomp/SecCoolFluids.py b/dev/incompressible_liquids/CPIncomp/SecCoolFluids.py index 6304839c..20bb0cfd 100644 --- a/dev/incompressible_liquids/CPIncomp/SecCoolFluids.py +++ b/dev/incompressible_liquids/CPIncomp/SecCoolFluids.py @@ -395,11 +395,11 @@ class SecCoolSolutionData(DigitalData): sec += [SecCoolSolutionData(sFile='Dowtherm Q' ,sFolder='xPure',name='DowQ2',desc='Dowtherm Q, Diphenylethane/alkylated aromatics' ,ref='Dow1997,Skovrup2013', densityFactor=None, heatFactor=None, conductivityFactor=None, viscosityFactor=1e-5)] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolIceData(sFile='IceEA' ,sFolder='xMass',name='IceEA',desc='Ice slurry with Ethanol' ,ref='Kauffeld2001,Skovrup2013', densityFactor=None, heatFactor=1e3, conductivityFactor=None, viscosityFactor=1e-3)] + sec += [SecCoolIceData(sFile='IceEA' ,sFolder='xMass',name='IceEA',desc='Ice slurry with Ethanol' ,ref='Kauffeld2001,Skovrup2013')] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolIceData(sFile='IceNA' ,sFolder='xMass',name='IceNA',desc='Ice slurry with NaCl' ,ref='Kauffeld2001,Skovrup2013', densityFactor=None, heatFactor=1e3, conductivityFactor=None, viscosityFactor=1e-3)] + sec += [SecCoolIceData(sFile='IceNA' ,sFolder='xMass',name='IceNA',desc='Ice slurry with NaCl' ,ref='Kauffeld2001,Skovrup2013')] print(", {0}".format(sec[-1].name), end="") - sec += [SecCoolIceData(sFile='IcePG' ,sFolder='xMass',name='IcePG',desc='Ice slurry with Propylene Glycol' ,ref='Kauffeld2001,Skovrup2013', densityFactor=None, heatFactor=1e3, conductivityFactor=None, viscosityFactor=1e-3)] + sec += [SecCoolIceData(sFile='IcePG' ,sFolder='xMass',name='IcePG',desc='Ice slurry with Propylene Glycol' ,ref='Kauffeld2001,Skovrup2013')] print(", {0}".format(sec[-1].name), end="") sec += [ThermogenVP1869()] @@ -624,7 +624,7 @@ class Freezium(DigitalData): def funcMu(T,x): Tr = (T-self.Tbase)/100.0 result = 0.32+x*(-0.70+x*2.26)+Tr*(-1.26+Tr*(1.12-Tr*0.894)) - return self.rho(T, 1e6, x)*np.power(10,result)*1E-3; + return self.rho(T, 1e6, x)*np.power(10,result)*1E-6; self.viscosity.xData,self.viscosity.yData,self.viscosity.data = self.getArray(dataID=key,func=funcMu,x_in=self.temperature.data,y_in=self.concentration.data,DEBUG=self.viscosity.DEBUG) @@ -698,6 +698,7 @@ class AS10(PureData,DigitalData): self.viscosity.source = self.viscosity.SOURCE_COEFFS self.viscosity.type = self.viscosity.INCOMPRESSIBLE_POLYNOMIAL self.viscosity.coeffs = np.array([[-2.11481e-5],[+ 0.00235381],[- 0.10631376],[+ 2.80154921]])[::-1] + self.viscosity.coeffs *= 1e-3 def fitFluid(self): pass @@ -736,7 +737,8 @@ class AS20(PureData,DigitalData): key = 'Mu' def funcMu(T,x): T = (T-self.Tbase) - return 2.43708721027941*np.exp(-0.0537593944541809*T) + 0.97244 + mPas = 2.43708721027941*np.exp(-0.0537593944541809*T) + 0.97244 + return mPas / 1e3 self.viscosity.xData,self.viscosity.yData,self.viscosity.data = self.getArray(dataID=key,func=funcMu,x_in=self.temperature.data,y_in=self.concentration.data,DEBUG=self.viscosity.DEBUG) @@ -784,7 +786,8 @@ class AS30(PureData,DigitalData): key = 'Mu' def funcMu(T,x): T = (T-self.Tbase) - return 2.65653950695888*np.exp(-0.0598806339442954*T) + 1.30143 + mPas = 2.65653950695888*np.exp(-0.0598806339442954*T) + 1.30143 + return mPas / 1e3 self.viscosity.xData,self.viscosity.yData,self.viscosity.data = self.getArray(dataID=key,func=funcMu,x_in=self.temperature.data,y_in=self.concentration.data,DEBUG=self.viscosity.DEBUG) @@ -831,7 +834,8 @@ class AS40(PureData,DigitalData): key = 'Mu' def funcMu(T,x): T = (T-self.Tbase) - return 0.714976365635003*np.exp(-0.100050525515385*T) + 4.38768154440393*np.exp(-0.0260039000649317*T) + mPas = 0.714976365635003*np.exp(-0.100050525515385*T) + 4.38768154440393*np.exp(-0.0260039000649317*T) + return mPas / 1e3 self.viscosity.xData,self.viscosity.yData,self.viscosity.data = self.getArray(dataID=key,func=funcMu,x_in=self.temperature.data,y_in=self.concentration.data,DEBUG=self.viscosity.DEBUG) @@ -879,7 +883,8 @@ class AS55(PureData,DigitalData): key = 'Mu' def funcMu(T,x): T = (T-self.Tbase) - return 0.159583223482554*np.exp(-0.138097704125669*T) + 6.3176967296442*np.exp(-0.0380509974688477*T) + mPas = 0.159583223482554*np.exp(-0.138097704125669*T) + 6.3176967296442*np.exp(-0.0380509974688477*T) + return mPas / 1e3 self.viscosity.xData,self.viscosity.yData,self.viscosity.data = self.getArray(dataID=key,func=funcMu,x_in=self.temperature.data,y_in=self.concentration.data,DEBUG=self.viscosity.DEBUG) diff --git a/dev/incompressible_liquids/CPIncomp/data/AS20_Mu.txt b/dev/incompressible_liquids/CPIncomp/data/AS20_Mu.txt index 86433c74..7e45b847 100644 --- a/dev/incompressible_liquids/CPIncomp/data/AS20_Mu.txt +++ b/dev/incompressible_liquids/CPIncomp/data/AS20_Mu.txt @@ -1,21 +1,21 @@ -nan 0.00000e+00 -2.53150e+02 8.11443e+00 -2.55782e+02 7.17225e+00 -2.58413e+02 6.35437e+00 -2.61045e+02 5.64438e+00 -2.63676e+02 5.02806e+00 -2.66308e+02 4.49304e+00 -2.68939e+02 4.02860e+00 -2.71571e+02 3.62543e+00 -2.74203e+02 3.27544e+00 -2.76834e+02 2.97163e+00 -2.79466e+02 2.70790e+00 -2.82097e+02 2.47895e+00 -2.84729e+02 2.28021e+00 -2.87361e+02 2.10769e+00 -2.89992e+02 1.95793e+00 -2.92624e+02 1.82792e+00 -2.95255e+02 1.71507e+00 -2.97887e+02 1.61710e+00 -3.00518e+02 1.53206e+00 -3.03150e+02 1.45823e+00 +nan 0.000000e+00 +2.531500e+02 8.114430e-03 +2.557816e+02 7.172254e-03 +2.584132e+02 6.354371e-03 +2.610447e+02 5.644384e-03 +2.636763e+02 5.028058e-03 +2.663079e+02 4.493038e-03 +2.689395e+02 4.028599e-03 +2.715711e+02 3.625429e-03 +2.742026e+02 3.275445e-03 +2.768342e+02 2.971631e-03 +2.794658e+02 2.707897e-03 +2.820974e+02 2.478954e-03 +2.847289e+02 2.280214e-03 +2.873605e+02 2.107692e-03 +2.899921e+02 1.957929e-03 +2.926237e+02 1.827922e-03 +2.952553e+02 1.715067e-03 +2.978868e+02 1.617099e-03 +3.005184e+02 1.532055e-03 +3.031500e+02 1.458230e-03 diff --git a/dev/incompressible_liquids/CPIncomp/data/AS30_Mu.txt b/dev/incompressible_liquids/CPIncomp/data/AS30_Mu.txt index d374a9bb..fb22c797 100644 --- a/dev/incompressible_liquids/CPIncomp/data/AS30_Mu.txt +++ b/dev/incompressible_liquids/CPIncomp/data/AS30_Mu.txt @@ -1,21 +1,21 @@ -nan 0.00000e+00 -2.43150e+02 1.73151e+01 -2.46308e+02 1.45561e+01 -2.49466e+02 1.22724e+01 -2.52624e+02 1.03821e+01 -2.55782e+02 8.81760e+00 -2.58939e+02 7.52261e+00 -2.62097e+02 6.45074e+00 -2.65255e+02 5.56355e+00 -2.68413e+02 4.82921e+00 -2.71571e+02 4.22140e+00 -2.74729e+02 3.71831e+00 -2.77887e+02 3.30189e+00 -2.81045e+02 2.95723e+00 -2.84203e+02 2.67194e+00 -2.87361e+02 2.43581e+00 -2.90518e+02 2.24037e+00 -2.93676e+02 2.07859e+00 -2.96834e+02 1.94469e+00 -2.99992e+02 1.83386e+00 -3.03150e+02 1.74213e+00 +nan 0.000000e+00 +2.431500e+02 1.731511e-02 +2.463079e+02 1.455606e-02 +2.494658e+02 1.227237e-02 +2.526237e+02 1.038215e-02 +2.557816e+02 8.817598e-03 +2.589395e+02 7.522610e-03 +2.620974e+02 6.450741e-03 +2.652553e+02 5.563548e-03 +2.684132e+02 4.829212e-03 +2.715711e+02 4.221398e-03 +2.747289e+02 3.718306e-03 +2.778868e+02 3.301894e-03 +2.810447e+02 2.957227e-03 +2.842026e+02 2.671944e-03 +2.873605e+02 2.435813e-03 +2.905184e+02 2.240366e-03 +2.936763e+02 2.078594e-03 +2.968342e+02 1.944693e-03 +2.999921e+02 1.833863e-03 +3.031500e+02 1.742128e-03 diff --git a/dev/incompressible_liquids/CPIncomp/data/AS40_Mu.txt b/dev/incompressible_liquids/CPIncomp/data/AS40_Mu.txt index 8dc83d6a..11b743ae 100644 --- a/dev/incompressible_liquids/CPIncomp/data/AS40_Mu.txt +++ b/dev/incompressible_liquids/CPIncomp/data/AS40_Mu.txt @@ -1,21 +1,21 @@ -nan 0.00000e+00 -2.33150e+02 5.15310e+01 -2.36834e+02 3.83374e+01 -2.40518e+02 2.89653e+01 -2.44203e+02 2.22590e+01 -2.47887e+02 1.74172e+01 -2.51571e+02 1.38835e+01 -2.55255e+02 1.12715e+01 -2.58939e+02 9.31239e+00 -2.62624e+02 7.81879e+00 -2.66308e+02 6.65982e+00 -2.69992e+02 5.74383e+00 -2.73676e+02 5.00634e+00 -2.77361e+02 4.40182e+00 -2.81045e+02 3.89789e+00 -2.84729e+02 3.47138e+00 -2.88413e+02 3.10555e+00 -2.92097e+02 2.78815e+00 -2.95782e+02 2.51013e+00 -2.99466e+02 2.26469e+00 -3.03150e+02 2.04665e+00 +nan 0.000000e+00 +2.331500e+02 5.153100e-02 +2.368342e+02 3.833735e-02 +2.405184e+02 2.896527e-02 +2.442026e+02 2.225904e-02 +2.478868e+02 1.741720e-02 +2.515711e+02 1.388350e-02 +2.552553e+02 1.127151e-02 +2.589395e+02 9.312393e-03 +2.626237e+02 7.818785e-03 +2.663079e+02 6.659822e-03 +2.699921e+02 5.743828e-03 +2.736763e+02 5.006341e-03 +2.773605e+02 4.401819e-03 +2.810447e+02 3.897892e-03 +2.847289e+02 3.471384e-03 +2.884132e+02 3.105547e-03 +2.920974e+02 2.788146e-03 +2.957816e+02 2.510128e-03 +2.994658e+02 2.264692e-03 +3.031500e+02 2.046647e-03 diff --git a/dev/incompressible_liquids/CPIncomp/data/AS55_Mu.txt b/dev/incompressible_liquids/CPIncomp/data/AS55_Mu.txt index efa2d57b..def8102e 100644 --- a/dev/incompressible_liquids/CPIncomp/data/AS55_Mu.txt +++ b/dev/incompressible_liquids/CPIncomp/data/AS55_Mu.txt @@ -1,21 +1,21 @@ -nan 0.00000e+00 -2.18150e+02 3.68628e+02 -2.22624e+02 2.14326e+02 -2.27097e+02 1.28698e+02 -2.31571e+02 8.04752e+01 -2.36045e+02 5.27410e+01 -2.40518e+02 3.63246e+01 -2.44992e+02 2.62389e+01 -2.49466e+02 1.97597e+01 -2.53939e+02 1.53880e+01 -2.58413e+02 1.22899e+01 -2.62887e+02 9.99445e+00 -2.67361e+02 8.22965e+00 -2.71834e+02 6.83344e+00 -2.76308e+02 5.70557e+00 -2.80782e+02 4.78109e+00 -2.85255e+02 4.01579e+00 -2.89729e+02 3.37808e+00 -2.94203e+02 2.84439e+00 -2.98676e+02 2.39652e+00 -3.03150e+02 2.01996e+00 +nan 0.000000e+00 +2.181500e+02 3.686282e-01 +2.226237e+02 2.143262e-01 +2.270974e+02 1.286978e-01 +2.315711e+02 8.047516e-02 +2.360447e+02 5.274103e-02 +2.405184e+02 3.632456e-02 +2.449921e+02 2.623893e-02 +2.494658e+02 1.975974e-02 +2.539395e+02 1.538795e-02 +2.584132e+02 1.228986e-02 +2.628868e+02 9.994449e-03 +2.673605e+02 8.229646e-03 +2.718342e+02 6.833440e-03 +2.763079e+02 5.705571e-03 +2.807816e+02 4.781089e-03 +2.852553e+02 4.015787e-03 +2.897289e+02 3.378078e-03 +2.942026e+02 2.844395e-03 +2.986763e+02 2.396515e-03 +3.031500e+02 2.019964e-03 diff --git a/dev/incompressible_liquids/CPIncomp/data/FRE_Mu.txt b/dev/incompressible_liquids/CPIncomp/data/FRE_Mu.txt index 1625c529..34e8d5a8 100644 --- a/dev/incompressible_liquids/CPIncomp/data/FRE_Mu.txt +++ b/dev/incompressible_liquids/CPIncomp/data/FRE_Mu.txt @@ -1,21 +1,21 @@ -nan 1.90000e-01 2.06316e-01 2.22632e-01 2.38947e-01 2.55263e-01 2.71579e-01 2.87895e-01 3.04211e-01 3.20526e-01 3.36842e-01 3.53158e-01 3.69474e-01 3.85789e-01 4.02105e-01 4.18421e-01 4.34737e-01 4.51053e-01 4.67368e-01 4.83684e-01 5.00000e-01 -2.33000e+02 1.16763e+01 1.18679e+01 1.20974e+01 1.23669e+01 1.26788e+01 1.30358e+01 1.34414e+01 1.38992e+01 1.44138e+01 1.49902e+01 1.56342e+01 1.63523e+01 1.71521e+01 1.80423e+01 1.90326e+01 2.01342e+01 2.13600e+01 2.27247e+01 2.42450e+01 2.59402e+01 -2.37211e+02 9.14877e+00 9.29903e+00 9.47901e+00 9.69029e+00 9.93477e+00 1.02147e+01 1.05326e+01 1.08915e+01 1.12949e+01 1.17468e+01 1.22515e+01 1.28145e+01 1.34414e+01 1.41392e+01 1.49154e+01 1.57790e+01 1.67399e+01 1.78096e+01 1.90013e+01 2.03301e+01 -2.41421e+02 7.29135e+00 7.41121e+00 7.55475e+00 7.72324e+00 7.91820e+00 8.14141e+00 8.39491e+00 8.68111e+00 9.00277e+00 9.36302e+00 9.76550e+00 1.02143e+01 1.07142e+01 1.12705e+01 1.18895e+01 1.25780e+01 1.33441e+01 1.41970e+01 1.51472e+01 1.62067e+01 -2.45632e+02 5.90529e+00 6.00244e+00 6.11878e+00 6.25533e+00 6.41332e+00 6.59419e+00 6.79961e+00 7.03152e+00 7.29215e+00 7.58406e+00 7.91017e+00 8.27383e+00 8.67887e+00 9.12964e+00 9.63112e+00 1.01890e+01 1.08098e+01 1.15008e+01 1.22707e+01 1.31292e+01 -2.49842e+02 4.85581e+00 4.93576e+00 5.03149e+00 5.14385e+00 5.27384e+00 5.42264e+00 5.59164e+00 5.78243e+00 5.99684e+00 6.23698e+00 6.50526e+00 6.80442e+00 7.13762e+00 7.50844e+00 7.92097e+00 8.37990e+00 8.89056e+00 9.45906e+00 1.00924e+01 1.07986e+01 -2.54053e+02 4.05013e+00 4.11687e+00 4.19677e+00 4.29055e+00 4.39903e+00 4.52321e+00 4.66425e+00 4.82346e+00 5.00238e+00 5.20276e+00 5.42663e+00 5.67626e+00 5.95430e+00 6.26372e+00 6.60796e+00 6.99090e+00 7.41702e+00 7.89140e+00 8.41989e+00 9.00917e+00 -2.58263e+02 3.42343e+00 3.47989e+00 3.54748e+00 3.62680e+00 3.71855e+00 3.82358e+00 3.94285e+00 4.07749e+00 4.22879e+00 4.39825e+00 4.58756e+00 4.79866e+00 5.03378e+00 5.29544e+00 5.58653e+00 5.91036e+00 6.27070e+00 6.67185e+00 7.11876e+00 7.61708e+00 -2.62474e+02 2.92982e+00 2.97818e+00 3.03607e+00 3.10399e+00 3.18256e+00 3.27249e+00 3.37462e+00 3.48990e+00 3.61945e+00 3.76454e+00 3.92663e+00 4.10737e+00 4.30868e+00 4.53271e+00 4.78194e+00 5.05919e+00 5.36771e+00 5.71117e+00 6.09381e+00 6.52047e+00 -2.66684e+02 2.53633e+00 2.57823e+00 2.62838e+00 2.68721e+00 2.75527e+00 2.83317e+00 2.92162e+00 3.02147e+00 3.13368e+00 3.25934e+00 3.39972e+00 3.55626e+00 3.73060e+00 3.92463e+00 4.14048e+00 4.38061e+00 4.64780e+00 4.94526e+00 5.27666e+00 5.64618e+00 -2.70895e+02 2.21899e+00 2.25568e+00 2.29958e+00 2.35109e+00 2.41067e+00 2.47886e+00 2.55629e+00 2.64369e+00 2.74190e+00 2.85189e+00 2.97476e+00 3.11178e+00 3.26437e+00 3.43420e+00 3.62312e+00 3.83330e+00 4.06716e+00 4.32752e+00 4.61758e+00 4.94101e+00 -2.75105e+02 1.96015e+00 1.99259e+00 2.03140e+00 2.07693e+00 2.12959e+00 2.18986e+00 2.25829e+00 2.33553e+00 2.42233e+00 2.51954e+00 2.62813e+00 2.74921e+00 2.88407e+00 3.03415e+00 3.20111e+00 3.38685e+00 3.59352e+00 3.82361e+00 4.07995e+00 4.36578e+00 -2.79316e+02 1.74666e+00 1.77559e+00 1.81020e+00 1.85080e+00 1.89775e+00 1.95148e+00 2.01249e+00 2.08136e+00 2.15874e+00 2.24540e+00 2.34220e+00 2.45015e+00 2.57037e+00 2.70416e+00 2.85300e+00 3.01858e+00 3.20283e+00 3.40795e+00 3.63647e+00 3.89128e+00 -2.83526e+02 1.56860e+00 1.59460e+00 1.62570e+00 1.66218e+00 1.70437e+00 1.75266e+00 1.80747e+00 1.86935e+00 1.93888e+00 2.01674e+00 2.10371e+00 2.20070e+00 2.30871e+00 2.42892e+00 2.56264e+00 2.71141e+00 2.87694e+00 3.06123e+00 3.26655e+00 3.49549e+00 -2.87737e+02 1.41840e+00 1.44192e+00 1.47007e+00 1.50308e+00 1.54126e+00 1.58494e+00 1.63453e+00 1.69051e+00 1.75341e+00 1.82385e+00 1.90253e+00 1.99027e+00 2.08798e+00 2.19673e+00 2.31770e+00 2.45228e+00 2.60203e+00 2.76875e+00 2.95449e+00 3.16159e+00 -2.91947e+02 1.29023e+00 1.31165e+00 1.33727e+00 1.36732e+00 1.40206e+00 1.44182e+00 1.48696e+00 1.53791e+00 1.59515e+00 1.65925e+00 1.73086e+00 1.81070e+00 1.89963e+00 1.99859e+00 2.10868e+00 2.23115e+00 2.36743e+00 2.51915e+00 2.68818e+00 2.87666e+00 -2.96158e+02 1.17955e+00 1.19915e+00 1.22260e+00 1.25008e+00 1.28187e+00 1.31824e+00 1.35952e+00 1.40612e+00 1.45848e+00 1.51711e+00 1.58261e+00 1.65564e+00 1.73697e+00 1.82748e+00 1.92817e+00 2.04019e+00 2.16484e+00 2.30360e+00 2.45820e+00 2.63059e+00 -3.00368e+02 1.08281e+00 1.10082e+00 1.12235e+00 1.14760e+00 1.17680e+00 1.21020e+00 1.24812e+00 1.29092e+00 1.33901e+00 1.39286e+00 1.45301e+00 1.52008e+00 1.59477e+00 1.67790e+00 1.77037e+00 1.87325e+00 1.98772e+00 2.11516e+00 2.25714e+00 2.41546e+00 -3.04579e+02 9.97166e-01 1.01376e+00 1.03361e+00 1.05688e+00 1.08378e+00 1.11456e+00 1.14950e+00 1.18893e+00 1.23324e+00 1.28285e+00 1.33827e+00 1.40006e+00 1.46888e+00 1.54547e+00 1.63066e+00 1.72544e+00 1.83091e+00 1.94832e+00 2.07914e+00 2.22500e+00 -3.08789e+02 9.20375e-01 9.35707e-01 9.54038e-01 9.75530e-01 1.00037e+00 1.02880e+00 1.06107e+00 1.09748e+00 1.13840e+00 1.18421e+00 1.23538e+00 1.29244e+00 1.35599e+00 1.42671e+00 1.50538e+00 1.59290e+00 1.69029e+00 1.79871e+00 1.91950e+00 2.05420e+00 -3.13000e+02 8.50634e-01 8.64817e-01 8.81772e-01 9.01648e-01 9.24624e-01 9.50910e-01 9.80748e-01 1.01442e+00 1.05225e+00 1.09461e+00 1.14193e+00 1.19469e+00 1.25345e+00 1.31884e+00 1.39159e+00 1.47251e+00 1.56256e+00 1.66281e+00 1.77450e+00 1.89904e+00 +nan 1.900000e-01 2.063158e-01 2.226316e-01 2.389474e-01 2.552632e-01 2.715789e-01 2.878947e-01 3.042105e-01 3.205263e-01 3.368421e-01 3.531579e-01 3.694737e-01 3.857895e-01 4.021053e-01 4.184211e-01 4.347368e-01 4.510526e-01 4.673684e-01 4.836842e-01 5.000000e-01 +2.330000e+02 1.167629e-02 1.186790e-02 1.209744e-02 1.236693e-02 1.267877e-02 1.303581e-02 1.344136e-02 1.389924e-02 1.441385e-02 1.499024e-02 1.563419e-02 1.635231e-02 1.715213e-02 1.804227e-02 1.903256e-02 2.013421e-02 2.136004e-02 2.272471e-02 2.424501e-02 2.594017e-02 +2.372105e+02 9.148767e-03 9.299027e-03 9.479005e-03 9.690290e-03 9.934773e-03 1.021468e-02 1.053260e-02 1.089154e-02 1.129494e-02 1.174677e-02 1.225155e-02 1.281446e-02 1.344142e-02 1.413917e-02 1.491543e-02 1.577897e-02 1.673986e-02 1.780959e-02 1.900131e-02 2.033011e-02 +2.414211e+02 7.291355e-03 7.411207e-03 7.554748e-03 7.723244e-03 7.918205e-03 8.141405e-03 8.394911e-03 8.681114e-03 9.002766e-03 9.363024e-03 9.765501e-03 1.021433e-02 1.071421e-02 1.127055e-02 1.188947e-02 1.257799e-02 1.334412e-02 1.419704e-02 1.514722e-02 1.620670e-02 +2.456316e+02 5.905292e-03 6.002441e-03 6.118778e-03 6.255331e-03 6.413323e-03 6.594192e-03 6.799612e-03 7.031522e-03 7.292151e-03 7.584058e-03 7.910170e-03 8.273835e-03 8.678871e-03 9.129640e-03 9.631120e-03 1.018899e-02 1.080975e-02 1.150083e-02 1.227072e-02 1.312917e-02 +2.498421e+02 4.855810e-03 4.935759e-03 5.031490e-03 5.143847e-03 5.273837e-03 5.422642e-03 5.591642e-03 5.782431e-03 5.996842e-03 6.236981e-03 6.505257e-03 6.804422e-03 7.137620e-03 7.508439e-03 7.920973e-03 8.379899e-03 8.890559e-03 9.459063e-03 1.009241e-02 1.079860e-02 +2.540526e+02 4.050127e-03 4.116866e-03 4.196771e-03 4.290545e-03 4.399031e-03 4.523214e-03 4.664246e-03 4.823456e-03 5.002376e-03 5.202763e-03 5.426626e-03 5.676263e-03 5.954298e-03 6.263723e-03 6.607957e-03 6.990902e-03 7.417016e-03 7.891399e-03 8.419887e-03 9.009171e-03 +2.582632e+02 3.423434e-03 3.479893e-03 3.547482e-03 3.626798e-03 3.718551e-03 3.823576e-03 3.942847e-03 4.077488e-03 4.228794e-03 4.398252e-03 4.587561e-03 4.798664e-03 5.033779e-03 5.295439e-03 5.586534e-03 5.910364e-03 6.270699e-03 6.671853e-03 7.118761e-03 7.617082e-03 +2.624737e+02 2.929822e-03 2.978180e-03 3.036065e-03 3.103989e-03 3.182558e-03 3.272490e-03 3.374616e-03 3.489900e-03 3.619452e-03 3.764543e-03 3.926628e-03 4.107373e-03 4.308676e-03 4.532706e-03 4.781936e-03 5.059194e-03 5.367708e-03 5.711170e-03 6.093808e-03 6.520466e-03 +2.666842e+02 2.536330e-03 2.578229e-03 2.628376e-03 2.687215e-03 2.755273e-03 2.833168e-03 2.921624e-03 3.021475e-03 3.133680e-03 3.259342e-03 3.399722e-03 3.556261e-03 3.730605e-03 3.924630e-03 4.140481e-03 4.380606e-03 4.647801e-03 4.945264e-03 5.276657e-03 5.646177e-03 +2.708947e+02 2.218991e-03 2.255678e-03 2.299583e-03 2.351093e-03 2.410671e-03 2.478858e-03 2.556287e-03 2.643687e-03 2.741901e-03 2.851891e-03 2.974763e-03 3.111777e-03 3.264374e-03 3.434198e-03 3.623124e-03 3.833296e-03 4.067162e-03 4.327521e-03 4.617579e-03 4.941009e-03 +2.751053e+02 1.960153e-03 1.992588e-03 2.031399e-03 2.076931e-03 2.129590e-03 2.189857e-03 2.258289e-03 2.335533e-03 2.422332e-03 2.519537e-03 2.628125e-03 2.749211e-03 2.884068e-03 3.034148e-03 3.201109e-03 3.386846e-03 3.593523e-03 3.823613e-03 4.079950e-03 4.365780e-03 +2.793158e+02 1.746661e-03 1.775587e-03 1.810197e-03 1.850796e-03 1.897748e-03 1.951480e-03 2.012491e-03 2.081356e-03 2.158738e-03 2.245396e-03 2.342201e-03 2.450147e-03 2.570369e-03 2.704161e-03 2.853003e-03 3.018583e-03 3.202830e-03 3.407950e-03 3.636468e-03 3.891281e-03 +2.835263e+02 1.568596e-03 1.594595e-03 1.625699e-03 1.662183e-03 1.704374e-03 1.752655e-03 1.807475e-03 1.869350e-03 1.938876e-03 2.016737e-03 2.103713e-03 2.200698e-03 2.308711e-03 2.428916e-03 2.562643e-03 2.711408e-03 2.876944e-03 3.061234e-03 3.266547e-03 3.495485e-03 +2.877368e+02 1.418395e-03 1.441924e-03 1.470070e-03 1.503082e-03 1.541256e-03 1.584938e-03 1.634535e-03 1.690513e-03 1.753412e-03 1.823850e-03 1.902533e-03 1.990271e-03 2.087984e-03 2.196728e-03 2.317702e-03 2.452281e-03 2.602032e-03 2.768749e-03 2.954486e-03 3.161594e-03 +2.919474e+02 1.290227e-03 1.311648e-03 1.337270e-03 1.367319e-03 1.402064e-03 1.441821e-03 1.486960e-03 1.537905e-03 1.595148e-03 1.659251e-03 1.730858e-03 1.810703e-03 1.899627e-03 1.998587e-03 2.108679e-03 2.231151e-03 2.367431e-03 2.519150e-03 2.688179e-03 2.876658e-03 +2.961579e+02 1.179554e-03 1.199154e-03 1.222596e-03 1.250085e-03 1.281868e-03 1.318236e-03 1.359524e-03 1.406123e-03 1.458481e-03 1.517113e-03 1.582607e-03 1.655637e-03 1.736969e-03 1.827481e-03 1.928174e-03 2.040190e-03 2.164835e-03 2.303602e-03 2.458201e-03 2.630590e-03 +3.003684e+02 1.082809e-03 1.100817e-03 1.122351e-03 1.147602e-03 1.176797e-03 1.210200e-03 1.248122e-03 1.290921e-03 1.339008e-03 1.392856e-03 1.453006e-03 1.520076e-03 1.594771e-03 1.677896e-03 1.770372e-03 1.873246e-03 1.987718e-03 2.115161e-03 2.257143e-03 2.415465e-03 +3.045789e+02 9.971663e-04 1.013764e-03 1.033610e-03 1.056879e-03 1.083781e-03 1.114559e-03 1.149500e-03 1.188934e-03 1.233239e-03 1.282852e-03 1.338270e-03 1.400063e-03 1.468881e-03 1.545466e-03 1.630665e-03 1.725444e-03 1.830910e-03 1.948325e-03 2.079136e-03 2.225002e-03 +3.087895e+02 9.203749e-04 9.357073e-04 9.540384e-04 9.755301e-04 1.000375e-03 1.028799e-03 1.061067e-03 1.097482e-03 1.138395e-03 1.184209e-03 1.235383e-03 1.292443e-03 1.355990e-03 1.426709e-03 1.505382e-03 1.592901e-03 1.690288e-03 1.798710e-03 1.919502e-03 2.054196e-03 +3.130000e+02 8.506344e-04 8.648171e-04 8.817717e-04 9.016481e-04 9.246243e-04 9.509097e-04 9.807480e-04 1.014421e-03 1.052252e-03 1.094615e-03 1.141933e-03 1.194694e-03 1.253452e-03 1.318841e-03 1.391585e-03 1.472509e-03 1.562557e-03 1.662808e-03 1.774497e-03 1.899042e-03 diff --git a/dev/incompressible_liquids/CPIncomp/data/HY20_Mu.txt b/dev/incompressible_liquids/CPIncomp/data/HY20_Mu.txt index 35ee5f2d..59c44a18 100644 --- a/dev/incompressible_liquids/CPIncomp/data/HY20_Mu.txt +++ b/dev/incompressible_liquids/CPIncomp/data/HY20_Mu.txt @@ -1,21 +1,21 @@ -nan 0.00000e+00 -2.53150e+02 5.29619e+00 -2.56834e+02 4.66929e+00 -2.60518e+02 4.14623e+00 -2.64203e+02 3.70605e+00 -2.67887e+02 3.33270e+00 -2.71571e+02 3.01369e+00 -2.75255e+02 2.73928e+00 -2.78939e+02 2.50172e+00 -2.82624e+02 2.29487e+00 -2.86308e+02 2.11376e+00 -2.89992e+02 1.95439e+00 -2.93676e+02 1.79708e+00 -2.97361e+02 1.65673e+00 -3.01045e+02 1.53136e+00 -3.04729e+02 1.42100e+00 -3.08413e+02 1.32563e+00 -3.12097e+02 1.24525e+00 -3.15782e+02 1.17987e+00 -3.19466e+02 1.12949e+00 -3.23150e+02 1.09410e+00 +nan 0.000000e+00 +2.531500e+02 5.296194e-03 +2.568342e+02 4.669291e-03 +2.605184e+02 4.146227e-03 +2.642026e+02 3.706053e-03 +2.678868e+02 3.332697e-03 +2.715711e+02 3.013693e-03 +2.752553e+02 2.739275e-03 +2.789395e+02 2.501721e-03 +2.826237e+02 2.294869e-03 +2.863079e+02 2.113764e-03 +2.899921e+02 1.954387e-03 +2.936763e+02 1.797085e-03 +2.973605e+02 1.656726e-03 +3.010447e+02 1.531363e-03 +3.047289e+02 1.420996e-03 +3.084132e+02 1.325625e-03 +3.120974e+02 1.245250e-03 +3.157816e+02 1.179871e-03 +3.194658e+02 1.129487e-03 +3.231500e+02 1.094100e-03 diff --git a/dev/incompressible_liquids/CPIncomp/data/HY30_Mu.txt b/dev/incompressible_liquids/CPIncomp/data/HY30_Mu.txt index ae6b8eae..c9f43b83 100644 --- a/dev/incompressible_liquids/CPIncomp/data/HY30_Mu.txt +++ b/dev/incompressible_liquids/CPIncomp/data/HY30_Mu.txt @@ -1,21 +1,21 @@ -nan 0.00000e+00 -2.43150e+02 8.87850e+00 -2.47361e+02 7.34582e+00 -2.51571e+02 6.17396e+00 -2.55782e+02 5.26134e+00 -2.59992e+02 4.53887e+00 -2.64203e+02 3.95848e+00 -2.68413e+02 3.48607e+00 -2.72624e+02 3.09694e+00 -2.76834e+02 2.77295e+00 -2.81045e+02 2.50056e+00 -2.85255e+02 2.26948e+00 -2.89466e+02 2.07185e+00 -2.93676e+02 1.90268e+00 -2.97887e+02 1.77322e+00 -3.02097e+02 1.65422e+00 -3.06308e+02 1.54567e+00 -3.10518e+02 1.44759e+00 -3.14729e+02 1.35997e+00 -3.18939e+02 1.28280e+00 -3.23150e+02 1.21610e+00 +nan 0.000000e+00 +2.431500e+02 8.878496e-03 +2.473605e+02 7.345817e-03 +2.515711e+02 6.173964e-03 +2.557816e+02 5.261343e-03 +2.599921e+02 4.538868e-03 +2.642026e+02 3.958482e-03 +2.684132e+02 3.486065e-03 +2.726237e+02 3.096939e-03 +2.768342e+02 2.772953e-03 +2.810447e+02 2.500555e-03 +2.852553e+02 2.269479e-03 +2.894658e+02 2.071851e-03 +2.936763e+02 1.902682e-03 +2.978868e+02 1.773219e-03 +3.020974e+02 1.654216e-03 +3.063079e+02 1.545673e-03 +3.105184e+02 1.447590e-03 +3.147289e+02 1.359967e-03 +3.189395e+02 1.282804e-03 +3.231500e+02 1.216100e-03 diff --git a/dev/incompressible_liquids/CPIncomp/data/HY40_Mu.txt b/dev/incompressible_liquids/CPIncomp/data/HY40_Mu.txt index b464e9be..47c0cefd 100644 --- a/dev/incompressible_liquids/CPIncomp/data/HY40_Mu.txt +++ b/dev/incompressible_liquids/CPIncomp/data/HY40_Mu.txt @@ -1,21 +1,21 @@ -nan 0.00000e+00 -2.33150e+02 1.95356e+01 -2.36308e+02 1.62102e+01 -2.39466e+02 1.36160e+01 -2.42624e+02 1.15640e+01 -2.45782e+02 9.92020e+00 -2.48939e+02 8.58814e+00 -2.52097e+02 7.49722e+00 -2.55255e+02 6.59504e+00 -2.58413e+02 5.84224e+00 -2.61571e+02 5.20886e+00 -2.64729e+02 4.67186e+00 -2.67887e+02 4.21332e+00 -2.71045e+02 3.81919e+00 -2.74203e+02 3.47831e+00 -2.77361e+02 3.18180e+00 -2.80518e+02 2.92250e+00 -2.83676e+02 2.69458e+00 -2.86834e+02 2.49331e+00 -2.89992e+02 2.31477e+00 -2.93150e+02 2.15574e+00 +nan 0.000000e+00 +2.331500e+02 1.953560e-02 +2.363079e+02 1.621018e-02 +2.394658e+02 1.361598e-02 +2.426237e+02 1.156397e-02 +2.457816e+02 9.920195e-03 +2.489395e+02 8.588144e-03 +2.520974e+02 7.497220e-03 +2.552553e+02 6.595044e-03 +2.584132e+02 5.842244e-03 +2.615711e+02 5.208865e-03 +2.647289e+02 4.671863e-03 +2.678868e+02 4.213324e-03 +2.710447e+02 3.819186e-03 +2.742026e+02 3.478312e-03 +2.773605e+02 3.181804e-03 +2.805184e+02 2.922498e-03 +2.836763e+02 2.694581e-03 +2.868342e+02 2.493306e-03 +2.899921e+02 2.314769e-03 +2.931500e+02 2.155739e-03 diff --git a/dev/incompressible_liquids/CPIncomp/data/HY45_Mu.txt b/dev/incompressible_liquids/CPIncomp/data/HY45_Mu.txt index 34d3b386..44b049b9 100644 --- a/dev/incompressible_liquids/CPIncomp/data/HY45_Mu.txt +++ b/dev/incompressible_liquids/CPIncomp/data/HY45_Mu.txt @@ -1,21 +1,21 @@ -nan 0.00000e+00 -2.28150e+02 3.20002e+01 -2.31571e+02 2.52598e+01 -2.34992e+02 2.03076e+01 -2.38413e+02 1.65940e+01 -2.41834e+02 1.37576e+01 -2.45255e+02 1.15553e+01 -2.48676e+02 9.81971e+00 -2.52097e+02 8.43334e+00 -2.55518e+02 7.31229e+00 -2.58939e+02 6.39557e+00 -2.62361e+02 5.63824e+00 -2.65782e+02 5.00669e+00 -2.69203e+02 4.47545e+00 -2.72624e+02 4.02502e+00 -2.76045e+02 3.64027e+00 -2.79466e+02 3.30938e+00 -2.82887e+02 3.02300e+00 -2.86308e+02 2.77366e+00 -2.89729e+02 2.55539e+00 -2.93150e+02 2.36332e+00 +nan 0.000000e+00 +2.281500e+02 3.200024e-02 +2.315711e+02 2.525984e-02 +2.349921e+02 2.030763e-02 +2.384132e+02 1.659398e-02 +2.418342e+02 1.375762e-02 +2.452553e+02 1.155532e-02 +2.486763e+02 9.819712e-03 +2.520974e+02 8.433344e-03 +2.555184e+02 7.312285e-03 +2.589395e+02 6.395571e-03 +2.623605e+02 5.638245e-03 +2.657816e+02 5.006691e-03 +2.692026e+02 4.475453e-03 +2.726237e+02 4.025019e-03 +2.760447e+02 3.640273e-03 +2.794658e+02 3.309383e-03 +2.828868e+02 3.022998e-03 +2.863079e+02 2.773664e-03 +2.897289e+02 2.555388e-03 +2.931500e+02 2.363316e-03 diff --git a/dev/incompressible_liquids/CPIncomp/data/HY50_Mu.txt b/dev/incompressible_liquids/CPIncomp/data/HY50_Mu.txt index 73bc0d4d..3cd12a05 100644 --- a/dev/incompressible_liquids/CPIncomp/data/HY50_Mu.txt +++ b/dev/incompressible_liquids/CPIncomp/data/HY50_Mu.txt @@ -1,21 +1,21 @@ -nan 0.00000e+00 -2.23150e+02 7.65084e+01 -2.26834e+02 5.51492e+01 -2.30518e+02 4.08782e+01 -2.34203e+02 3.10512e+01 -2.37887e+02 2.41017e+01 -2.41571e+02 1.90693e+01 -2.45255e+02 1.53472e+01 -2.48939e+02 1.25416e+01 -2.52624e+02 1.03904e+01 -2.56308e+02 8.71514e+00 -2.59992e+02 7.39218e+00 -2.63676e+02 6.53398e+00 -2.67361e+02 5.67762e+00 -2.71045e+02 4.97715e+00 -2.74729e+02 4.39853e+00 -2.78413e+02 3.91623e+00 -2.82097e+02 3.51083e+00 -2.85782e+02 3.16743e+00 -2.89466e+02 2.87445e+00 -2.93150e+02 2.62281e+00 +nan 0.000000e+00 +2.231500e+02 7.650839e-02 +2.268342e+02 5.514920e-02 +2.305184e+02 4.087816e-02 +2.342026e+02 3.105121e-02 +2.378868e+02 2.410169e-02 +2.415711e+02 1.906929e-02 +2.452553e+02 1.534724e-02 +2.489395e+02 1.254164e-02 +2.526237e+02 1.039037e-02 +2.563079e+02 8.715142e-03 +2.599921e+02 7.392181e-03 +2.636763e+02 6.533981e-03 +2.673605e+02 5.677620e-03 +2.710447e+02 4.977148e-03 +2.747289e+02 4.398532e-03 +2.784132e+02 3.916227e-03 +2.820974e+02 3.510829e-03 +2.857816e+02 3.167428e-03 +2.894658e+02 2.874448e-03 +2.931500e+02 2.622814e-03 diff --git a/dev/incompressible_liquids/json/AEG.json b/dev/incompressible_liquids/json/AEG.json index d2d68d14..58f0c658 100644 --- a/dev/incompressible_liquids/json/AEG.json +++ b/dev/incompressible_liquids/json/AEG.json @@ -45,7 +45,7 @@ 0.000000e+00 ], [ - -1.560761e-10, + -1.560759e-10, -6.139943e-09, 3.179827e-08, 0.000000e+00, @@ -83,8 +83,8 @@ 0.000000e+00 ], [ - -3.725234e-09, - 1.044785e-06, + -3.725450e-09, + 1.044784e-06, -4.391164e-06, 0.000000e+00, 0.000000e+00, @@ -148,8 +148,8 @@ 0.000000e+00 ], [ - 3.171278e-07, - -2.457344e-06, + 3.171299e-07, + -2.457345e-06, 1.419543e-05, 0.000000e+00, 0.000000e+00, @@ -188,7 +188,7 @@ [ -1.315418e-06, -1.745316e-06, - 9.973463e-06, + 9.973464e-06, 0.000000e+00, 0.000000e+00, 0.000000e+00 diff --git a/dev/incompressible_liquids/json/AKF.json b/dev/incompressible_liquids/json/AKF.json index 2949e1e7..698eaa25 100644 --- a/dev/incompressible_liquids/json/AKF.json +++ b/dev/incompressible_liquids/json/AKF.json @@ -172,8 +172,8 @@ 0.000000e+00 ], [ - 5.920685e-06, - -3.288615e-05, + 5.920681e-06, + -3.288614e-05, 2.921777e-04, 0.000000e+00, 0.000000e+00, diff --git a/dev/incompressible_liquids/json/AL.json b/dev/incompressible_liquids/json/AL.json index 02ff1417..238d9657 100644 --- a/dev/incompressible_liquids/json/AL.json +++ b/dev/incompressible_liquids/json/AL.json @@ -172,7 +172,7 @@ 0.000000e+00 ], [ - 1.986852e-07, + 1.986856e-07, 1.828594e-04, 3.746526e-05, 0.000000e+00, @@ -186,7 +186,7 @@ "NRMS": 3.416274e-03, "coeffs": [ [ - -7.795892e+00, + -5.493307e+00, 4.285853e+00, -8.099077e-01, 1.397681e+00, diff --git a/dev/incompressible_liquids/json/AN.json b/dev/incompressible_liquids/json/AN.json index 9977ce49..797cb4a2 100644 --- a/dev/incompressible_liquids/json/AN.json +++ b/dev/incompressible_liquids/json/AN.json @@ -45,7 +45,7 @@ 0.000000e+00 ], [ - -8.728988e-09, + -8.728987e-09, 7.368888e-08, -1.235739e-07, 0.000000e+00, @@ -186,7 +186,7 @@ "NRMS": 4.973080e-03, "coeffs": [ [ - -8.174832e+00, + -5.872247e+00, 2.740506e+00, 1.484015e+00, 6.395219e+00, diff --git a/dev/incompressible_liquids/json/APG.json b/dev/incompressible_liquids/json/APG.json index 72af75f3..cad33350 100644 --- a/dev/incompressible_liquids/json/APG.json +++ b/dev/incompressible_liquids/json/APG.json @@ -45,8 +45,8 @@ 0.000000e+00 ], [ - 5.879755e-10, - -6.777231e-10, + 5.879754e-10, + -6.777235e-10, -2.213073e-08, 0.000000e+00, 0.000000e+00, @@ -83,9 +83,9 @@ 0.000000e+00 ], [ - -5.177327e-09, - 9.673187e-09, - 3.368863e-07, + -5.177362e-09, + 9.673215e-09, + 3.368862e-07, 0.000000e+00, 0.000000e+00, 0.000000e+00 @@ -141,15 +141,15 @@ ], [ 4.165345e-05, - -9.032072e-05, + -9.032070e-05, -3.392169e-03, 1.079472e-02, 0.000000e+00, 0.000000e+00 ], [ - -4.309484e-07, - -1.335181e-06, + -4.309483e-07, + -1.335180e-06, 3.538903e-05, 0.000000e+00, 0.000000e+00, @@ -162,7 +162,7 @@ "NRMS": 2.045019e-03, "coeffs": [ [ - -8.328410e+00, + -6.025825e+00, 3.573663e+00, -1.995205e+00, -6.425110e+00, diff --git a/dev/incompressible_liquids/json/AS10.json b/dev/incompressible_liquids/json/AS10.json index 7ae34298..00b1054a 100644 --- a/dev/incompressible_liquids/json/AS10.json +++ b/dev/incompressible_liquids/json/AS10.json @@ -75,16 +75,16 @@ "NRMS": null, "coeffs": [ [ - 2.801549e+00 + 2.801549e-03 ], [ - -1.063138e-01 + -1.063138e-04 ], [ - 2.353810e-03 + 2.353810e-06 ], [ - -2.114810e-05 + -2.114810e-08 ] ], "type": "polynomial" diff --git a/dev/incompressible_liquids/json/AS20.json b/dev/incompressible_liquids/json/AS20.json index 55bb72e9..7ea1219c 100644 --- a/dev/incompressible_liquids/json/AS20.json +++ b/dev/incompressible_liquids/json/AS20.json @@ -72,19 +72,19 @@ "type": "polynomial" }, "viscosity": { - "NRMS": 5.265767e-04, + "NRMS": 5.266559e-04, "coeffs": [ [ - 1.227065e+00 + -5.680688e+00 ], [ - -3.826625e-02 + -3.826646e-02 ], [ - 2.872441e-04 + 2.872253e-04 ], [ - 1.535575e-06 + 1.536434e-06 ] ], "type": "exppolynomial" diff --git a/dev/incompressible_liquids/json/AS30.json b/dev/incompressible_liquids/json/AS30.json index a91fe9c1..0710a44d 100644 --- a/dev/incompressible_liquids/json/AS30.json +++ b/dev/incompressible_liquids/json/AS30.json @@ -72,19 +72,19 @@ "type": "polynomial" }, "viscosity": { - "NRMS": 1.100435e-03, + "NRMS": 1.100917e-03, "coeffs": [ [ - 1.378598e+00 + -5.529156e+00 ], [ - -4.005807e-02 + -4.005842e-02 ], [ - 3.656886e-04 + 3.656841e-04 ], [ - 2.014828e-06 + 2.015537e-06 ] ], "type": "exppolynomial" diff --git a/dev/incompressible_liquids/json/AS40.json b/dev/incompressible_liquids/json/AS40.json index 80a0463b..d2eebf0d 100644 --- a/dev/incompressible_liquids/json/AS40.json +++ b/dev/incompressible_liquids/json/AS40.json @@ -72,19 +72,19 @@ "type": "polynomial" }, "viscosity": { - "NRMS": 1.052821e-03, + "NRMS": 1.052442e-03, "coeffs": [ [ - 1.628884e+00 + -5.278872e+00 ], [ - -3.682754e-02 + -3.682769e-02 ], [ - 3.490856e-04 + 3.490872e-04 ], [ - -4.527325e-06 + -4.527292e-06 ] ], "type": "exppolynomial" diff --git a/dev/incompressible_liquids/json/AS55.json b/dev/incompressible_liquids/json/AS55.json index 47bd2056..52f144c3 100644 --- a/dev/incompressible_liquids/json/AS55.json +++ b/dev/incompressible_liquids/json/AS55.json @@ -75,19 +75,19 @@ "type": "polynomial" }, "viscosity": { - "NRMS": 2.815943e-03, + "NRMS": 2.815713e-03, "coeffs": [ [ - 1.855893e+00 + -5.051867e+00 ], [ - -3.861965e-02 + -3.862000e-02 ], [ - 2.111957e-04 + 2.112087e-04 ], [ - -7.800534e-06 + -7.800164e-06 ] ], "type": "exppolynomial" diff --git a/dev/incompressible_liquids/json/DowJ2.json b/dev/incompressible_liquids/json/DowJ2.json index bf08a8ba..d6fbe1a5 100644 --- a/dev/incompressible_liquids/json/DowJ2.json +++ b/dev/incompressible_liquids/json/DowJ2.json @@ -85,7 +85,7 @@ "coeffs": [ 6.576327e+02, -7.405196e+01, - 7.705768e+00 + 1.000835e+01 ], "type": "exponential" }, diff --git a/dev/incompressible_liquids/json/FRE.json b/dev/incompressible_liquids/json/FRE.json index 6f831f99..e4ca19c5 100644 --- a/dev/incompressible_liquids/json/FRE.json +++ b/dev/incompressible_liquids/json/FRE.json @@ -77,10 +77,10 @@ -4.617142e+01 ], [ - 1.330612e-04, + 1.330610e-04, 6.297478e+00, 1.571376e-02, - -3.782188e-02, + -3.782187e-02, 3.044803e-02, 0.000000e+00 ], @@ -93,8 +93,8 @@ 0.000000e+00 ], [ - -6.379692e-08, - 3.363855e-07, + -6.379526e-08, + 3.363858e-07, -3.132405e-07, 0.000000e+00, 0.000000e+00, @@ -104,36 +104,36 @@ "type": "polynomial" }, "viscosity": { - "NRMS": 2.601290e-06, + "NRMS": 2.857358e-07, "coeffs": [ [ - 7.516580e-01, - -1.155779e+00, - 5.495585e+00, - -1.397685e-01, - -1.452278e-02, - 2.716283e-02 + -6.155988e+00, + -1.157552e+00, + 5.506667e+00, + -1.734136e-01, + 3.517942e-02, + -1.484328e-03 ], [ - -2.940696e-02, - 1.792392e-04, - 7.888892e-05, - -1.183171e-04, - 4.339905e-05, + -2.940677e-02, + 1.802979e-04, + 7.301947e-05, + -1.058426e-04, + 3.461983e-05, 0.000000e+00 ], [ - 2.578208e-04, - 6.736921e-09, - 1.829754e-07, - -1.775316e-07, + 2.578126e-04, + 6.494245e-08, + 2.356801e-08, + -4.428143e-08, 0.000000e+00, 0.000000e+00 ], [ - -2.058397e-06, - -3.348865e-10, - 5.467783e-10, + -2.058502e-06, + -3.918904e-11, + 6.411042e-11, 0.000000e+00, 0.000000e+00, 0.000000e+00 diff --git a/dev/incompressible_liquids/json/GKN.json b/dev/incompressible_liquids/json/GKN.json index 76d49fef..a7c08fa9 100644 --- a/dev/incompressible_liquids/json/GKN.json +++ b/dev/incompressible_liquids/json/GKN.json @@ -24,7 +24,7 @@ 4.602765e-01, -3.818989e-01, 3.091732e-01, - -7.338636e-03, + -7.338635e-03, 2.487536e-02, 5.953247e-02 ], @@ -32,13 +32,13 @@ 1.113132e-04, -2.530961e-03, 1.246007e-05, - -4.776916e-05, + -4.776917e-05, 9.814404e-05, 0.000000e+00 ], [ - 4.059628e-07, - 4.037557e-08, + 4.059629e-07, + 4.037556e-08, -4.269076e-07, 2.088691e-06, 0.000000e+00, @@ -70,7 +70,7 @@ -5.159333e-01, -4.677766e-01, -1.471417e-03, - -8.728920e-02, + -8.728919e-02, 1.464939e-01, 0.000000e+00 ], @@ -83,7 +83,7 @@ 0.000000e+00 ], [ - -1.101107e-07, + -1.101106e-07, -3.794966e-07, 4.111114e-06, 0.000000e+00, @@ -135,21 +135,21 @@ 2.197127e+00, 6.002962e+00, 4.102206e-01, - -2.545012e-02, + -2.545014e-02, -4.014954e+00, 0.000000e+00 ], [ 1.085383e-03, - -2.433412e-04, + -2.433413e-04, -1.102241e-03, 7.272856e-03, 0.000000e+00, 0.000000e+00 ], [ - -4.605346e-08, - 6.201753e-07, + -4.605391e-08, + 6.201757e-07, -2.374986e-05, 0.000000e+00, 0.000000e+00, @@ -162,7 +162,7 @@ "NRMS": 4.263132e-04, "coeffs": [ [ - -8.317626e+00, + -6.015040e+00, 2.779043e+00, -7.371079e-01, 9.685055e-01, diff --git a/dev/incompressible_liquids/json/HFE2.json b/dev/incompressible_liquids/json/HFE2.json index 32308cc5..56c6fb7a 100644 --- a/dev/incompressible_liquids/json/HFE2.json +++ b/dev/incompressible_liquids/json/HFE2.json @@ -18,16 +18,16 @@ -1.954800e-04 ], [ - -2.465229e-14 + -2.465231e-14 ], [ - 6.920572e-16 + 6.920734e-16 ] ], "type": "polynomial" }, "density": { - "NRMS": 4.824347e-14, + "NRMS": 1.861395e-13, "coeffs": [ [ 1.556520e+03 @@ -36,10 +36,10 @@ -2.269000e+00 ], [ - 6.290541e-16 + 6.106227e-16 ], [ - -1.691355e-16 + 0.000000e+00 ] ], "type": "polynomial" @@ -63,7 +63,7 @@ "type": "notdefined" }, "specific_heat": { - "NRMS": 5.186502e-14, + "NRMS": 9.208281e-14, "coeffs": [ [ 1.116940e+03 @@ -72,10 +72,10 @@ 2.000000e+00 ], [ - -6.045240e-16 + -8.326673e-17 ], [ - 6.722053e-18 + -2.220446e-16 ] ], "type": "polynomial" @@ -85,7 +85,7 @@ "coeffs": [ 4.475374e+02, -9.321610e+01, - 7.778853e+00 + 1.008144e+01 ], "type": "exponential" }, diff --git a/dev/incompressible_liquids/json/HY20.json b/dev/incompressible_liquids/json/HY20.json index a8028658..536abfcf 100644 --- a/dev/incompressible_liquids/json/HY20.json +++ b/dev/incompressible_liquids/json/HY20.json @@ -73,11 +73,11 @@ "type": "polynomial" }, "viscosity": { - "NRMS": 6.774619e-03, + "NRMS": 6.774862e-03, "coeffs": [ - 6.428043e+02, - -1.172885e+02, - 3.063572e+00 + 6.428081e+02, + -1.172883e+02, + 9.971345e+00 ], "type": "exponential" }, diff --git a/dev/incompressible_liquids/json/HY30.json b/dev/incompressible_liquids/json/HY30.json index 4ab8cee5..86e62ddf 100644 --- a/dev/incompressible_liquids/json/HY30.json +++ b/dev/incompressible_liquids/json/HY30.json @@ -73,11 +73,11 @@ "type": "polynomial" }, "viscosity": { - "NRMS": 2.084667e-03, + "NRMS": 2.084241e-03, "coeffs": [ - 3.498823e+02, - -1.582110e+02, - 1.929596e+00 + 3.498788e+02, + -1.582113e+02, + 8.837329e+00 ], "type": "exponential" }, diff --git a/dev/incompressible_liquids/json/HY40.json b/dev/incompressible_liquids/json/HY40.json index b487a7d3..400ac4fa 100644 --- a/dev/incompressible_liquids/json/HY40.json +++ b/dev/incompressible_liquids/json/HY40.json @@ -67,11 +67,11 @@ "type": "polynomial" }, "viscosity": { - "NRMS": 4.733901e-06, + "NRMS": 4.266671e-07, "coeffs": [ - 4.981135e+02, - -1.429021e+02, - 2.547143e+00 + 4.981285e+02, + -1.429002e+02, + 9.454958e+00 ], "type": "exponential" }, diff --git a/dev/incompressible_liquids/json/HY45.json b/dev/incompressible_liquids/json/HY45.json index e8f19ec5..2850d969 100644 --- a/dev/incompressible_liquids/json/HY45.json +++ b/dev/incompressible_liquids/json/HY45.json @@ -67,11 +67,11 @@ "type": "polynomial" }, "viscosity": { - "NRMS": 3.357080e-06, + "NRMS": 4.136463e-07, "coeffs": [ - 4.790609e+02, - -1.466029e+02, - 2.408912e+00 + 4.790904e+02, + -1.466000e+02, + 9.316816e+00 ], "type": "exponential" }, diff --git a/dev/incompressible_liquids/json/HY50.json b/dev/incompressible_liquids/json/HY50.json index 2dcd2d12..06d4344b 100644 --- a/dev/incompressible_liquids/json/HY50.json +++ b/dev/incompressible_liquids/json/HY50.json @@ -67,11 +67,11 @@ "type": "polynomial" }, "viscosity": { - "NRMS": 1.931401e-03, + "NRMS": 1.931212e-03, "coeffs": [ - 4.845547e+02, + 4.845557e+02, -1.520740e+02, - 2.471436e+00 + 9.379202e+00 ], "type": "exponential" }, diff --git a/dev/incompressible_liquids/json/IcePG.json b/dev/incompressible_liquids/json/IcePG.json index 1c57240e..50e97d1c 100644 --- a/dev/incompressible_liquids/json/IcePG.json +++ b/dev/incompressible_liquids/json/IcePG.json @@ -54,7 +54,7 @@ -1.563366e+02, 2.333333e+01, -2.500000e+01, - -6.199311e-09, + 1.485593e-09, 1.000000e+03 ], [ @@ -68,7 +68,7 @@ [ -2.218367e-02, 3.259637e-02, - 3.302718e-14, + 2.210454e-13, -3.174603e-02, 0.000000e+00, 0.000000e+00 @@ -144,7 +144,7 @@ "NRMS": 2.131279e-04, "coeffs": [ [ - -6.356003e+00, + -1.750833e+00, 1.784234e+00, -1.858887e+00, 2.766323e+00, diff --git a/dev/incompressible_liquids/json/MCA2.json b/dev/incompressible_liquids/json/MCA2.json index b47121bd..fff83968 100644 --- a/dev/incompressible_liquids/json/MCA2.json +++ b/dev/incompressible_liquids/json/MCA2.json @@ -1,6 +1,6 @@ { "T_freeze": { - "NRMS": 2.019931e-14, + "NRMS": 1.028499e-14, "coeffs": [ [ 5.545838e+00, @@ -18,7 +18,7 @@ "Tmin": 2.291500e+02, "TminPsat": 3.031500e+02, "conductivity": { - "NRMS": 2.071081e-09, + "NRMS": 4.468622e-09, "coeffs": [ [ 5.353256e-01, @@ -45,8 +45,8 @@ 0.000000e+00 ], [ - -4.236196e-08, - 2.597821e-07, + -4.236194e-08, + 2.597820e-07, 2.433000e-06, 0.000000e+00, 0.000000e+00, @@ -56,7 +56,7 @@ "type": "polynomial" }, "density": { - "NRMS": 1.242898e-09, + "NRMS": 3.680119e-09, "coeffs": [ [ 1.179788e+03, @@ -83,7 +83,7 @@ 0.000000e+00 ], [ - 4.696243e-05, + 4.696239e-05, -1.343294e-04, -1.062002e-03, 0.000000e+00, @@ -112,7 +112,7 @@ "type": "notdefined" }, "specific_heat": { - "NRMS": 2.653894e-10, + "NRMS": 1.500993e-09, "coeffs": [ [ 3.070664e+03, @@ -125,7 +125,7 @@ [ 3.159332e+00, 4.623496e+00, - -9.360627e+01, + -9.360628e+01, -2.701123e+02, -3.355000e+02, 0.000000e+00 @@ -139,9 +139,9 @@ 0.000000e+00 ], [ - 1.373482e-05, - -1.859622e-04, - 8.144999e-03, + 1.373491e-05, + -1.859623e-04, + 8.145000e-03, 0.000000e+00, 0.000000e+00, 0.000000e+00 @@ -150,7 +150,7 @@ "type": "polynomial" }, "viscosity": { - "NRMS": 4.042085e-11, + "NRMS": 2.734493e-10, "coeffs": [ [ -5.575889e+00, diff --git a/dev/incompressible_liquids/json/MEA2.json b/dev/incompressible_liquids/json/MEA2.json index b121b842..4e812b1e 100644 --- a/dev/incompressible_liquids/json/MEA2.json +++ b/dev/incompressible_liquids/json/MEA2.json @@ -18,7 +18,7 @@ "Tmin": 2.291500e+02, "TminPsat": 2.931500e+02, "conductivity": { - "NRMS": 1.080589e-09, + "NRMS": 1.082242e-09, "coeffs": [ [ 3.659957e-01, @@ -37,7 +37,7 @@ 0.000000e+00 ], [ - -4.279157e-09, + -4.279159e-09, -1.966452e-06, 1.310795e-05, -1.438998e-05, @@ -56,7 +56,7 @@ "type": "polynomial" }, "density": { - "NRMS": 3.065813e-10, + "NRMS": 3.337326e-10, "coeffs": [ [ 9.639157e+02, @@ -112,7 +112,7 @@ "type": "notdefined" }, "specific_heat": { - "NRMS": 2.159181e-10, + "NRMS": 2.161227e-10, "coeffs": [ [ 3.996428e+03, @@ -126,7 +126,7 @@ 3.218122e+00, 2.065606e+01, -4.368677e+01, - 9.481276e-01, + 9.481275e-01, 2.545000e+02, 0.000000e+00 ], @@ -139,7 +139,7 @@ 0.000000e+00 ], [ - 3.312447e-06, + 3.312448e-06, 2.777430e-04, 3.365996e-04, 0.000000e+00, @@ -150,7 +150,7 @@ "type": "polynomial" }, "viscosity": { - "NRMS": 3.001164e-11, + "NRMS": 3.100933e-11, "coeffs": [ [ -4.268143e+00, diff --git a/dev/incompressible_liquids/json/MEG2.json b/dev/incompressible_liquids/json/MEG2.json index fc563514..296c63bc 100644 --- a/dev/incompressible_liquids/json/MEG2.json +++ b/dev/incompressible_liquids/json/MEG2.json @@ -18,7 +18,7 @@ "Tmin": 2.291500e+02, "TminPsat": 3.131500e+02, "conductivity": { - "NRMS": 9.615530e-10, + "NRMS": 9.618110e-10, "coeffs": [ [ 4.519714e-01, @@ -45,7 +45,7 @@ 0.000000e+00 ], [ - -4.208826e-08, + -4.208825e-08, 3.393274e-07, -6.772000e-07, 0.000000e+00, @@ -56,7 +56,7 @@ "type": "polynomial" }, "density": { - "NRMS": 2.659161e-09, + "NRMS": 2.659212e-09, "coeffs": [ [ 1.042886e+03, @@ -112,7 +112,7 @@ "type": "notdefined" }, "specific_heat": { - "NRMS": 2.002195e-10, + "NRMS": 2.030929e-10, "coeffs": [ [ 3.716958e+03, @@ -150,7 +150,7 @@ "type": "polynomial" }, "viscosity": { - "NRMS": 2.642673e-11, + "NRMS": 2.791140e-11, "coeffs": [ [ -5.423845e+00, diff --git a/dev/incompressible_liquids/json/MGL2.json b/dev/incompressible_liquids/json/MGL2.json index 0e90cdee..a9b2dd86 100644 --- a/dev/incompressible_liquids/json/MGL2.json +++ b/dev/incompressible_liquids/json/MGL2.json @@ -18,7 +18,7 @@ "Tmin": 2.331500e+02, "TminPsat": 3.131500e+02, "conductivity": { - "NRMS": 1.428991e-09, + "NRMS": 1.429131e-09, "coeffs": [ [ 4.291509e-01, @@ -56,7 +56,7 @@ "type": "polynomial" }, "density": { - "NRMS": 1.908733e-09, + "NRMS": 1.943210e-09, "coeffs": [ [ 1.110879e+03, @@ -112,7 +112,7 @@ "type": "notdefined" }, "specific_heat": { - "NRMS": 2.097983e-10, + "NRMS": 2.142662e-10, "coeffs": [ [ 3.322537e+03, @@ -150,10 +150,10 @@ "type": "polynomial" }, "viscosity": { - "NRMS": 1.839518e-11, + "NRMS": 5.259742e-11, "coeffs": [ [ - -7.076829e+00, + -4.774244e+00, 5.610696e+00, 3.236870e+00, -2.216118e+01, diff --git a/dev/incompressible_liquids/json/MKA2.json b/dev/incompressible_liquids/json/MKA2.json index a70703fc..d7641037 100644 --- a/dev/incompressible_liquids/json/MKA2.json +++ b/dev/incompressible_liquids/json/MKA2.json @@ -18,7 +18,7 @@ "Tmin": 2.291500e+02, "TminPsat": 3.031500e+02, "conductivity": { - "NRMS": 1.482102e-09, + "NRMS": 2.123129e-09, "coeffs": [ [ 4.762927e-01, @@ -45,8 +45,8 @@ 0.000000e+00 ], [ - 2.434799e-08, - 9.719588e-10, + 2.434798e-08, + 9.719496e-10, -1.349000e-06, 0.000000e+00, 0.000000e+00, @@ -56,7 +56,7 @@ "type": "polynomial" }, "density": { - "NRMS": 1.425339e-09, + "NRMS": 1.439972e-09, "coeffs": [ [ 1.144474e+03, @@ -112,7 +112,7 @@ "type": "notdefined" }, "specific_heat": { - "NRMS": 2.760908e-10, + "NRMS": 5.618459e-10, "coeffs": [ [ 3.287139e+03, @@ -139,7 +139,7 @@ 0.000000e+00 ], [ - -9.488221e-05, + -9.488218e-05, 6.634494e-04, 3.560000e-03, 0.000000e+00, @@ -150,7 +150,7 @@ "type": "polynomial" }, "viscosity": { - "NRMS": 2.754114e-11, + "NRMS": 6.630101e-10, "coeffs": [ [ -5.364930e+00, @@ -178,7 +178,7 @@ ], [ -2.704802e-06, - -8.100379e-07, + -8.100380e-07, -1.459000e-05, 0.000000e+00, 0.000000e+00, diff --git a/dev/incompressible_liquids/json/MKC2.json b/dev/incompressible_liquids/json/MKC2.json index dcc33924..b704dc0f 100644 --- a/dev/incompressible_liquids/json/MKC2.json +++ b/dev/incompressible_liquids/json/MKC2.json @@ -18,7 +18,7 @@ "Tmin": 2.381500e+02, "TminPsat": 3.031500e+02, "conductivity": { - "NRMS": 2.006273e-09, + "NRMS": 2.011966e-09, "coeffs": [ [ 5.427225e-01, @@ -45,7 +45,7 @@ 0.000000e+00 ], [ - 6.628310e-09, + 6.628308e-09, 1.216939e-07, -1.297999e-06, 0.000000e+00, @@ -56,7 +56,7 @@ "type": "polynomial" }, "density": { - "NRMS": 6.419677e-10, + "NRMS": 6.551890e-10, "coeffs": [ [ 1.192423e+03, @@ -112,7 +112,7 @@ "type": "notdefined" }, "specific_heat": { - "NRMS": 1.823865e-10, + "NRMS": 4.915425e-10, "coeffs": [ [ 3.298666e+03, @@ -150,7 +150,7 @@ "type": "polynomial" }, "viscosity": { - "NRMS": 3.739874e-11, + "NRMS": 3.930848e-11, "coeffs": [ [ -5.818014e+00, diff --git a/dev/incompressible_liquids/json/MMA2.json b/dev/incompressible_liquids/json/MMA2.json index 8f7870e8..b50c36d5 100644 --- a/dev/incompressible_liquids/json/MMA2.json +++ b/dev/incompressible_liquids/json/MMA2.json @@ -18,7 +18,7 @@ "Tmin": 2.231500e+02, "TminPsat": 2.931500e+02, "conductivity": { - "NRMS": 1.306074e-09, + "NRMS": 1.309115e-09, "coeffs": [ [ 4.159515e-01, @@ -56,7 +56,7 @@ "type": "polynomial" }, "density": { - "NRMS": 4.325853e-10, + "NRMS": 4.481482e-10, "coeffs": [ [ 9.683060e+02, @@ -112,7 +112,7 @@ "type": "notdefined" }, "specific_heat": { - "NRMS": 2.555755e-10, + "NRMS": 3.691955e-10, "coeffs": [ [ 3.898713e+03, @@ -139,7 +139,7 @@ 0.000000e+00 ], [ - -8.044332e-05, + -8.044334e-05, 3.849360e-03, -1.894000e-02, 0.000000e+00, @@ -150,7 +150,7 @@ "type": "polynomial" }, "viscosity": { - "NRMS": 3.405004e-11, + "NRMS": 7.100229e-11, "coeffs": [ [ -4.979901e+00, diff --git a/dev/incompressible_liquids/json/MMG2.json b/dev/incompressible_liquids/json/MMG2.json index f298c874..56cdcf1e 100644 --- a/dev/incompressible_liquids/json/MMG2.json +++ b/dev/incompressible_liquids/json/MMG2.json @@ -1,6 +1,6 @@ { "T_freeze": { - "NRMS": 1.706740e-14, + "NRMS": 5.214177e-14, "coeffs": [ [ 5.577747e+00, @@ -18,7 +18,7 @@ "Tmin": 2.431500e+02, "TminPsat": 3.031500e+02, "conductivity": { - "NRMS": 1.812130e-09, + "NRMS": 2.370547e-09, "coeffs": [ [ 5.393056e-01, @@ -45,9 +45,9 @@ 0.000000e+00 ], [ - -2.632779e-14, - 1.717196e-13, - 1.341856e-12, + -4.973799e-14, + 1.376677e-13, + 1.250555e-12, 0.000000e+00, 0.000000e+00, 0.000000e+00 @@ -56,7 +56,7 @@ "type": "polynomial" }, "density": { - "NRMS": 1.292127e-09, + "NRMS": 1.892635e-09, "coeffs": [ [ 1.089261e+03, @@ -77,15 +77,15 @@ [ -3.805784e-03, 1.415281e-02, - 3.352158e-02, + 3.352159e-02, 6.480992e-01, 0.000000e+00, 0.000000e+00 ], [ - -5.844158e-12, - -1.935740e-10, - 7.957423e-10, + 2.182787e-11, + -2.401066e-10, + 6.184564e-10, 0.000000e+00, 0.000000e+00, 0.000000e+00 @@ -112,7 +112,7 @@ "type": "notdefined" }, "specific_heat": { - "NRMS": 2.244886e-10, + "NRMS": 1.645174e-09, "coeffs": [ [ 3.554767e+03, @@ -131,7 +131,7 @@ 0.000000e+00 ], [ - -4.261260e-04, + -4.261257e-04, -1.398411e-01, 2.490148e+00, -9.527999e+00, @@ -139,9 +139,9 @@ 0.000000e+00 ], [ - -4.671374e-12, - -2.896912e-10, - 2.606819e-09, + -1.164153e-10, + -2.415618e-09, + 2.561137e-09, 0.000000e+00, 0.000000e+00, 0.000000e+00 @@ -150,14 +150,14 @@ "type": "polynomial" }, "viscosity": { - "NRMS": 4.660288e-11, + "NRMS": 1.457806e-09, "coeffs": [ [ -5.855497e+00, 5.414954e+00, 1.697481e+01, -1.465946e+02, - -7.674163e+02, + -7.674162e+02, 1.484000e+04 ], [ @@ -177,9 +177,9 @@ 0.000000e+00 ], [ - 7.444132e-15, - -1.708158e-13, - 1.264247e-12, + 4.547474e-13, + -7.531753e-13, + 1.136868e-12, 0.000000e+00, 0.000000e+00, 0.000000e+00 diff --git a/dev/incompressible_liquids/json/MNA2.json b/dev/incompressible_liquids/json/MNA2.json index 5f9ca613..0b138e76 100644 --- a/dev/incompressible_liquids/json/MNA2.json +++ b/dev/incompressible_liquids/json/MNA2.json @@ -1,6 +1,6 @@ { "T_freeze": { - "NRMS": 2.112111e-14, + "NRMS": 4.811942e-14, "coeffs": [ [ 5.581298e+00, @@ -25,29 +25,29 @@ -7.677242e-02, -8.095244e-02, -3.147002e-01, - -1.557999e-06, - 2.876844e-06 + -1.558078e-06, + 2.876792e-06 ], [ 1.714960e-03, -1.788022e-03, -4.240990e-04, - -2.354541e-08, - -3.509970e-08, + -2.354626e-08, + -3.509474e-08, 0.000000e+00 ], [ -2.938005e-06, 3.243999e-05, - -1.191081e-10, - 1.043732e-09, + -1.191106e-10, + 1.043736e-09, 0.000000e+00, 0.000000e+00 ], [ - -2.817392e-14, - -3.557530e-13, - 3.544946e-12, + -2.817191e-14, + -3.558959e-13, + 3.544899e-12, 0.000000e+00, 0.000000e+00, 0.000000e+00 @@ -56,36 +56,36 @@ "type": "polynomial" }, "density": { - "NRMS": 1.319703e-09, + "NRMS": 1.322132e-09, "coeffs": [ [ 1.089533e+03, 6.993472e+02, 1.185142e+02, 6.133000e+03, - -9.316152e-04, - 2.244130e-02 + -9.309093e-04, + 2.243760e-02 ], [ -3.356935e-01, -1.701107e+00, 3.117996e+00, - -7.837943e-06, - 1.962872e-04, + -7.828926e-06, + 1.962383e-04, 0.000000e+00 ], [ -1.505988e-03, 5.737000e-03, - 1.836020e-08, - 1.512547e-07, + 1.838868e-08, + 1.511899e-07, 0.000000e+00, 0.000000e+00 ], [ - 1.373346e-12, - 4.007601e-11, - 2.078980e-09, + -1.364242e-12, + 4.251888e-11, + 2.078821e-09, 0.000000e+00, 0.000000e+00, 0.000000e+00 @@ -112,36 +112,36 @@ "type": "notdefined" }, "specific_heat": { - "NRMS": 3.020817e-10, + "NRMS": 3.034362e-10, "coeffs": [ [ 3.640729e+03, -3.565598e+03, 9.114668e+03, -1.959000e+04, - 2.165030e-03, - 2.841737e-02 + 2.161906e-03, + 2.842792e-02 ], [ 1.818816e+00, 1.021230e+01, -1.458000e+02, - 3.286073e-05, - -1.829014e-04, + 3.282458e-05, + -1.827002e-04, 0.000000e+00 ], [ - 9.722705e-04, + 9.722706e-04, -1.467000e-01, - 1.426313e-07, - -1.285326e-06, + 1.424594e-07, + -1.285200e-06, 0.000000e+00, 0.000000e+00 ], [ - 2.543454e-11, - 3.039625e-10, - -5.253935e-09, + 2.000888e-11, + 2.983143e-10, + -5.255004e-09, 0.000000e+00, 0.000000e+00, 0.000000e+00 @@ -150,36 +150,36 @@ "type": "polynomial" }, "viscosity": { - "NRMS": 7.785915e-11, + "NRMS": 7.793335e-11, "coeffs": [ [ - -4.008082e+00, + -6.310667e+00, 2.197643e+00, 5.396360e+00, -2.524000e+00, - -1.278532e-06, - 1.504045e-05 + -1.276662e-06, + 1.503746e-05 ], [ -2.943797e-02, -3.055149e-03, -9.974000e-02, - -1.294226e-08, - 1.945986e-07, + -1.292142e-08, + 1.944643e-07, 0.000000e+00 ], [ 2.359266e-04, 4.419000e-04, - -4.044264e-11, - 7.119881e-10, + -4.039259e-11, + 7.119501e-10, 0.000000e+00, 0.000000e+00 ], [ - -1.967870e-14, - -3.448467e-14, - 2.031668e-12, + -2.042810e-14, + -3.586020e-14, + 2.031833e-12, 0.000000e+00, 0.000000e+00, 0.000000e+00 diff --git a/dev/incompressible_liquids/json/NBS.json b/dev/incompressible_liquids/json/NBS.json index 5357c638..4b06bc7a 100644 --- a/dev/incompressible_liquids/json/NBS.json +++ b/dev/incompressible_liquids/json/NBS.json @@ -85,7 +85,7 @@ "coeffs": [ 5.184886e+02, -1.478012e+02, - 5.864163e+00 + 1.046933e+01 ], "type": "exponential" }, diff --git a/dev/incompressible_liquids/json/PCL.json b/dev/incompressible_liquids/json/PCL.json index 2b3d1846..660f386a 100644 --- a/dev/incompressible_liquids/json/PCL.json +++ b/dev/incompressible_liquids/json/PCL.json @@ -27,7 +27,7 @@ "type": "polynomial" }, "density": { - "NRMS": 1.174742e-13, + "NRMS": 1.022247e-14, "coeffs": [ [ 7.423000e+02 @@ -85,7 +85,7 @@ "coeffs": [ 7.976255e+02, -9.239176e+01, - 8.016969e+00 + 5.714384e+00 ], "type": "exponential" }, diff --git a/dev/incompressible_liquids/json/PK2.json b/dev/incompressible_liquids/json/PK2.json index a47af3f1..5ae0c0ea 100644 --- a/dev/incompressible_liquids/json/PK2.json +++ b/dev/incompressible_liquids/json/PK2.json @@ -26,13 +26,13 @@ 4.162480e-02, -1.568699e-04, -3.099237e-03, - 8.612376e-04 + 8.612377e-04 ], [ 9.185409e-04, -4.119322e-04, 1.089860e-04, - -8.422360e-05, + -8.422359e-05, 1.729361e-04, 0.000000e+00 ], @@ -83,8 +83,8 @@ 0.000000e+00 ], [ - 4.243841e-08, - -5.212523e-07, + 4.243840e-08, + -5.212522e-07, 8.927990e-07, 0.000000e+00, 0.000000e+00, @@ -141,7 +141,7 @@ ], [ -1.459187e-02, - 5.952692e-04, + 5.952691e-04, 5.588400e-02, -1.099247e-01, 0.000000e+00, @@ -162,7 +162,7 @@ "NRMS": 4.831142e-04, "coeffs": [ [ - -8.372931e+00, + -6.070346e+00, 1.510648e+00, 9.696885e-02, -7.075620e-01, diff --git a/dev/incompressible_liquids/json/PKL.json b/dev/incompressible_liquids/json/PKL.json index 4038bf72..8ad8c80e 100644 --- a/dev/incompressible_liquids/json/PKL.json +++ b/dev/incompressible_liquids/json/PKL.json @@ -39,7 +39,7 @@ [ -1.334371e-07, 1.111111e-07, - 7.853570e-08, + 7.853571e-08, -2.395854e-06, 0.000000e+00, 0.000000e+00 @@ -83,7 +83,7 @@ 0.000000e+00 ], [ - -1.966392e-08, + -1.966393e-08, -4.501106e-07, -1.848113e-06, 0.000000e+00, @@ -128,7 +128,7 @@ -1.689970e+03, -9.308359e+02, -1.508314e+01, - -1.024750e+01, + -1.024749e+01, 2.949236e+01 ], [ @@ -141,7 +141,7 @@ ], [ 1.270929e-03, - 3.496142e-05, + 3.496141e-05, -1.354376e-03, 5.048808e-03, 0.000000e+00, @@ -162,7 +162,7 @@ "NRMS": 3.114171e-04, "coeffs": [ [ - -1.035298e+01, + -5.747806e+00, 3.032922e+00, -2.151449e+00, 9.334087e+00, diff --git a/dev/incompressible_liquids/json/PNF2.json b/dev/incompressible_liquids/json/PNF2.json index 086d1a59..6d183edf 100644 --- a/dev/incompressible_liquids/json/PNF2.json +++ b/dev/incompressible_liquids/json/PNF2.json @@ -85,7 +85,7 @@ "coeffs": [ -2.400889e+02, 2.880136e+00, - 5.928291e+00 + 8.230876e+00 ], "type": "logexponential" }, diff --git a/dev/incompressible_liquids/json/TY10.json b/dev/incompressible_liquids/json/TY10.json index 64904bad..495a3904 100644 --- a/dev/incompressible_liquids/json/TY10.json +++ b/dev/incompressible_liquids/json/TY10.json @@ -12,7 +12,7 @@ "NRMS": 2.259028e-03, "coeffs": [ [ - 5.274062e-01 + 5.274063e-01 ], [ 6.909061e-04 @@ -27,7 +27,7 @@ "type": "polynomial" }, "density": { - "NRMS": 1.037814e-14, + "NRMS": 2.745798e-14, "coeffs": [ [ 1.102000e+03 @@ -36,10 +36,10 @@ -4.000000e-01 ], [ - -2.109315e-16 + 1.332268e-15 ], [ - 4.296522e-17 + -5.551115e-17 ] ], "type": "polynomial" @@ -72,7 +72,7 @@ 2.537698e+00 ], [ - -2.826949e-15 + 4.440892e-15 ], [ -5.555556e-04 @@ -83,9 +83,9 @@ "viscosity": { "NRMS": 1.208917e-02, "coeffs": [ - 2.848800e+02, + 2.848799e+02, -1.786221e+02, - 6.485300e+00 + 8.787885e+00 ], "type": "exponential" }, diff --git a/dev/incompressible_liquids/json/TY15.json b/dev/incompressible_liquids/json/TY15.json index 93c76db2..111fd9e6 100644 --- a/dev/incompressible_liquids/json/TY15.json +++ b/dev/incompressible_liquids/json/TY15.json @@ -9,7 +9,7 @@ "Tmin": 2.531500e+02, "TminPsat": 3.131500e+02, "conductivity": { - "NRMS": 1.794224e-14, + "NRMS": 9.170581e-15, "coeffs": [ [ 4.920000e-01 @@ -18,16 +18,16 @@ 7.000000e-04 ], [ - -3.070494e-20 + -2.168404e-19 ], [ - 3.398720e-20 + 2.105202e-20 ] ], "type": "polynomial" }, "density": { - "NRMS": 3.987409e-14, + "NRMS": 7.161598e-15, "coeffs": [ [ 1.154000e+03 @@ -36,10 +36,10 @@ -4.000000e-01 ], [ - 7.327580e-16 + 3.885781e-16 ], [ - -5.876376e-17 + 1.275204e-17 ] ], "type": "polynomial" @@ -85,7 +85,7 @@ "coeffs": [ 4.217587e+02, -1.621283e+02, - 6.947722e+00 + 9.250307e+00 ], "type": "exponential" }, diff --git a/dev/incompressible_liquids/json/TY24.json b/dev/incompressible_liquids/json/TY24.json index 2265c7e3..3ab6c183 100644 --- a/dev/incompressible_liquids/json/TY24.json +++ b/dev/incompressible_liquids/json/TY24.json @@ -27,7 +27,7 @@ "type": "polynomial" }, "density": { - "NRMS": 6.043057e-14, + "NRMS": 1.547113e-13, "coeffs": [ [ 1.251000e+03 @@ -36,10 +36,10 @@ -4.000000e-01 ], [ - -8.024451e-17 + -5.967449e-16 ], [ - 4.540097e-17 + -1.110223e-16 ] ], "type": "polynomial" @@ -85,7 +85,7 @@ "coeffs": [ 7.883571e+02, -1.334617e+02, - 1.265553e+01 + 1.035294e+01 ], "type": "exponential" }, diff --git a/dev/incompressible_liquids/json/VNA.json b/dev/incompressible_liquids/json/VNA.json index f5dda0ad..949f1c5e 100644 --- a/dev/incompressible_liquids/json/VNA.json +++ b/dev/incompressible_liquids/json/VNA.json @@ -37,7 +37,7 @@ 0.000000e+00 ], [ - 5.323091e-06, + 5.323090e-06, -2.540460e-04, -8.436663e-04, 3.156744e-02, @@ -45,7 +45,7 @@ 0.000000e+00 ], [ - -9.858336e-08, + -9.858353e-08, -7.312962e-06, 4.524434e-05, 0.000000e+00, @@ -75,16 +75,16 @@ 0.000000e+00 ], [ - 6.408213e-04, + 6.408209e-04, -7.775845e-02, 1.362490e+00, - -9.252224e+00, + -9.252225e+00, 0.000000e+00, 0.000000e+00 ], [ -2.572104e-04, - 5.316688e-03, + 5.316687e-03, -3.551787e-02, 0.000000e+00, 0.000000e+00, @@ -132,14 +132,14 @@ ], [ 1.142994e-02, - -1.300787e-02, + -1.300786e-02, -7.263293e+00, 7.251942e+01, 0.000000e+00, 0.000000e+00 ], [ - -5.247006e-04, + -5.246997e-04, -1.543718e-02, 2.255326e-01, 0.000000e+00, @@ -153,7 +153,7 @@ "NRMS": 6.924953e-03, "coeffs": [ [ - -3.767817e+00, + -6.070403e+00, 2.944804e+00, -4.036125e+00, 2.518059e+02, @@ -169,9 +169,9 @@ 0.000000e+00 ], [ - 6.833710e-04, + 6.833709e-04, -6.979369e-03, - -4.306084e-04, + -4.306083e-04, 3.948697e-01, 0.000000e+00, 0.000000e+00 diff --git a/dev/incompressible_liquids/json/ZFC.json b/dev/incompressible_liquids/json/ZFC.json index a5fdc4d9..e947ac32 100644 --- a/dev/incompressible_liquids/json/ZFC.json +++ b/dev/incompressible_liquids/json/ZFC.json @@ -1,6 +1,6 @@ { "T_freeze": { - "NRMS": 6.475891e-15, + "NRMS": 4.895313e-15, "coeffs": [ [ 5.498963e+00, @@ -148,7 +148,7 @@ 0.000000e+00 ], [ - 4.820654e-08, + 4.820618e-08, 0.000000e+00, 0.000000e+00, 0.000000e+00 @@ -160,7 +160,7 @@ "NRMS": 5.396088e-03, "coeffs": [ [ - -1.023226e+01, + -5.627093e+00, 2.542102e+00, 2.006041e+00, 5.452566e+01 diff --git a/dev/incompressible_liquids/json/ZLC.json b/dev/incompressible_liquids/json/ZLC.json index 60e33630..74bb344d 100644 --- a/dev/incompressible_liquids/json/ZLC.json +++ b/dev/incompressible_liquids/json/ZLC.json @@ -1,6 +1,6 @@ { "T_freeze": { - "NRMS": 8.124623e-15, + "NRMS": 1.218693e-14, "coeffs": [ [ 5.479597e+00, @@ -24,7 +24,7 @@ -3.784546e-01, 1.897739e-01, 3.973191e-02, - 5.995334e-02 + 5.995335e-02 ], [ -2.398342e-04, @@ -34,7 +34,7 @@ 0.000000e+00 ], [ - -8.488945e-09, + -8.488944e-09, 4.392982e-06, -1.851867e-05, 0.000000e+00, @@ -173,7 +173,7 @@ "NRMS": 9.582053e-03, "coeffs": [ [ - -1.223086e+01, + -5.323107e+00, 3.910340e+00, 1.397248e+01, 5.781130e+01, diff --git a/dev/incompressible_liquids/json/ZM.json b/dev/incompressible_liquids/json/ZM.json index be52df22..43fcc597 100644 --- a/dev/incompressible_liquids/json/ZM.json +++ b/dev/incompressible_liquids/json/ZM.json @@ -45,7 +45,7 @@ 0.000000e+00 ], [ - 6.205343e-10, + 6.205346e-10, -1.244518e-08, 1.582132e-08, 0.000000e+00, @@ -172,7 +172,7 @@ 0.000000e+00 ], [ - -4.287604e-05, + -4.287605e-05, 7.026722e-05, 6.531239e-04, 0.000000e+00, @@ -186,7 +186,7 @@ "NRMS": 8.136077e-03, "coeffs": [ [ - -8.196047e+00, + -5.893462e+00, 2.928954e+00, 1.244453e+00, 1.450798e-01, diff --git a/dev/incompressible_liquids/json/ZMC.json b/dev/incompressible_liquids/json/ZMC.json index a42ba3a0..79c6822c 100644 --- a/dev/incompressible_liquids/json/ZMC.json +++ b/dev/incompressible_liquids/json/ZMC.json @@ -1,6 +1,6 @@ { "T_freeze": { - "NRMS": 3.815716e-15, + "NRMS": 6.878881e-15, "coeffs": [ [ 5.464044e+00, @@ -41,7 +41,7 @@ 0.000000e+00 ], [ - 7.704098e-11, + 7.704093e-11, -2.547468e-10, 0.000000e+00, 0.000000e+00, @@ -75,7 +75,7 @@ 0.000000e+00 ], [ - 5.814749e-09, + 5.814755e-09, -2.691843e-07, 0.000000e+00, 0.000000e+00, @@ -173,7 +173,7 @@ "NRMS": 4.727952e-03, "coeffs": [ [ - -8.027525e+00, + -5.724940e+00, 2.925573e+00, 1.135288e+00, 7.891747e-01, From 045342e88185694a0cfc57edaff52c0b17f7c33b Mon Sep 17 00:00:00 2001 From: Jorrit Wronski Date: Sun, 20 Dec 2015 23:20:18 +0100 Subject: [PATCH 5/5] Added license to main page, closes #894 --- LICENSE | 2 +- Web/index.rst | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index 8c44d4bd..d22e372f 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (C) 2012 Ian H. Bell +Copyright (C) 2012-2016 Ian H. Bell and other CoolProp developers Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: diff --git a/Web/index.rst b/Web/index.rst index 59278dc5..897c5d4c 100644 --- a/Web/index.rst +++ b/Web/index.rst @@ -108,4 +108,10 @@ Supporters .. image:: _static/logo_ipu.png :height: 50px :alt: IPU Refrigeration and Energy Technology - :target: http://www.ipu.dk \ No newline at end of file + :target: http://www.ipu.dk + + +License Information +------------------- + +CoolProp has flexible licensing terms and you can use it for commercial projects and academic work free of charge. Have a look at the actual `license `_, if you are in doubt. \ No newline at end of file