From d5f9c0a3825de6459804abe208e4ed597be8677c Mon Sep 17 00:00:00 2001 From: Ian Bell Date: Fri, 6 Jun 2014 09:29:25 +0200 Subject: [PATCH 01/26] critical state moved into STATES in json files Signed-off-by: Ian Bell --- dev/fluids/1-Butene.json | 20 +++++++++++--------- dev/fluids/AceticAcid.json | 20 +++++++++++--------- dev/fluids/Acetone.json | 20 +++++++++++--------- dev/fluids/Air.json | 18 ++++++++++-------- dev/fluids/Ammonia.json | 18 ++++++++++-------- dev/fluids/Argon.json | 18 ++++++++++-------- dev/fluids/Benzene.json | 18 ++++++++++-------- dev/fluids/CarbonDioxide.json | 18 ++++++++++-------- dev/fluids/CarbonMonoxide.json | 20 +++++++++++--------- dev/fluids/CarbonylSulfide.json | 20 +++++++++++--------- dev/fluids/CycloHexane.json | 20 +++++++++++--------- dev/fluids/CycloPropane.json | 20 +++++++++++--------- dev/fluids/Cyclopentane.json | 20 +++++++++++--------- dev/fluids/D4.json | 20 +++++++++++--------- dev/fluids/D5.json | 20 +++++++++++--------- dev/fluids/D6.json | 20 +++++++++++--------- dev/fluids/Deuterium.json | 20 +++++++++++--------- dev/fluids/DimethylCarbonate.json | 20 +++++++++++--------- dev/fluids/DimethylEther.json | 18 ++++++++++-------- dev/fluids/Ethane.json | 18 ++++++++++-------- dev/fluids/Ethanol.json | 18 ++++++++++-------- dev/fluids/EthylBenzene.json | 20 +++++++++++--------- dev/fluids/Ethylene.json | 20 +++++++++++--------- dev/fluids/Fluorine.json | 20 +++++++++++--------- dev/fluids/HFE143m.json | 20 +++++++++++--------- dev/fluids/Helium.json | 18 ++++++++++-------- dev/fluids/Hydrogen.json | 18 ++++++++++-------- dev/fluids/HydrogenSulfide.json | 18 ++++++++++-------- dev/fluids/IsoButane.json | 18 ++++++++++-------- dev/fluids/IsoButene.json | 20 +++++++++++--------- dev/fluids/Isohexane.json | 20 +++++++++++--------- dev/fluids/Isopentane.json | 20 +++++++++++--------- dev/fluids/Krypton.json | 20 +++++++++++--------- dev/fluids/MD2M.json | 20 +++++++++++--------- dev/fluids/MD3M.json | 20 +++++++++++--------- dev/fluids/MD4M.json | 20 +++++++++++--------- dev/fluids/MDM.json | 20 +++++++++++--------- dev/fluids/MM.json | 20 +++++++++++--------- dev/fluids/Methane.json | 20 +++++++++++--------- dev/fluids/Methanol.json | 20 +++++++++++--------- dev/fluids/MethylLinoleate.json | 20 +++++++++++--------- dev/fluids/MethylLinolenate.json | 20 +++++++++++--------- dev/fluids/MethylOleate.json | 20 +++++++++++--------- dev/fluids/MethylPalmitate.json | 20 +++++++++++--------- dev/fluids/MethylStearate.json | 20 +++++++++++--------- dev/fluids/Neon.json | 20 +++++++++++--------- dev/fluids/Neopentane.json | 20 +++++++++++--------- dev/fluids/Nitrogen.json | 18 ++++++++++-------- dev/fluids/NitrousOxide.json | 20 +++++++++++--------- dev/fluids/OrthoDeuterium.json | 20 +++++++++++--------- dev/fluids/OrthoHydrogen.json | 20 +++++++++++--------- dev/fluids/Oxygen.json | 18 ++++++++++-------- dev/fluids/ParaDeuterium.json | 20 +++++++++++--------- dev/fluids/ParaHydrogen.json | 18 ++++++++++-------- dev/fluids/Propylene.json | 20 +++++++++++--------- dev/fluids/Propyne.json | 20 +++++++++++--------- dev/fluids/R11.json | 20 +++++++++++--------- dev/fluids/R113.json | 20 +++++++++++--------- dev/fluids/R114.json | 20 +++++++++++--------- dev/fluids/R116.json | 20 +++++++++++--------- dev/fluids/R12.json | 20 +++++++++++--------- dev/fluids/R123.json | 18 ++++++++++-------- dev/fluids/R1233zd(E).json | 20 +++++++++++--------- dev/fluids/R1234yf.json | 18 ++++++++++-------- dev/fluids/R1234ze(E).json | 18 ++++++++++-------- dev/fluids/R1234ze(Z).json | 20 +++++++++++--------- dev/fluids/R124.json | 18 ++++++++++-------- dev/fluids/R125.json | 18 ++++++++++-------- dev/fluids/R13.json | 20 +++++++++++--------- dev/fluids/R134a.json | 18 ++++++++++-------- dev/fluids/R14.json | 20 +++++++++++--------- dev/fluids/R141b.json | 20 +++++++++++--------- dev/fluids/R142b.json | 20 +++++++++++--------- dev/fluids/R143a.json | 20 +++++++++++--------- dev/fluids/R152A.json | 18 ++++++++++-------- dev/fluids/R161.json | 20 +++++++++++--------- dev/fluids/R21.json | 20 +++++++++++--------- dev/fluids/R218.json | 20 +++++++++++--------- dev/fluids/R22.json | 20 +++++++++++--------- dev/fluids/R227EA.json | 20 +++++++++++--------- dev/fluids/R23.json | 18 ++++++++++-------- dev/fluids/R236EA.json | 20 +++++++++++--------- dev/fluids/R236FA.json | 20 +++++++++++--------- dev/fluids/R245fa.json | 20 +++++++++++--------- dev/fluids/R32.json | 20 +++++++++++--------- dev/fluids/R365MFC.json | 20 +++++++++++--------- dev/fluids/R404A.json | 18 ++++++++++-------- dev/fluids/R407C.json | 18 ++++++++++-------- dev/fluids/R407F.json | 20 +++++++++++--------- dev/fluids/R41.json | 20 +++++++++++--------- dev/fluids/R410A.json | 18 ++++++++++-------- dev/fluids/R507A.json | 18 ++++++++++-------- dev/fluids/RC318.json | 20 +++++++++++--------- dev/fluids/SES36.json | 20 +++++++++++--------- dev/fluids/SulfurDioxide.json | 20 +++++++++++--------- dev/fluids/SulfurHexafluoride.json | 18 ++++++++++-------- dev/fluids/Toluene.json | 18 ++++++++++-------- dev/fluids/Water.json | 18 ++++++++++-------- dev/fluids/Xenon.json | 20 +++++++++++--------- dev/fluids/cis-2-Butene.json | 20 +++++++++++--------- dev/fluids/m-Xylene.json | 20 +++++++++++--------- dev/fluids/n-Butane.json | 18 ++++++++++-------- dev/fluids/n-Decane.json | 18 ++++++++++-------- dev/fluids/n-Dodecane.json | 18 ++++++++++-------- dev/fluids/n-Heptane.json | 18 ++++++++++-------- dev/fluids/n-Hexane.json | 18 ++++++++++-------- dev/fluids/n-Nonane.json | 18 ++++++++++-------- dev/fluids/n-Octane.json | 18 ++++++++++-------- dev/fluids/n-Pentane.json | 20 +++++++++++--------- dev/fluids/n-Propane.json | 18 ++++++++++-------- dev/fluids/n-Undecane.json | 20 +++++++++++--------- dev/fluids/o-Xylene.json | 20 +++++++++++--------- dev/fluids/p-Xylene.json | 20 +++++++++++--------- dev/fluids/trans-2-Butene.json | 20 +++++++++++--------- 114 files changed, 1216 insertions(+), 988 deletions(-) diff --git a/dev/fluids/1-Butene.json b/dev/fluids/1-Butene.json index c3898889..4c629606 100644 --- a/dev/fluids/1-Butene.json +++ b/dev/fluids/1-Butene.json @@ -123,14 +123,6 @@ } }, "CAS": "106-98-9", - "CRITICAL": { - "T": 419.29, - "T_units": "K", - "p": 4005100.0, - "p_units": "Pa", - "rhomolar": 4240.0, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": 4, @@ -263,5 +255,15 @@ } ], "NAME": "1-Butene", - "REFPROP_NAME": "1BUTENE" + "REFPROP_NAME": "1BUTENE", + "STATES": { + "critical": { + "T": 419.29, + "T_units": "K", + "p": 4005100.0, + "p_units": "Pa", + "rhomolar": 4240.0, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/AceticAcid.json b/dev/fluids/AceticAcid.json index f35e6231..58f79b58 100644 --- a/dev/fluids/AceticAcid.json +++ b/dev/fluids/AceticAcid.json @@ -109,14 +109,6 @@ } }, "CAS": "64-19-7", - "CRITICAL": { - "T": 590.7, - "T_units": "K", - "p": 5817526.2731114905, - "p_units": "Pa", - "rhomolar": 5844.938283446536, - "rhomolar_units": "mol/m^3" - }, "EOS": [ { "BibTeX_CP0": "", @@ -265,5 +257,15 @@ } ], "NAME": "AceticAcid", - "REFPROP_NAME": "N/A" + "REFPROP_NAME": "N/A", + "STATES": { + "critical": { + "T": 590.7, + "T_units": "K", + "p": 5817526.2731114905, + "p_units": "Pa", + "rhomolar": 5844.938283446536, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/Acetone.json b/dev/fluids/Acetone.json index 83e383f3..71ef8cd1 100644 --- a/dev/fluids/Acetone.json +++ b/dev/fluids/Acetone.json @@ -121,14 +121,6 @@ } }, "CAS": "67-64-1", - "CRITICAL": { - "T": 508.1, - "T_units": "K", - "p": 4700000.0, - "p_units": "Pa", - "rhomolar": 4699.999999999999, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": 3, @@ -265,5 +257,15 @@ } ], "NAME": "Acetone", - "REFPROP_NAME": "ACETONE" + "REFPROP_NAME": "ACETONE", + "STATES": { + "critical": { + "T": 508.1, + "T_units": "K", + "p": 4700000.0, + "p_units": "Pa", + "rhomolar": 4699.999999999999, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/Air.json b/dev/fluids/Air.json index 79c07a25..5f4724fb 100644 --- a/dev/fluids/Air.json +++ b/dev/fluids/Air.json @@ -110,14 +110,6 @@ } }, "CAS": "AIR.PPF", - "CRITICAL": { - "T": 132.5306, - "T_units": "K", - "p": 3786000.0, - "p_units": "Pa", - "rhomolar": 11830.8, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": 0, @@ -309,6 +301,16 @@ ], "NAME": "Air", "REFPROP_NAME": "AIR", + "STATES": { + "critical": { + "T": 132.5306, + "T_units": "K", + "p": 3786000.0, + "p_units": "Pa", + "rhomolar": 11830.8, + "rhomolar_units": "mol/m^3" + } + }, "TRANSPORT": { "conductivity": { "BibTeX": "Lemmon-IJT-2004", diff --git a/dev/fluids/Ammonia.json b/dev/fluids/Ammonia.json index 6a2643c9..f994081c 100644 --- a/dev/fluids/Ammonia.json +++ b/dev/fluids/Ammonia.json @@ -125,14 +125,6 @@ } }, "CAS": "7664-41-7", - "CRITICAL": { - "T": 405.4, - "T_units": "K", - "p": 11333000.0, - "p_units": "Pa", - "rhomolar": 13211.777154312385, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "B2", "FH": 1, @@ -300,6 +292,16 @@ ], "NAME": "Ammonia", "REFPROP_NAME": "AMMONIA", + "STATES": { + "critical": { + "T": 405.4, + "T_units": "K", + "p": 11333000.0, + "p_units": "Pa", + "rhomolar": 13211.777154312385, + "rhomolar_units": "mol/m^3" + } + }, "TRANSPORT": { "conductivity": { "BibTeX": "Tufeu-BBPC-1984", diff --git a/dev/fluids/Argon.json b/dev/fluids/Argon.json index c0138e57..8cb15e42 100644 --- a/dev/fluids/Argon.json +++ b/dev/fluids/Argon.json @@ -121,14 +121,6 @@ } }, "CAS": "7440-37-1", - "CRITICAL": { - "T": 150.687, - "T_units": "K", - "p": 4863000.0, - "p_units": "Pa", - "rhomolar": 13407.429658556124, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "A1", "FH": 0, @@ -392,6 +384,16 @@ ], "NAME": "Argon", "REFPROP_NAME": "ARGON", + "STATES": { + "critical": { + "T": 150.687, + "T_units": "K", + "p": 4863000.0, + "p_units": "Pa", + "rhomolar": 13407.429658556124, + "rhomolar_units": "mol/m^3" + } + }, "TRANSPORT": { "conductivity": { "BibTeX": "Lemmon-IJT-2004", diff --git a/dev/fluids/Benzene.json b/dev/fluids/Benzene.json index a3ef5dd2..c80f5aa4 100644 --- a/dev/fluids/Benzene.json +++ b/dev/fluids/Benzene.json @@ -125,14 +125,6 @@ } }, "CAS": "71-43-2", - "CRITICAL": { - "T": 562.02, - "T_units": "K", - "p": 4894000.0, - "p_units": "Pa", - "rhomolar": 3902.0, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": 3, @@ -307,6 +299,16 @@ ], "NAME": "Benzene", "REFPROP_NAME": "BENZENE", + "STATES": { + "critical": { + "T": 562.02, + "T_units": "K", + "p": 4894000.0, + "p_units": "Pa", + "rhomolar": 3902.0, + "rhomolar_units": "mol/m^3" + } + }, "TRANSPORT": { "conductivity": { "BibTeX": "Assael-JPCRD-2013-Hexane", diff --git a/dev/fluids/CarbonDioxide.json b/dev/fluids/CarbonDioxide.json index d1a9f3ae..32cff981 100644 --- a/dev/fluids/CarbonDioxide.json +++ b/dev/fluids/CarbonDioxide.json @@ -124,14 +124,6 @@ } }, "CAS": "124-38-9", - "CRITICAL": { - "T": 304.1282, - "T_units": "K", - "p": 7377300.0, - "p_units": "Pa", - "rhomolar": 10624.906299999999, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "A1", "FH": 0, @@ -456,6 +448,16 @@ ], "NAME": "CarbonDioxide", "REFPROP_NAME": "CO2", + "STATES": { + "critical": { + "T": 304.1282, + "T_units": "K", + "p": 7377300.0, + "p_units": "Pa", + "rhomolar": 10624.906299999999, + "rhomolar_units": "mol/m^3" + } + }, "TRANSPORT": { "conductivity": { "BibTeX": "Scalabrin-JPCRD-2006-CO2", diff --git a/dev/fluids/CarbonMonoxide.json b/dev/fluids/CarbonMonoxide.json index bc9e63bd..bcb69f63 100644 --- a/dev/fluids/CarbonMonoxide.json +++ b/dev/fluids/CarbonMonoxide.json @@ -121,14 +121,6 @@ } }, "CAS": "630-08-0", - "CRITICAL": { - "T": 132.86, - "T_units": "K", - "p": 3494000.0, - "p_units": "Pa", - "rhomolar": 10850.0, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": 4, @@ -264,5 +256,15 @@ } ], "NAME": "CarbonMonoxide", - "REFPROP_NAME": "CO" + "REFPROP_NAME": "CO", + "STATES": { + "critical": { + "T": 132.86, + "T_units": "K", + "p": 3494000.0, + "p_units": "Pa", + "rhomolar": 10850.0, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/CarbonylSulfide.json b/dev/fluids/CarbonylSulfide.json index 8ff5fb5f..a67f488e 100644 --- a/dev/fluids/CarbonylSulfide.json +++ b/dev/fluids/CarbonylSulfide.json @@ -121,14 +121,6 @@ } }, "CAS": "463-58-1", - "CRITICAL": { - "T": 378.77, - "T_units": "K", - "p": 6370000.0, - "p_units": "Pa", - "rhomolar": 7410.0, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": 4, @@ -261,5 +253,15 @@ } ], "NAME": "CarbonylSulfide", - "REFPROP_NAME": "COS" + "REFPROP_NAME": "COS", + "STATES": { + "critical": { + "T": 378.77, + "T_units": "K", + "p": 6370000.0, + "p_units": "Pa", + "rhomolar": 7410.0, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/CycloHexane.json b/dev/fluids/CycloHexane.json index 8510127d..f0d2397f 100644 --- a/dev/fluids/CycloHexane.json +++ b/dev/fluids/CycloHexane.json @@ -121,14 +121,6 @@ } }, "CAS": "110-82-7", - "CRITICAL": { - "T": 553.6, - "T_units": "K", - "p": 4082400.0, - "p_units": "Pa", - "rhomolar": 3224.0, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": 3, @@ -346,5 +338,15 @@ } ], "NAME": "CycloHexane", - "REFPROP_NAME": "CYCLOHEX" + "REFPROP_NAME": "CYCLOHEX", + "STATES": { + "critical": { + "T": 553.6, + "T_units": "K", + "p": 4082400.0, + "p_units": "Pa", + "rhomolar": 3224.0, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/CycloPropane.json b/dev/fluids/CycloPropane.json index 59eb28a9..6680a87a 100644 --- a/dev/fluids/CycloPropane.json +++ b/dev/fluids/CycloPropane.json @@ -111,14 +111,6 @@ } }, "CAS": "75-19-4", - "CRITICAL": { - "T": 398.3, - "T_units": "K", - "p": 5579700.0, - "p_units": "Pa", - "rhomolar": 6142.9149, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": 2, @@ -301,5 +293,15 @@ } ], "NAME": "CycloPropane", - "REFPROP_NAME": "CYCLOPRO" + "REFPROP_NAME": "CYCLOPRO", + "STATES": { + "critical": { + "T": 398.3, + "T_units": "K", + "p": 5579700.0, + "p_units": "Pa", + "rhomolar": 6142.9149, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/Cyclopentane.json b/dev/fluids/Cyclopentane.json index 4cbf9751..cf9ab2c7 100644 --- a/dev/fluids/Cyclopentane.json +++ b/dev/fluids/Cyclopentane.json @@ -111,14 +111,6 @@ } }, "CAS": "287-92-3", - "CRITICAL": { - "T": 511.72, - "T_units": "K", - "p": 4571200.0, - "p_units": "Pa", - "rhomolar": 3820.0000000000005, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": 3, @@ -288,5 +280,15 @@ } ], "NAME": "Cyclopentane", - "REFPROP_NAME": "CYCLOPEN" + "REFPROP_NAME": "CYCLOPEN", + "STATES": { + "critical": { + "T": 511.72, + "T_units": "K", + "p": 4571200.0, + "p_units": "Pa", + "rhomolar": 3820.0000000000005, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/D4.json b/dev/fluids/D4.json index 92c28225..d77851f9 100644 --- a/dev/fluids/D4.json +++ b/dev/fluids/D4.json @@ -110,14 +110,6 @@ } }, "CAS": "556-67-2", - "CRITICAL": { - "T": 586.5, - "T_units": "K", - "p": 1332000.0, - "p_units": "Pa", - "rhomolar": 1030.928, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": -1, @@ -262,5 +254,15 @@ } ], "NAME": "D4", - "REFPROP_NAME": "D4" + "REFPROP_NAME": "D4", + "STATES": { + "critical": { + "T": 586.5, + "T_units": "K", + "p": 1332000.0, + "p_units": "Pa", + "rhomolar": 1030.928, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/D5.json b/dev/fluids/D5.json index e8a5454e..cbb48924 100644 --- a/dev/fluids/D5.json +++ b/dev/fluids/D5.json @@ -110,14 +110,6 @@ } }, "CAS": "541-02-6", - "CRITICAL": { - "T": 619.15, - "T_units": "K", - "p": 1160000.0, - "p_units": "Pa", - "rhomolar": 822.3684, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": -1, @@ -262,5 +254,15 @@ } ], "NAME": "D5", - "REFPROP_NAME": "D5" + "REFPROP_NAME": "D5", + "STATES": { + "critical": { + "T": 619.15, + "T_units": "K", + "p": 1160000.0, + "p_units": "Pa", + "rhomolar": 822.3684, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/D6.json b/dev/fluids/D6.json index 057ecfde..41edb001 100644 --- a/dev/fluids/D6.json +++ b/dev/fluids/D6.json @@ -110,14 +110,6 @@ } }, "CAS": "540-97-6", - "CRITICAL": { - "T": 645.78, - "T_units": "K", - "p": 961000.0, - "p_units": "Pa", - "rhomolar": 627.2885477999996, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": -1, @@ -253,5 +245,15 @@ } ], "NAME": "D6", - "REFPROP_NAME": "D6" + "REFPROP_NAME": "D6", + "STATES": { + "critical": { + "T": 645.78, + "T_units": "K", + "p": 961000.0, + "p_units": "Pa", + "rhomolar": 627.2885477999996, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/Deuterium.json b/dev/fluids/Deuterium.json index 39610892..279c4028 100644 --- a/dev/fluids/Deuterium.json +++ b/dev/fluids/Deuterium.json @@ -122,14 +122,6 @@ } }, "CAS": "7782-39-0", - "CRITICAL": { - "T": 38.34, - "T_units": "K", - "p": 1679600.0, - "p_units": "Pa", - "rhomolar": 17230.0, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": -1, @@ -352,5 +344,15 @@ } ], "NAME": "Deuterium", - "REFPROP_NAME": "D2" + "REFPROP_NAME": "D2", + "STATES": { + "critical": { + "T": 38.34, + "T_units": "K", + "p": 1679600.0, + "p_units": "Pa", + "rhomolar": 17230.0, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/DimethylCarbonate.json b/dev/fluids/DimethylCarbonate.json index 4921ba6d..acd4c02a 100644 --- a/dev/fluids/DimethylCarbonate.json +++ b/dev/fluids/DimethylCarbonate.json @@ -111,14 +111,6 @@ } }, "CAS": "616-38-6", - "CRITICAL": { - "T": 557.0, - "T_units": "K", - "p": 4908800.0, - "p_units": "Pa", - "rhomolar": 4000.0, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": 3, @@ -310,5 +302,15 @@ } ], "NAME": "DimethylCarbonate", - "REFPROP_NAME": "DMC" + "REFPROP_NAME": "DMC", + "STATES": { + "critical": { + "T": 557.0, + "T_units": "K", + "p": 4908800.0, + "p_units": "Pa", + "rhomolar": 4000.0, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/DimethylEther.json b/dev/fluids/DimethylEther.json index 916cdc18..b0d57a31 100644 --- a/dev/fluids/DimethylEther.json +++ b/dev/fluids/DimethylEther.json @@ -120,14 +120,6 @@ } }, "CAS": "115-10-6", - "CRITICAL": { - "T": 400.378, - "T_units": "K", - "p": 5336800.0, - "p_units": "Pa", - "rhomolar": 5940.000000000001, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "A3", "FH": 4, @@ -302,6 +294,16 @@ ], "NAME": "DimethylEther", "REFPROP_NAME": "DME", + "STATES": { + "critical": { + "T": 400.378, + "T_units": "K", + "p": 5336800.0, + "p_units": "Pa", + "rhomolar": 5940.000000000001, + "rhomolar_units": "mol/m^3" + } + }, "TRANSPORT": { "viscosity": { "BibTeX": "Meng-JCED-2012", diff --git a/dev/fluids/Ethane.json b/dev/fluids/Ethane.json index a76c1259..9554fac2 100644 --- a/dev/fluids/Ethane.json +++ b/dev/fluids/Ethane.json @@ -123,14 +123,6 @@ } }, "CAS": "74-84-0", - "CRITICAL": { - "T": 305.322, - "T_units": "K", - "p": 4872200.0, - "p_units": "Pa", - "rhomolar": 6856.886685, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "A3", "FH": 4, @@ -430,6 +422,16 @@ ], "NAME": "Ethane", "REFPROP_NAME": "ETHANE", + "STATES": { + "critical": { + "T": 305.322, + "T_units": "K", + "p": 4872200.0, + "p_units": "Pa", + "rhomolar": 6856.886685, + "rhomolar_units": "mol/m^3" + } + }, "TRANSPORT": { "conductivity": { "BibTeX": "Friend-JPCRD-1991", diff --git a/dev/fluids/Ethanol.json b/dev/fluids/Ethanol.json index 141d0f0d..9a266f0e 100644 --- a/dev/fluids/Ethanol.json +++ b/dev/fluids/Ethanol.json @@ -122,14 +122,6 @@ } }, "CAS": "64-17-5", - "CRITICAL": { - "T": 514.71, - "T_units": "K", - "p": 6268000.0, - "p_units": "Pa", - "rhomolar": 5930.0, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": 3, @@ -365,6 +357,16 @@ ], "NAME": "Ethanol", "REFPROP_NAME": "ETHANOL", + "STATES": { + "critical": { + "T": 514.71, + "T_units": "K", + "p": 6268000.0, + "p_units": "Pa", + "rhomolar": 5930.0, + "rhomolar_units": "mol/m^3" + } + }, "TRANSPORT": { "conductivity": { "BibTeX": "Assael-JPCRD-2013-Ethanol", diff --git a/dev/fluids/EthylBenzene.json b/dev/fluids/EthylBenzene.json index 9547449a..85741fe7 100644 --- a/dev/fluids/EthylBenzene.json +++ b/dev/fluids/EthylBenzene.json @@ -110,14 +110,6 @@ } }, "CAS": "100-41-4", - "CRITICAL": { - "T": 617.12, - "T_units": "K", - "p": 3622400.0, - "p_units": "Pa", - "rhomolar": 2741.016, - "rhomolar_units": "mol/m^3" - }, "EOS": [ { "BibTeX_CP0": "", @@ -282,5 +274,15 @@ } ], "NAME": "EthylBenzene", - "REFPROP_NAME": "EBENZENE" + "REFPROP_NAME": "EBENZENE", + "STATES": { + "critical": { + "T": 617.12, + "T_units": "K", + "p": 3622400.0, + "p_units": "Pa", + "rhomolar": 2741.016, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/Ethylene.json b/dev/fluids/Ethylene.json index 7ae077be..708a3d17 100644 --- a/dev/fluids/Ethylene.json +++ b/dev/fluids/Ethylene.json @@ -121,14 +121,6 @@ } }, "CAS": "74-85-1", - "CRITICAL": { - "T": 282.35, - "T_units": "K", - "p": 5041800.0, - "p_units": "Pa", - "rhomolar": 7636.76598074554, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "A3", "FH": 4, @@ -391,5 +383,15 @@ } ], "NAME": "Ethylene", - "REFPROP_NAME": "ETHYLENE" + "REFPROP_NAME": "ETHYLENE", + "STATES": { + "critical": { + "T": 282.35, + "T_units": "K", + "p": 5041800.0, + "p_units": "Pa", + "rhomolar": 7636.76598074554, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/Fluorine.json b/dev/fluids/Fluorine.json index cd705880..ee03af60 100644 --- a/dev/fluids/Fluorine.json +++ b/dev/fluids/Fluorine.json @@ -121,14 +121,6 @@ } }, "CAS": "7782-41-4", - "CRITICAL": { - "T": 144.414, - "T_units": "K", - "p": 5172400.0, - "p_units": "Pa", - "rhomolar": 15603.0, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": 3, @@ -391,5 +383,15 @@ } ], "NAME": "Fluorine", - "REFPROP_NAME": "FLUORINE" + "REFPROP_NAME": "FLUORINE", + "STATES": { + "critical": { + "T": 144.414, + "T_units": "K", + "p": 5172400.0, + "p_units": "Pa", + "rhomolar": 15603.0, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/HFE143m.json b/dev/fluids/HFE143m.json index e0dbe6d5..f3df557f 100644 --- a/dev/fluids/HFE143m.json +++ b/dev/fluids/HFE143m.json @@ -113,14 +113,6 @@ } }, "CAS": "421-14-7", - "CRITICAL": { - "T": 377.921, - "T_units": "K", - "p": 3635000.0, - "p_units": "Pa", - "rhomolar": 4648.140744, - "rhomolar_units": "mol/m^3" - }, "EOS": [ { "BibTeX_CP0": "", @@ -274,5 +266,15 @@ } ], "NAME": "HFE143m", - "REFPROP_NAME": "RE143A" + "REFPROP_NAME": "RE143A", + "STATES": { + "critical": { + "T": 377.921, + "T_units": "K", + "p": 3635000.0, + "p_units": "Pa", + "rhomolar": 4648.140744, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/Helium.json b/dev/fluids/Helium.json index 33affb78..2bf989ba 100644 --- a/dev/fluids/Helium.json +++ b/dev/fluids/Helium.json @@ -126,14 +126,6 @@ } }, "CAS": "7440-59-7", - "CRITICAL": { - "T": 5.1953, - "T_units": "K", - "p": 227600.0, - "p_units": "Pa", - "rhomolar": 18130.0, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "A1", "FH": 0, @@ -338,6 +330,16 @@ ], "NAME": "Helium", "REFPROP_NAME": "HELIUM", + "STATES": { + "critical": { + "T": 5.1953, + "T_units": "K", + "p": 227600.0, + "p_units": "Pa", + "rhomolar": 18130.0, + "rhomolar_units": "mol/m^3" + } + }, "TRANSPORT": { "conductivity": { "BibTeX": "HANDS-CRYO-1981", diff --git a/dev/fluids/Hydrogen.json b/dev/fluids/Hydrogen.json index 5798b1fe..70b3fc77 100644 --- a/dev/fluids/Hydrogen.json +++ b/dev/fluids/Hydrogen.json @@ -127,14 +127,6 @@ } }, "CAS": "1333-74-0", - "CRITICAL": { - "T": 33.145, - "T_units": "K", - "p": 1296400.0, - "p_units": "Pa", - "rhomolar": 15508.0, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "A3", "FH": 4, @@ -310,6 +302,16 @@ ], "NAME": "Hydrogen", "REFPROP_NAME": "HYDROGEN", + "STATES": { + "critical": { + "T": 33.145, + "T_units": "K", + "p": 1296400.0, + "p_units": "Pa", + "rhomolar": 15508.0, + "rhomolar_units": "mol/m^3" + } + }, "TRANSPORT": { "conductivity": { "BibTeX": "Assael-JPCRD-2011-Hydrogen", diff --git a/dev/fluids/HydrogenSulfide.json b/dev/fluids/HydrogenSulfide.json index 07e0f747..adca547e 100644 --- a/dev/fluids/HydrogenSulfide.json +++ b/dev/fluids/HydrogenSulfide.json @@ -121,14 +121,6 @@ } }, "CAS": "7783-06-4", - "CRITICAL": { - "T": 373.1, - "T_units": "K", - "p": 9000000.0, - "p_units": "Pa", - "rhomolar": 10190.0, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": 4, @@ -267,6 +259,16 @@ ], "NAME": "HydrogenSulfide", "REFPROP_NAME": "H2S", + "STATES": { + "critical": { + "T": 373.1, + "T_units": "K", + "p": 9000000.0, + "p_units": "Pa", + "rhomolar": 10190.0, + "rhomolar_units": "mol/m^3" + } + }, "TRANSPORT": { "viscosity": { "BibTeX": "QuinonesCisneros-JCED-2012", diff --git a/dev/fluids/IsoButane.json b/dev/fluids/IsoButane.json index 137552b2..962274c8 100644 --- a/dev/fluids/IsoButane.json +++ b/dev/fluids/IsoButane.json @@ -126,14 +126,6 @@ } }, "CAS": "75-28-5", - "CRITICAL": { - "T": 407.817, - "T_units": "K", - "p": 3629000.0, - "p_units": "Pa", - "rhomolar": 3879.756788283995, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": 4, @@ -348,6 +340,16 @@ ], "NAME": "IsoButane", "REFPROP_NAME": "ISOBUTAN", + "STATES": { + "critical": { + "T": 407.817, + "T_units": "K", + "p": 3629000.0, + "p_units": "Pa", + "rhomolar": 3879.756788283995, + "rhomolar_units": "mol/m^3" + } + }, "TRANSPORT": { "conductivity": { "BibTeX": "Perkins-JCED-2002-Isobutane", diff --git a/dev/fluids/IsoButene.json b/dev/fluids/IsoButene.json index dbe674cd..f84e9d29 100644 --- a/dev/fluids/IsoButene.json +++ b/dev/fluids/IsoButene.json @@ -121,14 +121,6 @@ } }, "CAS": "115-11-7", - "CRITICAL": { - "T": 418.09, - "T_units": "K", - "p": 4009800.0, - "p_units": "Pa", - "rhomolar": 4170.0, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": 4, @@ -261,5 +253,15 @@ } ], "NAME": "IsoButene", - "REFPROP_NAME": "IBUTENE" + "REFPROP_NAME": "IBUTENE", + "STATES": { + "critical": { + "T": 418.09, + "T_units": "K", + "p": 4009800.0, + "p_units": "Pa", + "rhomolar": 4170.0, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/Isohexane.json b/dev/fluids/Isohexane.json index cd28d2a9..4dc70b9a 100644 --- a/dev/fluids/Isohexane.json +++ b/dev/fluids/Isohexane.json @@ -121,14 +121,6 @@ } }, "CAS": "107-83-5", - "CRITICAL": { - "T": 497.7, - "T_units": "K", - "p": 3040000.0, - "p_units": "Pa", - "rhomolar": 2715.0000000000005, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": 3, @@ -261,5 +253,15 @@ } ], "NAME": "Isohexane", - "REFPROP_NAME": "IHEXANE" + "REFPROP_NAME": "IHEXANE", + "STATES": { + "critical": { + "T": 497.7, + "T_units": "K", + "p": 3040000.0, + "p_units": "Pa", + "rhomolar": 2715.0000000000005, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/Isopentane.json b/dev/fluids/Isopentane.json index 95e3eeec..4aeb26b8 100644 --- a/dev/fluids/Isopentane.json +++ b/dev/fluids/Isopentane.json @@ -122,14 +122,6 @@ } }, "CAS": "78-78-4", - "CRITICAL": { - "T": 460.35, - "T_units": "K", - "p": 3378000.0, - "p_units": "Pa", - "rhomolar": 3271.0, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "A3", "FH": 4, @@ -262,5 +254,15 @@ } ], "NAME": "Isopentane", - "REFPROP_NAME": "IPENTANE" + "REFPROP_NAME": "IPENTANE", + "STATES": { + "critical": { + "T": 460.35, + "T_units": "K", + "p": 3378000.0, + "p_units": "Pa", + "rhomolar": 3271.0, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/Krypton.json b/dev/fluids/Krypton.json index f44725d0..25168de7 100644 --- a/dev/fluids/Krypton.json +++ b/dev/fluids/Krypton.json @@ -121,14 +121,6 @@ } }, "CAS": "7439-90-9", - "CRITICAL": { - "T": 209.48, - "T_units": "K", - "p": 5525000.0, - "p_units": "Pa", - "rhomolar": 10850.0, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": 0, @@ -246,5 +238,15 @@ } ], "NAME": "Krypton", - "REFPROP_NAME": "KRYPTON" + "REFPROP_NAME": "KRYPTON", + "STATES": { + "critical": { + "T": 209.48, + "T_units": "K", + "p": 5525000.0, + "p_units": "Pa", + "rhomolar": 10850.0, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/MD2M.json b/dev/fluids/MD2M.json index df191c14..b2864162 100644 --- a/dev/fluids/MD2M.json +++ b/dev/fluids/MD2M.json @@ -110,14 +110,6 @@ } }, "CAS": "141-62-8", - "CRITICAL": { - "T": 599.4, - "T_units": "K", - "p": 1227000.0, - "p_units": "Pa", - "rhomolar": 914.6616014999984, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": 2, @@ -253,5 +245,15 @@ } ], "NAME": "MD2M", - "REFPROP_NAME": "MD2M" + "REFPROP_NAME": "MD2M", + "STATES": { + "critical": { + "T": 599.4, + "T_units": "K", + "p": 1227000.0, + "p_units": "Pa", + "rhomolar": 914.6616014999984, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/MD3M.json b/dev/fluids/MD3M.json index 33e59291..35f2c533 100644 --- a/dev/fluids/MD3M.json +++ b/dev/fluids/MD3M.json @@ -110,14 +110,6 @@ } }, "CAS": "141-63-9", - "CRITICAL": { - "T": 628.36, - "T_units": "K", - "p": 945000.0, - "p_units": "Pa", - "rhomolar": 685.7981626999992, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": 2, @@ -253,5 +245,15 @@ } ], "NAME": "MD3M", - "REFPROP_NAME": "MD3M" + "REFPROP_NAME": "MD3M", + "STATES": { + "critical": { + "T": 628.36, + "T_units": "K", + "p": 945000.0, + "p_units": "Pa", + "rhomolar": 685.7981626999992, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/MD4M.json b/dev/fluids/MD4M.json index c6181478..728b07c8 100644 --- a/dev/fluids/MD4M.json +++ b/dev/fluids/MD4M.json @@ -110,14 +110,6 @@ } }, "CAS": "107-52-8", - "CRITICAL": { - "T": 653.2, - "T_units": "K", - "p": 877000.0, - "p_units": "Pa", - "rhomolar": 606.0605999999999, - "rhomolar_units": "mol/m^3" - }, "EOS": [ { "BibTeX_CP0": "", @@ -245,5 +237,15 @@ } ], "NAME": "MD4M", - "REFPROP_NAME": "MD4M" + "REFPROP_NAME": "MD4M", + "STATES": { + "critical": { + "T": 653.2, + "T_units": "K", + "p": 877000.0, + "p_units": "Pa", + "rhomolar": 606.0605999999999, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/MDM.json b/dev/fluids/MDM.json index b7e80d59..5c505be5 100644 --- a/dev/fluids/MDM.json +++ b/dev/fluids/MDM.json @@ -110,14 +110,6 @@ } }, "CAS": "107-51-7", - "CRITICAL": { - "T": 564.09, - "T_units": "K", - "p": 1415000.0, - "p_units": "Pa", - "rhomolar": 1085.436621399999, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": 2, @@ -253,5 +245,15 @@ } ], "NAME": "MDM", - "REFPROP_NAME": "MDM" + "REFPROP_NAME": "MDM", + "STATES": { + "critical": { + "T": 564.09, + "T_units": "K", + "p": 1415000.0, + "p_units": "Pa", + "rhomolar": 1085.436621399999, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/MM.json b/dev/fluids/MM.json index 381ed394..269ca8fa 100644 --- a/dev/fluids/MM.json +++ b/dev/fluids/MM.json @@ -110,14 +110,6 @@ } }, "CAS": "107-46-0", - "CRITICAL": { - "T": 518.75, - "T_units": "K", - "p": 1939000.0, - "p_units": "Pa", - "rhomolar": 1589.825, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": 3, @@ -262,5 +254,15 @@ } ], "NAME": "MM", - "REFPROP_NAME": "MM" + "REFPROP_NAME": "MM", + "STATES": { + "critical": { + "T": 518.75, + "T_units": "K", + "p": 1939000.0, + "p_units": "Pa", + "rhomolar": 1589.825, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/Methane.json b/dev/fluids/Methane.json index 879e099a..76110559 100644 --- a/dev/fluids/Methane.json +++ b/dev/fluids/Methane.json @@ -126,14 +126,6 @@ } }, "CAS": "74-82-8", - "CRITICAL": { - "T": 190.564, - "T_units": "K", - "p": 4599200.0, - "p_units": "Pa", - "rhomolar": 10139.127999999999, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "A3", "FH": 4, @@ -415,5 +407,15 @@ } ], "NAME": "Methane", - "REFPROP_NAME": "METHANE" + "REFPROP_NAME": "METHANE", + "STATES": { + "critical": { + "T": 190.564, + "T_units": "K", + "p": 4599200.0, + "p_units": "Pa", + "rhomolar": 10139.127999999999, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/Methanol.json b/dev/fluids/Methanol.json index 0f7c5626..afea5d3e 100644 --- a/dev/fluids/Methanol.json +++ b/dev/fluids/Methanol.json @@ -125,14 +125,6 @@ } }, "CAS": "67-56-1", - "CRITICAL": { - "T": 512.5, - "T_units": "K", - "p": 8215850.0, - "p_units": "Pa", - "rhomolar": 8520.024867237415, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": 3, @@ -310,5 +302,15 @@ } ], "NAME": "Methanol", - "REFPROP_NAME": "METHANOL" + "REFPROP_NAME": "METHANOL", + "STATES": { + "critical": { + "T": 512.5, + "T_units": "K", + "p": 8215850.0, + "p_units": "Pa", + "rhomolar": 8520.024867237415, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/MethylLinoleate.json b/dev/fluids/MethylLinoleate.json index 8daae56e..5c4fdce2 100644 --- a/dev/fluids/MethylLinoleate.json +++ b/dev/fluids/MethylLinoleate.json @@ -109,14 +109,6 @@ } }, "CAS": "112-63-0", - "CRITICAL": { - "T": 799.0, - "T_units": "K", - "p": 1341000.0, - "p_units": "Pa", - "rhomolar": 808.4, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": -1, @@ -290,5 +282,15 @@ } ], "NAME": "MethylLinoleate", - "REFPROP_NAME": "MLINOLEA" + "REFPROP_NAME": "MLINOLEA", + "STATES": { + "critical": { + "T": 799.0, + "T_units": "K", + "p": 1341000.0, + "p_units": "Pa", + "rhomolar": 808.4, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/MethylLinolenate.json b/dev/fluids/MethylLinolenate.json index 7227a8fe..cf021a27 100644 --- a/dev/fluids/MethylLinolenate.json +++ b/dev/fluids/MethylLinolenate.json @@ -109,14 +109,6 @@ } }, "CAS": "301-00-8", - "CRITICAL": { - "T": 772.0, - "T_units": "K", - "p": 1369000.0, - "p_units": "Pa", - "rhomolar": 847.3000000000001, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": -1, @@ -294,5 +286,15 @@ } ], "NAME": "MethylLinolenate", - "REFPROP_NAME": "MLINOLEN" + "REFPROP_NAME": "MLINOLEN", + "STATES": { + "critical": { + "T": 772.0, + "T_units": "K", + "p": 1369000.0, + "p_units": "Pa", + "rhomolar": 847.3000000000001, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/MethylOleate.json b/dev/fluids/MethylOleate.json index a4213bdc..f52c7910 100644 --- a/dev/fluids/MethylOleate.json +++ b/dev/fluids/MethylOleate.json @@ -109,14 +109,6 @@ } }, "CAS": "112-62-9", - "CRITICAL": { - "T": 782.0, - "T_units": "K", - "p": 1246000.0, - "p_units": "Pa", - "rhomolar": 812.8499999999999, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": 1, @@ -294,5 +286,15 @@ } ], "NAME": "MethylOleate", - "REFPROP_NAME": "MOLEATE" + "REFPROP_NAME": "MOLEATE", + "STATES": { + "critical": { + "T": 782.0, + "T_units": "K", + "p": 1246000.0, + "p_units": "Pa", + "rhomolar": 812.8499999999999, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/MethylPalmitate.json b/dev/fluids/MethylPalmitate.json index c33cf127..f7ac09c2 100644 --- a/dev/fluids/MethylPalmitate.json +++ b/dev/fluids/MethylPalmitate.json @@ -109,14 +109,6 @@ } }, "CAS": "112-39-0", - "CRITICAL": { - "T": 755.0, - "T_units": "K", - "p": 1350000.0, - "p_units": "Pa", - "rhomolar": 897.0, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": 0, @@ -294,5 +286,15 @@ } ], "NAME": "MethylPalmitate", - "REFPROP_NAME": "MPALMITA" + "REFPROP_NAME": "MPALMITA", + "STATES": { + "critical": { + "T": 755.0, + "T_units": "K", + "p": 1350000.0, + "p_units": "Pa", + "rhomolar": 897.0, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/MethylStearate.json b/dev/fluids/MethylStearate.json index 70c0a0fa..9abd7eae 100644 --- a/dev/fluids/MethylStearate.json +++ b/dev/fluids/MethylStearate.json @@ -109,14 +109,6 @@ } }, "CAS": "112-61-8", - "CRITICAL": { - "T": 775.0, - "T_units": "K", - "p": 1239000.0, - "p_units": "Pa", - "rhomolar": 794.3, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": 1, @@ -294,5 +286,15 @@ } ], "NAME": "MethylStearate", - "REFPROP_NAME": "MSTEARAT" + "REFPROP_NAME": "MSTEARAT", + "STATES": { + "critical": { + "T": 775.0, + "T_units": "K", + "p": 1239000.0, + "p_units": "Pa", + "rhomolar": 794.3, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/Neon.json b/dev/fluids/Neon.json index 85477be8..e46071ed 100644 --- a/dev/fluids/Neon.json +++ b/dev/fluids/Neon.json @@ -125,14 +125,6 @@ } }, "CAS": "7440-01-9", - "CRITICAL": { - "T": 44.4918, - "T_units": "K", - "p": 2680000.0, - "p_units": "Pa", - "rhomolar": 23882.0, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "A1", "FH": 0, @@ -324,5 +316,15 @@ } ], "NAME": "Neon", - "REFPROP_NAME": "NEON" + "REFPROP_NAME": "NEON", + "STATES": { + "critical": { + "T": 44.4918, + "T_units": "K", + "p": 2680000.0, + "p_units": "Pa", + "rhomolar": 23882.0, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/Neopentane.json b/dev/fluids/Neopentane.json index 4a3545d5..a3cdc98a 100644 --- a/dev/fluids/Neopentane.json +++ b/dev/fluids/Neopentane.json @@ -110,14 +110,6 @@ } }, "CAS": "463-82-1", - "CRITICAL": { - "T": 433.74, - "T_units": "K", - "p": 3196000.0, - "p_units": "Pa", - "rhomolar": 3270.0, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": 4, @@ -250,5 +242,15 @@ } ], "NAME": "Neopentane", - "REFPROP_NAME": "NEOPENTN" + "REFPROP_NAME": "NEOPENTN", + "STATES": { + "critical": { + "T": 433.74, + "T_units": "K", + "p": 3196000.0, + "p_units": "Pa", + "rhomolar": 3270.0, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/Nitrogen.json b/dev/fluids/Nitrogen.json index a0439d9a..650157d5 100644 --- a/dev/fluids/Nitrogen.json +++ b/dev/fluids/Nitrogen.json @@ -122,14 +122,6 @@ } }, "CAS": "7727-37-9", - "CRITICAL": { - "T": 126.192, - "T_units": "K", - "p": 3395800.0, - "p_units": "Pa", - "rhomolar": 11183.901464580624, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "A1", "FH": 0, @@ -395,6 +387,16 @@ ], "NAME": "Nitrogen", "REFPROP_NAME": "NITROGEN", + "STATES": { + "critical": { + "T": 126.192, + "T_units": "K", + "p": 3395800.0, + "p_units": "Pa", + "rhomolar": 11183.901464580624, + "rhomolar_units": "mol/m^3" + } + }, "TRANSPORT": { "conductivity": { "BibTeX": "Lemmon-IJT-2004", diff --git a/dev/fluids/NitrousOxide.json b/dev/fluids/NitrousOxide.json index 178ba758..0f1d2dd0 100644 --- a/dev/fluids/NitrousOxide.json +++ b/dev/fluids/NitrousOxide.json @@ -121,14 +121,6 @@ } }, "CAS": "10024-97-2", - "CRITICAL": { - "T": 309.52, - "T_units": "K", - "p": 7245000.0, - "p_units": "Pa", - "rhomolar": 10270.000000000002, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": 0, @@ -259,5 +251,15 @@ } ], "NAME": "NitrousOxide", - "REFPROP_NAME": "N2O" + "REFPROP_NAME": "N2O", + "STATES": { + "critical": { + "T": 309.52, + "T_units": "K", + "p": 7245000.0, + "p_units": "Pa", + "rhomolar": 10270.000000000002, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/OrthoDeuterium.json b/dev/fluids/OrthoDeuterium.json index b866196d..e5aa088d 100644 --- a/dev/fluids/OrthoDeuterium.json +++ b/dev/fluids/OrthoDeuterium.json @@ -110,14 +110,6 @@ } }, "CAS": "7782-39-0o", - "CRITICAL": { - "T": 38.34, - "T_units": "K", - "p": 1679600.0, - "p_units": "Pa", - "rhomolar": 17230.0, - "rhomolar_units": "mol/m^3" - }, "EOS": [ { "BibTeX_CP0": "", @@ -329,5 +321,15 @@ } ], "NAME": "OrthoDeuterium", - "REFPROP_NAME": "N/A" + "REFPROP_NAME": "N/A", + "STATES": { + "critical": { + "T": 38.34, + "T_units": "K", + "p": 1679600.0, + "p_units": "Pa", + "rhomolar": 17230.0, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/OrthoHydrogen.json b/dev/fluids/OrthoHydrogen.json index ed91c437..adcd5f62 100644 --- a/dev/fluids/OrthoHydrogen.json +++ b/dev/fluids/OrthoHydrogen.json @@ -111,14 +111,6 @@ } }, "CAS": "1333-74-0o", - "CRITICAL": { - "T": 33.22, - "T_units": "K", - "p": 1310650.0, - "p_units": "Pa", - "rhomolar": 15444.540313699812, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": -1, @@ -291,5 +283,15 @@ } ], "NAME": "OrthoHydrogen", - "REFPROP_NAME": "ORTHOHYD" + "REFPROP_NAME": "ORTHOHYD", + "STATES": { + "critical": { + "T": 33.22, + "T_units": "K", + "p": 1310650.0, + "p_units": "Pa", + "rhomolar": 15444.540313699812, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/Oxygen.json b/dev/fluids/Oxygen.json index 4cd9bff0..1e4c3055 100644 --- a/dev/fluids/Oxygen.json +++ b/dev/fluids/Oxygen.json @@ -122,14 +122,6 @@ } }, "CAS": "7782-44-7", - "CRITICAL": { - "T": 154.581, - "T_units": "K", - "p": 5043000.0, - "p_units": "Pa", - "rhomolar": 13630.0, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": 0, @@ -371,6 +363,16 @@ ], "NAME": "Oxygen", "REFPROP_NAME": "OXYGEN", + "STATES": { + "critical": { + "T": 154.581, + "T_units": "K", + "p": 5043000.0, + "p_units": "Pa", + "rhomolar": 13630.0, + "rhomolar_units": "mol/m^3" + } + }, "TRANSPORT": { "conductivity": { "BibTeX": "Lemmon-IJT-2004", diff --git a/dev/fluids/ParaDeuterium.json b/dev/fluids/ParaDeuterium.json index fac3de93..f0b6eef2 100644 --- a/dev/fluids/ParaDeuterium.json +++ b/dev/fluids/ParaDeuterium.json @@ -110,14 +110,6 @@ } }, "CAS": "7782-39-0p", - "CRITICAL": { - "T": 38.34, - "T_units": "K", - "p": 1679600.0, - "p_units": "Pa", - "rhomolar": 17230.0, - "rhomolar_units": "mol/m^3" - }, "EOS": [ { "BibTeX_CP0": "", @@ -327,5 +319,15 @@ } ], "NAME": "ParaDeuterium", - "REFPROP_NAME": "N/A" + "REFPROP_NAME": "N/A", + "STATES": { + "critical": { + "T": 38.34, + "T_units": "K", + "p": 1679600.0, + "p_units": "Pa", + "rhomolar": 17230.0, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/ParaHydrogen.json b/dev/fluids/ParaHydrogen.json index b984cece..18b03f7b 100644 --- a/dev/fluids/ParaHydrogen.json +++ b/dev/fluids/ParaHydrogen.json @@ -122,14 +122,6 @@ } }, "CAS": "1333-74-0p", - "CRITICAL": { - "T": 32.938, - "T_units": "K", - "p": 1285800.0, - "p_units": "Pa", - "rhomolar": 15538.0, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": -1, @@ -309,6 +301,16 @@ ], "NAME": "ParaHydrogen", "REFPROP_NAME": "PARAHYD", + "STATES": { + "critical": { + "T": 32.938, + "T_units": "K", + "p": 1285800.0, + "p_units": "Pa", + "rhomolar": 15538.0, + "rhomolar_units": "mol/m^3" + } + }, "TRANSPORT": { "conductivity": { "BibTeX": "Assael-JPCRD-2011-Hydrogen", diff --git a/dev/fluids/Propylene.json b/dev/fluids/Propylene.json index be9e6370..d2e8840b 100644 --- a/dev/fluids/Propylene.json +++ b/dev/fluids/Propylene.json @@ -121,14 +121,6 @@ } }, "CAS": "115-07-1", - "CRITICAL": { - "T": 364.211, - "T_units": "K", - "p": 4555000.0, - "p_units": "Pa", - "rhomolar": 5457.0, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "A3", "FH": 4, @@ -347,5 +339,15 @@ } ], "NAME": "Propylene", - "REFPROP_NAME": "PROPYLEN" + "REFPROP_NAME": "PROPYLEN", + "STATES": { + "critical": { + "T": 364.211, + "T_units": "K", + "p": 4555000.0, + "p_units": "Pa", + "rhomolar": 5457.0, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/Propyne.json b/dev/fluids/Propyne.json index 722a324a..136d8ad7 100644 --- a/dev/fluids/Propyne.json +++ b/dev/fluids/Propyne.json @@ -121,14 +121,6 @@ } }, "CAS": "74-99-7", - "CRITICAL": { - "T": 402.38, - "T_units": "K", - "p": 5626000.0, - "p_units": "Pa", - "rhomolar": 6113.33, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": 4, @@ -330,5 +322,15 @@ } ], "NAME": "Propyne", - "REFPROP_NAME": "PROPYNE" + "REFPROP_NAME": "PROPYNE", + "STATES": { + "critical": { + "T": 402.38, + "T_units": "K", + "p": 5626000.0, + "p_units": "Pa", + "rhomolar": 6113.33, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/R11.json b/dev/fluids/R11.json index 6b28664d..18307f38 100644 --- a/dev/fluids/R11.json +++ b/dev/fluids/R11.json @@ -118,14 +118,6 @@ } }, "CAS": "75-69-4", - "CRITICAL": { - "T": 471.06, - "T_units": "K", - "p": 4394000.0, - "p_units": "Pa", - "rhomolar": 4113.0394269407725, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "A1", "FH": 1, @@ -285,5 +277,15 @@ } ], "NAME": "R11", - "REFPROP_NAME": "R11" + "REFPROP_NAME": "R11", + "STATES": { + "critical": { + "T": 471.06, + "T_units": "K", + "p": 4394000.0, + "p_units": "Pa", + "rhomolar": 4113.0394269407725, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/R113.json b/dev/fluids/R113.json index 1dd5333d..91779bfe 100644 --- a/dev/fluids/R113.json +++ b/dev/fluids/R113.json @@ -118,14 +118,6 @@ } }, "CAS": "76-13-1", - "CRITICAL": { - "T": 487.21, - "T_units": "K", - "p": 3392200.0, - "p_units": "Pa", - "rhomolar": 2988.6591060707137, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "A1", "FH": 0, @@ -288,5 +280,15 @@ } ], "NAME": "R113", - "REFPROP_NAME": "R113" + "REFPROP_NAME": "R113", + "STATES": { + "critical": { + "T": 487.21, + "T_units": "K", + "p": 3392200.0, + "p_units": "Pa", + "rhomolar": 2988.6591060707137, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/R114.json b/dev/fluids/R114.json index 1bbf6822..6e8e6786 100644 --- a/dev/fluids/R114.json +++ b/dev/fluids/R114.json @@ -118,14 +118,6 @@ } }, "CAS": "76-14-2", - "CRITICAL": { - "T": 418.83, - "T_units": "K", - "p": 3257000.0, - "p_units": "Pa", - "rhomolar": 3393.2000000000003, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "A1", "FH": 0, @@ -327,5 +319,15 @@ } ], "NAME": "R114", - "REFPROP_NAME": "R114" + "REFPROP_NAME": "R114", + "STATES": { + "critical": { + "T": 418.83, + "T_units": "K", + "p": 3257000.0, + "p_units": "Pa", + "rhomolar": 3393.2000000000003, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/R116.json b/dev/fluids/R116.json index 91db3049..00825743 100644 --- a/dev/fluids/R116.json +++ b/dev/fluids/R116.json @@ -120,14 +120,6 @@ } }, "CAS": "76-16-4", - "CRITICAL": { - "T": 293.03, - "T_units": "K", - "p": 3048000.0, - "p_units": "Pa", - "rhomolar": 4444.0, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "A1", "FH": 0, @@ -258,5 +250,15 @@ } ], "NAME": "R116", - "REFPROP_NAME": "R116" + "REFPROP_NAME": "R116", + "STATES": { + "critical": { + "T": 293.03, + "T_units": "K", + "p": 3048000.0, + "p_units": "Pa", + "rhomolar": 4444.0, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/R12.json b/dev/fluids/R12.json index d62620b5..745d9e84 100644 --- a/dev/fluids/R12.json +++ b/dev/fluids/R12.json @@ -120,14 +120,6 @@ } }, "CAS": "75-71-8", - "CRITICAL": { - "T": 385.12, - "T_units": "K", - "p": 4136100.0000000005, - "p_units": "Pa", - "rhomolar": 4672.781255944357, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "A1", "FH": 1, @@ -306,5 +298,15 @@ } ], "NAME": "R12", - "REFPROP_NAME": "R12" + "REFPROP_NAME": "R12", + "STATES": { + "critical": { + "T": 385.12, + "T_units": "K", + "p": 4136100.0000000005, + "p_units": "Pa", + "rhomolar": 4672.781255944357, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/R123.json b/dev/fluids/R123.json index 84e8651f..d2e246ea 100644 --- a/dev/fluids/R123.json +++ b/dev/fluids/R123.json @@ -118,14 +118,6 @@ } }, "CAS": "306-83-2", - "CRITICAL": { - "T": 456.82, - "T_units": "K", - "p": 3672000.0, - "p_units": "Pa", - "rhomolar": 3616.0098345005263, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "B1", "FH": 1, @@ -271,6 +263,16 @@ ], "NAME": "R123", "REFPROP_NAME": "R123", + "STATES": { + "critical": { + "T": 456.82, + "T_units": "K", + "p": 3672000.0, + "p_units": "Pa", + "rhomolar": 3616.0098345005263, + "rhomolar_units": "mol/m^3" + } + }, "TRANSPORT": { "conductivity": { "BibTeX": "Laesecke-IJR-1996", diff --git a/dev/fluids/R1233zd(E).json b/dev/fluids/R1233zd(E).json index 5b008241..12b828c6 100644 --- a/dev/fluids/R1233zd(E).json +++ b/dev/fluids/R1233zd(E).json @@ -111,14 +111,6 @@ } }, "CAS": "102687-65-0", - "CRITICAL": { - "T": 438.75, - "T_units": "K", - "p": 3570900.0, - "p_units": "Pa", - "rhomolar": 3670.0, - "rhomolar_units": "mol/m^3" - }, "EOS": [ { "BibTeX_CP0": "", @@ -297,5 +289,15 @@ } ], "NAME": "R1233zd(E)", - "REFPROP_NAME": "R1233ZD" + "REFPROP_NAME": "R1233ZD", + "STATES": { + "critical": { + "T": 438.75, + "T_units": "K", + "p": 3570900.0, + "p_units": "Pa", + "rhomolar": 3670.0, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/R1234yf.json b/dev/fluids/R1234yf.json index b8587f3c..ae39aba5 100644 --- a/dev/fluids/R1234yf.json +++ b/dev/fluids/R1234yf.json @@ -120,14 +120,6 @@ } }, "CAS": "754-12-1", - "CRITICAL": { - "T": 367.85, - "T_units": "K", - "p": 3382200.0, - "p_units": "Pa", - "rhomolar": 4170.0, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "A2L", "FH": 2, @@ -305,6 +297,16 @@ ], "NAME": "R1234yf", "REFPROP_NAME": "R1234YF", + "STATES": { + "critical": { + "T": 367.85, + "T_units": "K", + "p": 3382200.0, + "p_units": "Pa", + "rhomolar": 4170.0, + "rhomolar_units": "mol/m^3" + } + }, "TRANSPORT": { "conductivity": { "BibTeX": "Perkins-JCED-2011", diff --git a/dev/fluids/R1234ze(E).json b/dev/fluids/R1234ze(E).json index 10ec8044..3578e7c5 100644 --- a/dev/fluids/R1234ze(E).json +++ b/dev/fluids/R1234ze(E).json @@ -111,14 +111,6 @@ } }, "CAS": "29118-24-9", - "CRITICAL": { - "T": 382.52, - "T_units": "K", - "p": 3636250.0, - "p_units": "Pa", - "rhomolar": 4290.0, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": 2, @@ -300,6 +292,16 @@ ], "NAME": "R1234ze(E)", "REFPROP_NAME": "R1234ZE", + "STATES": { + "critical": { + "T": 382.52, + "T_units": "K", + "p": 3636250.0, + "p_units": "Pa", + "rhomolar": 4290.0, + "rhomolar_units": "mol/m^3" + } + }, "TRANSPORT": { "conductivity": { "BibTeX": "Perkins-JCED-2011", diff --git a/dev/fluids/R1234ze(Z).json b/dev/fluids/R1234ze(Z).json index 08c580be..7c24b366 100644 --- a/dev/fluids/R1234ze(Z).json +++ b/dev/fluids/R1234ze(Z).json @@ -109,14 +109,6 @@ } }, "CAS": "29118-25-0", - "CRITICAL": { - "T": 423.27, - "T_units": "K", - "p": 3533000.0, - "p_units": "Pa", - "rhomolar": 4121.303363626818, - "rhomolar_units": "mol/m^3" - }, "EOS": [ { "BibTeX_CP0": "", @@ -260,5 +252,15 @@ } ], "NAME": "R1234ze(Z)", - "REFPROP_NAME": "N/A" + "REFPROP_NAME": "N/A", + "STATES": { + "critical": { + "T": 423.27, + "T_units": "K", + "p": 3533000.0, + "p_units": "Pa", + "rhomolar": 4121.303363626818, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/R124.json b/dev/fluids/R124.json index ed1cd1a2..04f5a8d4 100644 --- a/dev/fluids/R124.json +++ b/dev/fluids/R124.json @@ -118,14 +118,6 @@ } }, "CAS": "2837-89-0", - "CRITICAL": { - "T": 395.425, - "T_units": "K", - "p": 3624295.0, - "p_units": "Pa", - "rhomolar": 4103.279546177282, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "A1", "FH": 1, @@ -295,6 +287,16 @@ ], "NAME": "R124", "REFPROP_NAME": "R124", + "STATES": { + "critical": { + "T": 395.425, + "T_units": "K", + "p": 3624295.0, + "p_units": "Pa", + "rhomolar": 4103.279546177282, + "rhomolar_units": "mol/m^3" + } + }, "TRANSPORT": { "conductivity": { "BibTeX": "", diff --git a/dev/fluids/R125.json b/dev/fluids/R125.json index dd2bac56..7b2bdf98 100644 --- a/dev/fluids/R125.json +++ b/dev/fluids/R125.json @@ -118,14 +118,6 @@ } }, "CAS": "354-33-6", - "CRITICAL": { - "T": 339.173, - "T_units": "K", - "p": 3617700.0, - "p_units": "Pa", - "rhomolar": 4779.0, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": 1, @@ -310,6 +302,16 @@ ], "NAME": "R125", "REFPROP_NAME": "R125", + "STATES": { + "critical": { + "T": 339.173, + "T_units": "K", + "p": 3617700.0, + "p_units": "Pa", + "rhomolar": 4779.0, + "rhomolar_units": "mol/m^3" + } + }, "TRANSPORT": { "conductivity": { "BibTeX": "Perkins-JCED-2006", diff --git a/dev/fluids/R13.json b/dev/fluids/R13.json index 271d84be..e62eb9cb 100644 --- a/dev/fluids/R13.json +++ b/dev/fluids/R13.json @@ -118,14 +118,6 @@ } }, "CAS": "75-72-9", - "CRITICAL": { - "T": 301.88, - "T_units": "K", - "p": 3879000.0, - "p_units": "Pa", - "rhomolar": 5580.0, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "A1", "FH": -1, @@ -327,5 +319,15 @@ } ], "NAME": "R13", - "REFPROP_NAME": "R13" + "REFPROP_NAME": "R13", + "STATES": { + "critical": { + "T": 301.88, + "T_units": "K", + "p": 3879000.0, + "p_units": "Pa", + "rhomolar": 5580.0, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/R134a.json b/dev/fluids/R134a.json index 68a85595..c9ae0899 100644 --- a/dev/fluids/R134a.json +++ b/dev/fluids/R134a.json @@ -120,14 +120,6 @@ } }, "CAS": "811-97-2", - "CRITICAL": { - "T": 374.21, - "T_units": "K", - "p": 4059280.0, - "p_units": "Pa", - "rhomolar": 5017.053, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "A1", "FH": 1, @@ -293,6 +285,16 @@ ], "NAME": "R134a", "REFPROP_NAME": "R134A", + "STATES": { + "critical": { + "T": 374.21, + "T_units": "K", + "p": 4059280.0, + "p_units": "Pa", + "rhomolar": 5017.053, + "rhomolar_units": "mol/m^3" + } + }, "TRANSPORT": { "viscosity": { "BibTeX": "Huber-IECR-2003", diff --git a/dev/fluids/R14.json b/dev/fluids/R14.json index 0ef0a2bd..67e15dd7 100644 --- a/dev/fluids/R14.json +++ b/dev/fluids/R14.json @@ -118,14 +118,6 @@ } }, "CAS": "75-73-0", - "CRITICAL": { - "T": 227.51, - "T_units": "K", - "p": 3750000.0, - "p_units": "Pa", - "rhomolar": 7109.4194, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": -1, @@ -321,5 +313,15 @@ } ], "NAME": "R14", - "REFPROP_NAME": "R14" + "REFPROP_NAME": "R14", + "STATES": { + "critical": { + "T": 227.51, + "T_units": "K", + "p": 3750000.0, + "p_units": "Pa", + "rhomolar": 7109.4194, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/R141b.json b/dev/fluids/R141b.json index 50ca1a7e..1444336a 100644 --- a/dev/fluids/R141b.json +++ b/dev/fluids/R141b.json @@ -122,14 +122,6 @@ } }, "CAS": "1717-00-6", - "CRITICAL": { - "T": 477.5, - "T_units": "K", - "p": 4212000.0, - "p_units": "Pa", - "rhomolar": 3921.0000000000005, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": 1, @@ -260,5 +252,15 @@ } ], "NAME": "R141b", - "REFPROP_NAME": "R141B" + "REFPROP_NAME": "R141B", + "STATES": { + "critical": { + "T": 477.5, + "T_units": "K", + "p": 4212000.0, + "p_units": "Pa", + "rhomolar": 3921.0000000000005, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/R142b.json b/dev/fluids/R142b.json index c9855fbd..9fde003a 100644 --- a/dev/fluids/R142b.json +++ b/dev/fluids/R142b.json @@ -120,14 +120,6 @@ } }, "CAS": "75-68-3", - "CRITICAL": { - "T": 410.26, - "T_units": "K", - "p": 4055000.0, - "p_units": "Pa", - "rhomolar": 4438.0, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "A2", "FH": 1, @@ -260,5 +252,15 @@ } ], "NAME": "R142b", - "REFPROP_NAME": "R142B" + "REFPROP_NAME": "R142B", + "STATES": { + "critical": { + "T": 410.26, + "T_units": "K", + "p": 4055000.0, + "p_units": "Pa", + "rhomolar": 4438.0, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/R143a.json b/dev/fluids/R143a.json index f98ac382..134af465 100644 --- a/dev/fluids/R143a.json +++ b/dev/fluids/R143a.json @@ -120,14 +120,6 @@ } }, "CAS": "420-46-2", - "CRITICAL": { - "T": 345.857, - "T_units": "K", - "p": 3761000.0, - "p_units": "Pa", - "rhomolar": 5128.45, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "A2", "FH": 1, @@ -293,5 +285,15 @@ } ], "NAME": "R143a", - "REFPROP_NAME": "R143A" + "REFPROP_NAME": "R143A", + "STATES": { + "critical": { + "T": 345.857, + "T_units": "K", + "p": 3761000.0, + "p_units": "Pa", + "rhomolar": 5128.45, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/R152A.json b/dev/fluids/R152A.json index ce7d402f..4a6f834e 100644 --- a/dev/fluids/R152A.json +++ b/dev/fluids/R152A.json @@ -120,14 +120,6 @@ } }, "CAS": "75-37-6", - "CRITICAL": { - "T": 386.411, - "T_units": "K", - "p": 4520000.0, - "p_units": "Pa", - "rhomolar": 5571.452362568319, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "A2", "FH": 4, @@ -265,6 +257,16 @@ ], "NAME": "R152A", "REFPROP_NAME": "R152A", + "STATES": { + "critical": { + "T": 386.411, + "T_units": "K", + "p": 4520000.0, + "p_units": "Pa", + "rhomolar": 5571.452362568319, + "rhomolar_units": "mol/m^3" + } + }, "TRANSPORT": { "conductivity": { "BibTeX": "Krauss-IJT-1996", diff --git a/dev/fluids/R161.json b/dev/fluids/R161.json index cde53658..3caf5cf8 100644 --- a/dev/fluids/R161.json +++ b/dev/fluids/R161.json @@ -121,14 +121,6 @@ } }, "CAS": "353-36-6", - "CRITICAL": { - "T": 375.25, - "T_units": "K", - "p": 5010000.0, - "p_units": "Pa", - "rhomolar": 6280.0, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": -1, @@ -309,5 +301,15 @@ } ], "NAME": "R161", - "REFPROP_NAME": "R161" + "REFPROP_NAME": "R161", + "STATES": { + "critical": { + "T": 375.25, + "T_units": "K", + "p": 5010000.0, + "p_units": "Pa", + "rhomolar": 6280.0, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/R21.json b/dev/fluids/R21.json index 1a45cc4f..592740aa 100644 --- a/dev/fluids/R21.json +++ b/dev/fluids/R21.json @@ -118,14 +118,6 @@ } }, "CAS": "75-43-4", - "CRITICAL": { - "T": 451.48, - "T_units": "K", - "p": 5181200.0, - "p_units": "Pa", - "rhomolar": 5110.765599999999, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "B1", "FH": -1, @@ -327,5 +319,15 @@ } ], "NAME": "R21", - "REFPROP_NAME": "R21" + "REFPROP_NAME": "R21", + "STATES": { + "critical": { + "T": 451.48, + "T_units": "K", + "p": 5181200.0, + "p_units": "Pa", + "rhomolar": 5110.765599999999, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/R218.json b/dev/fluids/R218.json index fbc90426..691d92a8 100644 --- a/dev/fluids/R218.json +++ b/dev/fluids/R218.json @@ -118,14 +118,6 @@ } }, "CAS": "76-19-7", - "CRITICAL": { - "T": 345.02, - "T_units": "K", - "p": 2640000.0, - "p_units": "Pa", - "rhomolar": 3340.0000000000005, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "A1", "FH": 1, @@ -256,5 +248,15 @@ } ], "NAME": "R218", - "REFPROP_NAME": "R218" + "REFPROP_NAME": "R218", + "STATES": { + "critical": { + "T": 345.02, + "T_units": "K", + "p": 2640000.0, + "p_units": "Pa", + "rhomolar": 3340.0000000000005, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/R22.json b/dev/fluids/R22.json index f565a853..16077704 100644 --- a/dev/fluids/R22.json +++ b/dev/fluids/R22.json @@ -120,14 +120,6 @@ } }, "CAS": "75-45-6", - "CRITICAL": { - "T": 369.295, - "T_units": "K", - "p": 4990000.0, - "p_units": "Pa", - "rhomolar": 6058.220000000001, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "A1", "FH": 1, @@ -385,5 +377,15 @@ } ], "NAME": "R22", - "REFPROP_NAME": "R22" + "REFPROP_NAME": "R22", + "STATES": { + "critical": { + "T": 369.295, + "T_units": "K", + "p": 4990000.0, + "p_units": "Pa", + "rhomolar": 6058.220000000001, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/R227EA.json b/dev/fluids/R227EA.json index 1a4d4a02..a47fcff4 100644 --- a/dev/fluids/R227EA.json +++ b/dev/fluids/R227EA.json @@ -124,14 +124,6 @@ } }, "CAS": "431-89-0", - "CRITICAL": { - "T": 374.9, - "T_units": "K", - "p": 2925000.0, - "p_units": "Pa", - "rhomolar": 3495.0, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "A1", "FH": 0, @@ -328,5 +320,15 @@ } ], "NAME": "R227EA", - "REFPROP_NAME": "R227EA" + "REFPROP_NAME": "R227EA", + "STATES": { + "critical": { + "T": 374.9, + "T_units": "K", + "p": 2925000.0, + "p_units": "Pa", + "rhomolar": 3495.0, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/R23.json b/dev/fluids/R23.json index 3d5f0438..70e94dc6 100644 --- a/dev/fluids/R23.json +++ b/dev/fluids/R23.json @@ -120,14 +120,6 @@ } }, "CAS": "75-46-7", - "CRITICAL": { - "T": 299.293, - "T_units": "K", - "p": 4832000.0, - "p_units": "Pa", - "rhomolar": 7519.999999999999, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "A1", "FH": 1, @@ -281,6 +273,16 @@ ], "NAME": "R23", "REFPROP_NAME": "R23", + "STATES": { + "critical": { + "T": 299.293, + "T_units": "K", + "p": 4832000.0, + "p_units": "Pa", + "rhomolar": 7519.999999999999, + "rhomolar_units": "mol/m^3" + } + }, "TRANSPORT": { "conductivity": { "BibTeX": "Shan-ASHRAE-2000", diff --git a/dev/fluids/R236EA.json b/dev/fluids/R236EA.json index 291a5bf1..cce3c879 100644 --- a/dev/fluids/R236EA.json +++ b/dev/fluids/R236EA.json @@ -122,14 +122,6 @@ } }, "CAS": "431-63-0", - "CRITICAL": { - "T": 412.44, - "T_units": "K", - "p": 3420000.0, - "p_units": "Pa", - "rhomolar": 3715.9999999999995, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": -1, @@ -306,5 +298,15 @@ } ], "NAME": "R236EA", - "REFPROP_NAME": "R236EA" + "REFPROP_NAME": "R236EA", + "STATES": { + "critical": { + "T": 412.44, + "T_units": "K", + "p": 3420000.0, + "p_units": "Pa", + "rhomolar": 3715.9999999999995, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/R236FA.json b/dev/fluids/R236FA.json index 3dc475d7..b6d2f360 100644 --- a/dev/fluids/R236FA.json +++ b/dev/fluids/R236FA.json @@ -120,14 +120,6 @@ } }, "CAS": "690-39-1", - "CRITICAL": { - "T": 398.07, - "T_units": "K", - "p": 3200000.0, - "p_units": "Pa", - "rhomolar": 3626.0, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "A1", "FH": 0, @@ -302,5 +294,15 @@ } ], "NAME": "R236FA", - "REFPROP_NAME": "R236FA" + "REFPROP_NAME": "R236FA", + "STATES": { + "critical": { + "T": 398.07, + "T_units": "K", + "p": 3200000.0, + "p_units": "Pa", + "rhomolar": 3626.0, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/R245fa.json b/dev/fluids/R245fa.json index 1e93a4a4..11f77d97 100644 --- a/dev/fluids/R245fa.json +++ b/dev/fluids/R245fa.json @@ -124,14 +124,6 @@ } }, "CAS": "460-73-1", - "CRITICAL": { - "T": 427.16, - "T_units": "K", - "p": 3651000.0, - "p_units": "Pa", - "rhomolar": 3849.9999999999995, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "B1", "FH": 0, @@ -262,5 +254,15 @@ } ], "NAME": "R245fa", - "REFPROP_NAME": "R245FA" + "REFPROP_NAME": "R245FA", + "STATES": { + "critical": { + "T": 427.16, + "T_units": "K", + "p": 3651000.0, + "p_units": "Pa", + "rhomolar": 3849.9999999999995, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/R32.json b/dev/fluids/R32.json index 6b7f2aa7..336525d1 100644 --- a/dev/fluids/R32.json +++ b/dev/fluids/R32.json @@ -118,14 +118,6 @@ } }, "CAS": "75-10-5", - "CRITICAL": { - "T": 351.255, - "T_units": "K", - "p": 5782000.0, - "p_units": "Pa", - "rhomolar": 8150.084599999999, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "A2", "FH": 4, @@ -286,5 +278,15 @@ } ], "NAME": "R32", - "REFPROP_NAME": "R32" + "REFPROP_NAME": "R32", + "STATES": { + "critical": { + "T": 351.255, + "T_units": "K", + "p": 5782000.0, + "p_units": "Pa", + "rhomolar": 8150.084599999999, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/R365MFC.json b/dev/fluids/R365MFC.json index 3285522c..74a0d8e6 100644 --- a/dev/fluids/R365MFC.json +++ b/dev/fluids/R365MFC.json @@ -120,14 +120,6 @@ } }, "CAS": "406-58-6", - "CRITICAL": { - "T": 460.0, - "T_units": "K", - "p": 3266000.0, - "p_units": "Pa", - "rhomolar": 3200.0, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": -1, @@ -303,5 +295,15 @@ } ], "NAME": "R365MFC", - "REFPROP_NAME": "R365MFC" + "REFPROP_NAME": "R365MFC", + "STATES": { + "critical": { + "T": 460.0, + "T_units": "K", + "p": 3266000.0, + "p_units": "Pa", + "rhomolar": 3200.0, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/R404A.json b/dev/fluids/R404A.json index 4befa7aa..88b3b9d2 100644 --- a/dev/fluids/R404A.json +++ b/dev/fluids/R404A.json @@ -109,14 +109,6 @@ } }, "CAS": "R404A.PPF", - "CRITICAL": { - "T": 345.27, - "T_units": "K", - "p": 3734800.0, - "p_units": "Pa", - "rhomolar": 4939.999999999999, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "A1", "FH": 1, @@ -297,6 +289,16 @@ ], "NAME": "R404A", "REFPROP_NAME": "R404A", + "STATES": { + "critical": { + "T": 345.27, + "T_units": "K", + "p": 3734800.0, + "p_units": "Pa", + "rhomolar": 4939.999999999999, + "rhomolar_units": "mol/m^3" + } + }, "TRANSPORT": { "conductivity": { "BibTeX": "Geller-PURDUE-2001", diff --git a/dev/fluids/R407C.json b/dev/fluids/R407C.json index 4e9e0136..de727dca 100644 --- a/dev/fluids/R407C.json +++ b/dev/fluids/R407C.json @@ -109,14 +109,6 @@ } }, "CAS": "R407C.PPF", - "CRITICAL": { - "T": 359.345, - "T_units": "K", - "p": 4631700.0, - "p_units": "Pa", - "rhomolar": 5260.000046401775, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "A1", "FH": 1, @@ -293,6 +285,16 @@ ], "NAME": "R407C", "REFPROP_NAME": "R407C", + "STATES": { + "critical": { + "T": 359.345, + "T_units": "K", + "p": 4631700.0, + "p_units": "Pa", + "rhomolar": 5260.000046401775, + "rhomolar_units": "mol/m^3" + } + }, "TRANSPORT": { "conductivity": { "BibTeX": "Geller-PURDUE-2001", diff --git a/dev/fluids/R407F.json b/dev/fluids/R407F.json index 057efae3..662a88b3 100644 --- a/dev/fluids/R407F.json +++ b/dev/fluids/R407F.json @@ -107,14 +107,6 @@ } }, "CAS": "R407F.ppf", - "CRITICAL": { - "T": 355.804, - "T_units": "K", - "p": 4754610.0, - "p_units": "Pa", - "rhomolar": 5816.413452386901, - "rhomolar_units": "mol/m^3" - }, "EOS": [ { "BibTeX_CP0": "", @@ -251,5 +243,15 @@ } ], "NAME": "R407F", - "REFPROP_NAME": "N/A" + "REFPROP_NAME": "N/A", + "STATES": { + "critical": { + "T": 355.804, + "T_units": "K", + "p": 4754610.0, + "p_units": "Pa", + "rhomolar": 5816.413452386901, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/R41.json b/dev/fluids/R41.json index 7e086068..48f8cd0b 100644 --- a/dev/fluids/R41.json +++ b/dev/fluids/R41.json @@ -118,14 +118,6 @@ } }, "CAS": "593-53-3", - "CRITICAL": { - "T": 317.28, - "T_units": "K", - "p": 5897000.0, - "p_units": "Pa", - "rhomolar": 9300.0, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": 3, @@ -269,5 +261,15 @@ } ], "NAME": "R41", - "REFPROP_NAME": "R41" + "REFPROP_NAME": "R41", + "STATES": { + "critical": { + "T": 317.28, + "T_units": "K", + "p": 5897000.0, + "p_units": "Pa", + "rhomolar": 9300.0, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/R410A.json b/dev/fluids/R410A.json index 17098709..3fe2695a 100644 --- a/dev/fluids/R410A.json +++ b/dev/fluids/R410A.json @@ -109,14 +109,6 @@ } }, "CAS": "R410A.PPF", - "CRITICAL": { - "T": 344.494, - "T_units": "K", - "p": 4901200.0, - "p_units": "Pa", - "rhomolar": 6323.999999999999, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "A1", "FH": 1, @@ -293,6 +285,16 @@ ], "NAME": "R410A", "REFPROP_NAME": "R410A", + "STATES": { + "critical": { + "T": 344.494, + "T_units": "K", + "p": 4901200.0, + "p_units": "Pa", + "rhomolar": 6323.999999999999, + "rhomolar_units": "mol/m^3" + } + }, "TRANSPORT": { "conductivity": { "BibTeX": "Geller-PURDUE-2001", diff --git a/dev/fluids/R507A.json b/dev/fluids/R507A.json index 8ab6a7c9..2a9e8cac 100644 --- a/dev/fluids/R507A.json +++ b/dev/fluids/R507A.json @@ -109,14 +109,6 @@ } }, "CAS": "R507A.PPF", - "CRITICAL": { - "T": 343.765, - "T_units": "K", - "p": 3704900.0, - "p_units": "Pa", - "rhomolar": 4964.029650250053, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "A1", "FH": 1, @@ -303,6 +295,16 @@ ], "NAME": "R507A", "REFPROP_NAME": "R507A", + "STATES": { + "critical": { + "T": 343.765, + "T_units": "K", + "p": 3704900.0, + "p_units": "Pa", + "rhomolar": 4964.029650250053, + "rhomolar_units": "mol/m^3" + } + }, "TRANSPORT": { "conductivity": { "BibTeX": "Geller-PURDUE-2001", diff --git a/dev/fluids/RC318.json b/dev/fluids/RC318.json index 59797af7..80dbb1f0 100644 --- a/dev/fluids/RC318.json +++ b/dev/fluids/RC318.json @@ -118,14 +118,6 @@ } }, "CAS": "115-25-3", - "CRITICAL": { - "T": 388.38, - "T_units": "K", - "p": 2777500.0, - "p_units": "Pa", - "rhomolar": 3099.38, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "A1", "FH": 0, @@ -325,5 +317,15 @@ } ], "NAME": "RC318", - "REFPROP_NAME": "RC318" + "REFPROP_NAME": "RC318", + "STATES": { + "critical": { + "T": 388.38, + "T_units": "K", + "p": 2777500.0, + "p_units": "Pa", + "rhomolar": 3099.38, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/SES36.json b/dev/fluids/SES36.json index fae77d62..ffa525dd 100644 --- a/dev/fluids/SES36.json +++ b/dev/fluids/SES36.json @@ -107,14 +107,6 @@ } }, "CAS": "SES36.ppf", - "CRITICAL": { - "T": 450.7, - "T_units": "K", - "p": 2849000.0, - "p_units": "Pa", - "rhomolar": 2800.0, - "rhomolar_units": "mol/m^3" - }, "EOS": [ { "BibTeX_CP0": "", @@ -273,5 +265,15 @@ } ], "NAME": "SES36", - "REFPROP_NAME": "SES36" + "REFPROP_NAME": "SES36", + "STATES": { + "critical": { + "T": 450.7, + "T_units": "K", + "p": 2849000.0, + "p_units": "Pa", + "rhomolar": 2800.0, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/SulfurDioxide.json b/dev/fluids/SulfurDioxide.json index e744204a..ad13aebe 100644 --- a/dev/fluids/SulfurDioxide.json +++ b/dev/fluids/SulfurDioxide.json @@ -125,14 +125,6 @@ } }, "CAS": "7446-09-5", - "CRITICAL": { - "T": 430.64, - "T_units": "K", - "p": 7884000.0, - "p_units": "Pa", - "rhomolar": 8195.0, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "B1", "FH": 0, @@ -270,5 +262,15 @@ } ], "NAME": "SulfurDioxide", - "REFPROP_NAME": "SO2" + "REFPROP_NAME": "SO2", + "STATES": { + "critical": { + "T": 430.64, + "T_units": "K", + "p": 7884000.0, + "p_units": "Pa", + "rhomolar": 8195.0, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/SulfurHexafluoride.json b/dev/fluids/SulfurHexafluoride.json index e9e8872e..dfd4533f 100644 --- a/dev/fluids/SulfurHexafluoride.json +++ b/dev/fluids/SulfurHexafluoride.json @@ -123,14 +123,6 @@ } }, "CAS": "2551-62-4", - "CRITICAL": { - "T": 318.7232, - "T_units": "K", - "p": 3754983.0, - "p_units": "Pa", - "rhomolar": 5082.317411198119, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": 0, @@ -423,6 +415,16 @@ ], "NAME": "SulfurHexafluoride", "REFPROP_NAME": "SF6", + "STATES": { + "critical": { + "T": 318.7232, + "T_units": "K", + "p": 3754983.0, + "p_units": "Pa", + "rhomolar": 5082.317411198119, + "rhomolar_units": "mol/m^3" + } + }, "TRANSPORT": { "conductivity": { "BibTeX": "Assael-JPCRD-2012-SF6", diff --git a/dev/fluids/Toluene.json b/dev/fluids/Toluene.json index 8af8516a..ceda26dc 100644 --- a/dev/fluids/Toluene.json +++ b/dev/fluids/Toluene.json @@ -121,14 +121,6 @@ } }, "CAS": "108-88-3", - "CRITICAL": { - "T": 591.75, - "T_units": "K", - "p": 4126000.0, - "p_units": "Pa", - "rhomolar": 3169.0, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": 3, @@ -264,6 +256,16 @@ ], "NAME": "Toluene", "REFPROP_NAME": "TOLUENE", + "STATES": { + "critical": { + "T": 591.75, + "T_units": "K", + "p": 4126000.0, + "p_units": "Pa", + "rhomolar": 3169.0, + "rhomolar_units": "mol/m^3" + } + }, "TRANSPORT": { "conductivity": { "BibTeX": "Assael-JPCRD-2012-Toluene", diff --git a/dev/fluids/Water.json b/dev/fluids/Water.json index eaa2e31d..95bc8ece 100644 --- a/dev/fluids/Water.json +++ b/dev/fluids/Water.json @@ -125,14 +125,6 @@ } }, "CAS": "7732-18-5", - "CRITICAL": { - "T": 647.096, - "T_units": "K", - "p": 22064000.0, - "p_units": "Pa", - "rhomolar": 17873.72799560906, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "A1", "FH": 0, @@ -497,6 +489,16 @@ ], "NAME": "Water", "REFPROP_NAME": "WATER", + "STATES": { + "critical": { + "T": 647.096, + "T_units": "K", + "p": 22064000.0, + "p_units": "Pa", + "rhomolar": 17873.72799560906, + "rhomolar_units": "mol/m^3" + } + }, "TRANSPORT": { "conductivity": { "BibTeX": "Huber-JPCRD-2012", diff --git a/dev/fluids/Xenon.json b/dev/fluids/Xenon.json index cf717e12..2a901533 100644 --- a/dev/fluids/Xenon.json +++ b/dev/fluids/Xenon.json @@ -124,14 +124,6 @@ } }, "CAS": "7440-63-3", - "CRITICAL": { - "T": 289.733, - "T_units": "K", - "p": 5842000.0, - "p_units": "Pa", - "rhomolar": 8400.0, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": 0, @@ -249,5 +241,15 @@ } ], "NAME": "Xenon", - "REFPROP_NAME": "XENON" + "REFPROP_NAME": "XENON", + "STATES": { + "critical": { + "T": 289.733, + "T_units": "K", + "p": 5842000.0, + "p_units": "Pa", + "rhomolar": 8400.0, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/cis-2-Butene.json b/dev/fluids/cis-2-Butene.json index e1e4efb6..7e0b8577 100644 --- a/dev/fluids/cis-2-Butene.json +++ b/dev/fluids/cis-2-Butene.json @@ -110,14 +110,6 @@ } }, "CAS": "590-18-1", - "CRITICAL": { - "T": 435.75, - "T_units": "K", - "p": 4225500.0, - "p_units": "Pa", - "rhomolar": 4244.0, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": 4, @@ -250,5 +242,15 @@ } ], "NAME": "cis-2-Butene", - "REFPROP_NAME": "C2BUTENE" + "REFPROP_NAME": "C2BUTENE", + "STATES": { + "critical": { + "T": 435.75, + "T_units": "K", + "p": 4225500.0, + "p_units": "Pa", + "rhomolar": 4244.0, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/m-Xylene.json b/dev/fluids/m-Xylene.json index bee39449..df23011c 100644 --- a/dev/fluids/m-Xylene.json +++ b/dev/fluids/m-Xylene.json @@ -111,14 +111,6 @@ } }, "CAS": "108-38-3", - "CRITICAL": { - "T": 616.89, - "T_units": "K", - "p": 3534600.0, - "p_units": "Pa", - "rhomolar": 2665.0, - "rhomolar_units": "mol/m^3" - }, "EOS": [ { "BibTeX_CP0": "", @@ -287,5 +279,15 @@ } ], "NAME": "m-Xylene", - "REFPROP_NAME": "MXYLENE" + "REFPROP_NAME": "MXYLENE", + "STATES": { + "critical": { + "T": 616.89, + "T_units": "K", + "p": 3534600.0, + "p_units": "Pa", + "rhomolar": 2665.0, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/n-Butane.json b/dev/fluids/n-Butane.json index 712e6c48..41198c64 100644 --- a/dev/fluids/n-Butane.json +++ b/dev/fluids/n-Butane.json @@ -123,14 +123,6 @@ } }, "CAS": "106-97-8", - "CRITICAL": { - "T": 425.125, - "T_units": "K", - "p": 3796000.0, - "p_units": "Pa", - "rhomolar": 3922.7696129878086, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "A3", "FH": 4, @@ -345,6 +337,16 @@ ], "NAME": "n-Butane", "REFPROP_NAME": "BUTANE", + "STATES": { + "critical": { + "T": 425.125, + "T_units": "K", + "p": 3796000.0, + "p_units": "Pa", + "rhomolar": 3922.7696129878086, + "rhomolar_units": "mol/m^3" + } + }, "TRANSPORT": { "conductivity": { "BibTeX": "Perkins-JCED-2002-nButane", diff --git a/dev/fluids/n-Decane.json b/dev/fluids/n-Decane.json index abbce41d..7b008823 100644 --- a/dev/fluids/n-Decane.json +++ b/dev/fluids/n-Decane.json @@ -123,14 +123,6 @@ } }, "CAS": "124-18-5", - "CRITICAL": { - "T": 617.7, - "T_units": "K", - "p": 2103000.0, - "p_units": "Pa", - "rhomolar": 1640.0000000000002, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": 2, @@ -264,6 +256,16 @@ ], "NAME": "n-Decane", "REFPROP_NAME": "DECANE", + "STATES": { + "critical": { + "T": 617.7, + "T_units": "K", + "p": 2103000.0, + "p_units": "Pa", + "rhomolar": 1640.0000000000002, + "rhomolar_units": "mol/m^3" + } + }, "TRANSPORT": { "conductivity": { "BibTeX": "Huber-FPE-2005", diff --git a/dev/fluids/n-Dodecane.json b/dev/fluids/n-Dodecane.json index 98904bd6..89f13405 100644 --- a/dev/fluids/n-Dodecane.json +++ b/dev/fluids/n-Dodecane.json @@ -125,14 +125,6 @@ } }, "CAS": "112-40-3", - "CRITICAL": { - "T": 658.1, - "T_units": "K", - "p": 1817000.0, - "p_units": "Pa", - "rhomolar": 1330.0, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": 2, @@ -272,6 +264,16 @@ ], "NAME": "n-Dodecane", "REFPROP_NAME": "C12", + "STATES": { + "critical": { + "T": 658.1, + "T_units": "K", + "p": 1817000.0, + "p_units": "Pa", + "rhomolar": 1330.0, + "rhomolar_units": "mol/m^3" + } + }, "TRANSPORT": { "conductivity": { "BibTeX": "Huber-FPE-2005", diff --git a/dev/fluids/n-Heptane.json b/dev/fluids/n-Heptane.json index b61baad4..a6924166 100644 --- a/dev/fluids/n-Heptane.json +++ b/dev/fluids/n-Heptane.json @@ -125,14 +125,6 @@ } }, "CAS": "142-82-5", - "CRITICAL": { - "T": 540.13, - "T_units": "K", - "p": 2736000.0, - "p_units": "Pa", - "rhomolar": 2315.3230474441625, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": 3, @@ -281,6 +273,16 @@ ], "NAME": "n-Heptane", "REFPROP_NAME": "HEPTANE", + "STATES": { + "critical": { + "T": 540.13, + "T_units": "K", + "p": 2736000.0, + "p_units": "Pa", + "rhomolar": 2315.3230474441625, + "rhomolar_units": "mol/m^3" + } + }, "TRANSPORT": { "conductivity": { "BibTeX": "Assael-JPCRD-2013-Heptane", diff --git a/dev/fluids/n-Hexane.json b/dev/fluids/n-Hexane.json index 2ad4695f..01ffc89a 100644 --- a/dev/fluids/n-Hexane.json +++ b/dev/fluids/n-Hexane.json @@ -125,14 +125,6 @@ } }, "CAS": "110-54-3", - "CRITICAL": { - "T": 507.82, - "T_units": "K", - "p": 3034000.0, - "p_units": "Pa", - "rhomolar": 2705.877875067769, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": 3, @@ -281,6 +273,16 @@ ], "NAME": "n-Hexane", "REFPROP_NAME": "HEXANE", + "STATES": { + "critical": { + "T": 507.82, + "T_units": "K", + "p": 3034000.0, + "p_units": "Pa", + "rhomolar": 2705.877875067769, + "rhomolar_units": "mol/m^3" + } + }, "TRANSPORT": { "conductivity": { "BibTeX": "Assael-JPCRD-2013-Hexane", diff --git a/dev/fluids/n-Nonane.json b/dev/fluids/n-Nonane.json index fef68469..f2007c8b 100644 --- a/dev/fluids/n-Nonane.json +++ b/dev/fluids/n-Nonane.json @@ -122,14 +122,6 @@ } }, "CAS": "111-84-2", - "CRITICAL": { - "T": 594.55, - "T_units": "K", - "p": 2281000.0, - "p_units": "Pa", - "rhomolar": 1810.0, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": 3, @@ -263,6 +255,16 @@ ], "NAME": "n-Nonane", "REFPROP_NAME": "NONANE", + "STATES": { + "critical": { + "T": 594.55, + "T_units": "K", + "p": 2281000.0, + "p_units": "Pa", + "rhomolar": 1810.0, + "rhomolar_units": "mol/m^3" + } + }, "TRANSPORT": { "conductivity": { "BibTeX": "Huber-FPE-2005", diff --git a/dev/fluids/n-Octane.json b/dev/fluids/n-Octane.json index de7d61c4..3ecf246d 100644 --- a/dev/fluids/n-Octane.json +++ b/dev/fluids/n-Octane.json @@ -127,14 +127,6 @@ } }, "CAS": "111-65-9", - "CRITICAL": { - "T": 569.32, - "T_units": "K", - "p": 2497000.0, - "p_units": "Pa", - "rhomolar": 2056.4, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": 3, @@ -283,6 +275,16 @@ ], "NAME": "n-Octane", "REFPROP_NAME": "OCTANE", + "STATES": { + "critical": { + "T": 569.32, + "T_units": "K", + "p": 2497000.0, + "p_units": "Pa", + "rhomolar": 2056.4, + "rhomolar_units": "mol/m^3" + } + }, "TRANSPORT": { "conductivity": { "BibTeX": "Huber-FPE-2005", diff --git a/dev/fluids/n-Pentane.json b/dev/fluids/n-Pentane.json index 70623848..b5b2afd6 100644 --- a/dev/fluids/n-Pentane.json +++ b/dev/fluids/n-Pentane.json @@ -128,14 +128,6 @@ } }, "CAS": "109-66-0", - "CRITICAL": { - "T": 469.7, - "T_units": "K", - "p": 3370000.0, - "p_units": "Pa", - "rhomolar": 3215.5775884221466, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": 4, @@ -283,5 +275,15 @@ } ], "NAME": "n-Pentane", - "REFPROP_NAME": "PENTANE" + "REFPROP_NAME": "PENTANE", + "STATES": { + "critical": { + "T": 469.7, + "T_units": "K", + "p": 3370000.0, + "p_units": "Pa", + "rhomolar": 3215.5775884221466, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/n-Propane.json b/dev/fluids/n-Propane.json index ef61f7e2..c4eec390 100644 --- a/dev/fluids/n-Propane.json +++ b/dev/fluids/n-Propane.json @@ -127,14 +127,6 @@ } }, "CAS": "74-98-6", - "CRITICAL": { - "T": 369.89, - "T_units": "K", - "p": 4251200.0, - "p_units": "Pa", - "rhomolar": 5000.000000000001, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "A3", "FH": 4, @@ -330,6 +322,16 @@ ], "NAME": "n-Propane", "REFPROP_NAME": "PROPANE", + "STATES": { + "critical": { + "T": 369.89, + "T_units": "K", + "p": 4251200.0, + "p_units": "Pa", + "rhomolar": 5000.000000000001, + "rhomolar_units": "mol/m^3" + } + }, "TRANSPORT": { "conductivity": { "BibTeX": "Marsh-JCED-2002", diff --git a/dev/fluids/n-Undecane.json b/dev/fluids/n-Undecane.json index e76f613f..87106ac8 100644 --- a/dev/fluids/n-Undecane.json +++ b/dev/fluids/n-Undecane.json @@ -112,14 +112,6 @@ } }, "CAS": "1120-21-4", - "CRITICAL": { - "T": 638.8, - "T_units": "K", - "p": 1990400.0, - "p_units": "Pa", - "rhomolar": 1514.9168636385564, - "rhomolar_units": "mol/m^3" - }, "EOS": [ { "BibTeX_CP0": "", @@ -261,5 +253,15 @@ } ], "NAME": "n-Undecane", - "REFPROP_NAME": "C11" + "REFPROP_NAME": "C11", + "STATES": { + "critical": { + "T": 638.8, + "T_units": "K", + "p": 1990400.0, + "p_units": "Pa", + "rhomolar": 1514.9168636385564, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/o-Xylene.json b/dev/fluids/o-Xylene.json index 77b40652..84868306 100644 --- a/dev/fluids/o-Xylene.json +++ b/dev/fluids/o-Xylene.json @@ -111,14 +111,6 @@ } }, "CAS": "95-47-6", - "CRITICAL": { - "T": 630.259, - "T_units": "K", - "p": 3737500.0, - "p_units": "Pa", - "rhomolar": 2684.5000000000005, - "rhomolar_units": "mol/m^3" - }, "EOS": [ { "BibTeX_CP0": "", @@ -285,5 +277,15 @@ } ], "NAME": "o-Xylene", - "REFPROP_NAME": "OXYLENE" + "REFPROP_NAME": "OXYLENE", + "STATES": { + "critical": { + "T": 630.259, + "T_units": "K", + "p": 3737500.0, + "p_units": "Pa", + "rhomolar": 2684.5000000000005, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/p-Xylene.json b/dev/fluids/p-Xylene.json index c0d4a0bb..6fddbd8b 100644 --- a/dev/fluids/p-Xylene.json +++ b/dev/fluids/p-Xylene.json @@ -111,14 +111,6 @@ } }, "CAS": "106-42-3", - "CRITICAL": { - "T": 616.168, - "T_units": "K", - "p": 3531500.0, - "p_units": "Pa", - "rhomolar": 2693.92, - "rhomolar_units": "mol/m^3" - }, "EOS": [ { "BibTeX_CP0": "", @@ -285,5 +277,15 @@ } ], "NAME": "p-Xylene", - "REFPROP_NAME": "PXYLENE" + "REFPROP_NAME": "PXYLENE", + "STATES": { + "critical": { + "T": 616.168, + "T_units": "K", + "p": 3531500.0, + "p_units": "Pa", + "rhomolar": 2693.92, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file diff --git a/dev/fluids/trans-2-Butene.json b/dev/fluids/trans-2-Butene.json index 05fb3ba8..01cbafa9 100644 --- a/dev/fluids/trans-2-Butene.json +++ b/dev/fluids/trans-2-Butene.json @@ -110,14 +110,6 @@ } }, "CAS": "624-64-6", - "CRITICAL": { - "T": 428.61, - "T_units": "K", - "p": 4027300.0, - "p_units": "Pa", - "rhomolar": 4213.0, - "rhomolar_units": "mol/m^3" - }, "ENVIRONMENTAL": { "ASHRAE34": "UNKNOWN", "FH": 4, @@ -250,5 +242,15 @@ } ], "NAME": "trans-2-Butene", - "REFPROP_NAME": "T2BUTENE" + "REFPROP_NAME": "T2BUTENE", + "STATES": { + "critical": { + "T": 428.61, + "T_units": "K", + "p": 4027300.0, + "p_units": "Pa", + "rhomolar": 4213.0, + "rhomolar_units": "mol/m^3" + } + } } \ No newline at end of file From 88ec40895c0561df2f5f1ff42ebba3695ec7fff8 Mon Sep 17 00:00:00 2001 From: Ian Bell Date: Fri, 6 Jun 2014 09:48:33 +0200 Subject: [PATCH 02/26] Added triple point states Signed-off-by: Ian Bell --- dev/fluids/1-Butene.json | 16 ++++++++++++++++ dev/fluids/AceticAcid.json | 16 ++++++++++++++++ dev/fluids/Acetone.json | 16 ++++++++++++++++ dev/fluids/Air.json | 16 ++++++++++++++++ dev/fluids/Ammonia.json | 16 ++++++++++++++++ dev/fluids/Argon.json | 16 ++++++++++++++++ dev/fluids/Benzene.json | 16 ++++++++++++++++ dev/fluids/CarbonDioxide.json | 16 ++++++++++++++++ dev/fluids/CarbonMonoxide.json | 16 ++++++++++++++++ dev/fluids/CarbonylSulfide.json | 16 ++++++++++++++++ dev/fluids/CycloHexane.json | 16 ++++++++++++++++ dev/fluids/CycloPropane.json | 4 +++- dev/fluids/Cyclopentane.json | 16 ++++++++++++++++ dev/fluids/D4.json | 16 ++++++++++++++++ dev/fluids/D5.json | 4 +++- dev/fluids/D6.json | 16 ++++++++++++++++ dev/fluids/Deuterium.json | 16 ++++++++++++++++ dev/fluids/DimethylCarbonate.json | 16 ++++++++++++++++ dev/fluids/DimethylEther.json | 16 ++++++++++++++++ dev/fluids/Ethane.json | 16 ++++++++++++++++ dev/fluids/Ethanol.json | 16 ++++++++++++++++ dev/fluids/EthylBenzene.json | 16 ++++++++++++++++ dev/fluids/Ethylene.json | 16 ++++++++++++++++ dev/fluids/Fluorine.json | 16 ++++++++++++++++ dev/fluids/HFE143m.json | 16 ++++++++++++++++ dev/fluids/Helium.json | 16 ++++++++++++++++ dev/fluids/Hydrogen.json | 16 ++++++++++++++++ dev/fluids/HydrogenSulfide.json | 16 ++++++++++++++++ dev/fluids/IsoButane.json | 16 ++++++++++++++++ dev/fluids/IsoButene.json | 16 ++++++++++++++++ dev/fluids/Isohexane.json | 16 ++++++++++++++++ dev/fluids/Isopentane.json | 16 ++++++++++++++++ dev/fluids/Krypton.json | 16 ++++++++++++++++ dev/fluids/MD2M.json | 16 ++++++++++++++++ dev/fluids/MD3M.json | 16 ++++++++++++++++ dev/fluids/MD4M.json | 4 +++- dev/fluids/MDM.json | 16 ++++++++++++++++ dev/fluids/MM.json | 4 +++- dev/fluids/Methane.json | 16 ++++++++++++++++ dev/fluids/Methanol.json | 16 ++++++++++++++++ dev/fluids/MethylLinoleate.json | 16 ++++++++++++++++ dev/fluids/MethylLinolenate.json | 16 ++++++++++++++++ dev/fluids/MethylOleate.json | 16 ++++++++++++++++ dev/fluids/MethylPalmitate.json | 16 ++++++++++++++++ dev/fluids/MethylStearate.json | 16 ++++++++++++++++ dev/fluids/Neon.json | 16 ++++++++++++++++ dev/fluids/Neopentane.json | 16 ++++++++++++++++ dev/fluids/Nitrogen.json | 16 ++++++++++++++++ dev/fluids/NitrousOxide.json | 16 ++++++++++++++++ dev/fluids/OrthoDeuterium.json | 16 ++++++++++++++++ dev/fluids/OrthoHydrogen.json | 16 ++++++++++++++++ dev/fluids/Oxygen.json | 16 ++++++++++++++++ dev/fluids/ParaDeuterium.json | 16 ++++++++++++++++ dev/fluids/ParaHydrogen.json | 16 ++++++++++++++++ dev/fluids/Propylene.json | 16 ++++++++++++++++ dev/fluids/Propyne.json | 4 +++- dev/fluids/R11.json | 16 ++++++++++++++++ dev/fluids/R113.json | 16 ++++++++++++++++ dev/fluids/R114.json | 4 +++- dev/fluids/R116.json | 16 ++++++++++++++++ dev/fluids/R12.json | 16 ++++++++++++++++ dev/fluids/R123.json | 16 ++++++++++++++++ dev/fluids/R1233zd(E).json | 16 ++++++++++++++++ dev/fluids/R1234yf.json | 16 ++++++++++++++++ dev/fluids/R1234ze(E).json | 16 ++++++++++++++++ dev/fluids/R1234ze(Z).json | 16 ++++++++++++++++ dev/fluids/R124.json | 4 +++- dev/fluids/R125.json | 16 ++++++++++++++++ dev/fluids/R13.json | 4 +++- dev/fluids/R134a.json | 16 ++++++++++++++++ dev/fluids/R14.json | 4 +++- dev/fluids/R141b.json | 16 ++++++++++++++++ dev/fluids/R142b.json | 16 ++++++++++++++++ dev/fluids/R143a.json | 16 ++++++++++++++++ dev/fluids/R152A.json | 16 ++++++++++++++++ dev/fluids/R161.json | 16 ++++++++++++++++ dev/fluids/R21.json | 4 +++- dev/fluids/R218.json | 16 ++++++++++++++++ dev/fluids/R22.json | 16 ++++++++++++++++ dev/fluids/R227EA.json | 16 ++++++++++++++++ dev/fluids/R23.json | 16 ++++++++++++++++ dev/fluids/R236EA.json | 4 +++- dev/fluids/R236FA.json | 16 ++++++++++++++++ dev/fluids/R245fa.json | 16 ++++++++++++++++ dev/fluids/R32.json | 16 ++++++++++++++++ dev/fluids/R365MFC.json | 16 ++++++++++++++++ dev/fluids/R404A.json | 16 ++++++++++++++++ dev/fluids/R407C.json | 16 ++++++++++++++++ dev/fluids/R407F.json | 16 ++++++++++++++++ dev/fluids/R41.json | 16 ++++++++++++++++ dev/fluids/R410A.json | 16 ++++++++++++++++ dev/fluids/R507A.json | 16 ++++++++++++++++ dev/fluids/RC318.json | 16 ++++++++++++++++ dev/fluids/SES36.json | 16 ++++++++++++++++ dev/fluids/SulfurDioxide.json | 16 ++++++++++++++++ dev/fluids/SulfurHexafluoride.json | 16 ++++++++++++++++ dev/fluids/Toluene.json | 16 ++++++++++++++++ dev/fluids/Water.json | 16 ++++++++++++++++ dev/fluids/Xenon.json | 16 ++++++++++++++++ dev/fluids/cis-2-Butene.json | 16 ++++++++++++++++ dev/fluids/m-Xylene.json | 16 ++++++++++++++++ dev/fluids/n-Butane.json | 16 ++++++++++++++++ dev/fluids/n-Decane.json | 16 ++++++++++++++++ dev/fluids/n-Dodecane.json | 16 ++++++++++++++++ dev/fluids/n-Heptane.json | 16 ++++++++++++++++ dev/fluids/n-Hexane.json | 16 ++++++++++++++++ dev/fluids/n-Nonane.json | 16 ++++++++++++++++ dev/fluids/n-Octane.json | 16 ++++++++++++++++ dev/fluids/n-Pentane.json | 16 ++++++++++++++++ dev/fluids/n-Propane.json | 16 ++++++++++++++++ dev/fluids/n-Undecane.json | 16 ++++++++++++++++ dev/fluids/o-Xylene.json | 16 ++++++++++++++++ dev/fluids/p-Xylene.json | 16 ++++++++++++++++ dev/fluids/trans-2-Butene.json | 16 ++++++++++++++++ 114 files changed, 1681 insertions(+), 11 deletions(-) diff --git a/dev/fluids/1-Butene.json b/dev/fluids/1-Butene.json index 4c629606..e73dc887 100644 --- a/dev/fluids/1-Butene.json +++ b/dev/fluids/1-Butene.json @@ -264,6 +264,22 @@ "p_units": "Pa", "rhomolar": 4240.0, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 87.8, + "T_units": "K", + "p": 5.945299459547533e-10, + "p_units": "Pa", + "rhomolar": 14581.857989478618, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 87.8, + "T_units": "K", + "p": 5.945299459547533e-10, + "p_units": "Pa", + "rhomolar": 8.144127114069056e-10, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/AceticAcid.json b/dev/fluids/AceticAcid.json index 58f79b58..38c7b34b 100644 --- a/dev/fluids/AceticAcid.json +++ b/dev/fluids/AceticAcid.json @@ -266,6 +266,22 @@ "p_units": "Pa", "rhomolar": 5844.938283446536, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 289.8, + "T_units": "K", + "p": 1.075589507812013, + "p_units": "Pa", + "rhomolar": 17521.28114508397, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 289.8, + "T_units": "K", + "p": 1.075589507812013, + "p_units": "Pa", + "rhomolar": 0.8334185536602265, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/Acetone.json b/dev/fluids/Acetone.json index 71ef8cd1..e178e419 100644 --- a/dev/fluids/Acetone.json +++ b/dev/fluids/Acetone.json @@ -266,6 +266,22 @@ "p_units": "Pa", "rhomolar": 4699.999999999999, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 178.5, + "T_units": "K", + "p": 0.002326486782481569, + "p_units": "Pa", + "rhomolar": 15722.96134426609, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 178.5, + "T_units": "K", + "p": 0.002326486782481569, + "p_units": "Pa", + "rhomolar": 0.001567650380630057, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/Air.json b/dev/fluids/Air.json index 5f4724fb..3620dab9 100644 --- a/dev/fluids/Air.json +++ b/dev/fluids/Air.json @@ -309,6 +309,22 @@ "p_units": "Pa", "rhomolar": 11830.8, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 59.75, + "T_units": "K", + "p": 5.2646378681251385, + "p_units": "Pa", + "rhomolar": 33066.64175205524, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 59.75, + "T_units": "K", + "p": 2.4316336588845036, + "p_units": "Pa", + "rhomolar": 4.906850672383319, + "rhomolar_units": "mol/m^3" } }, "TRANSPORT": { diff --git a/dev/fluids/Ammonia.json b/dev/fluids/Ammonia.json index f994081c..b0f5bd6e 100644 --- a/dev/fluids/Ammonia.json +++ b/dev/fluids/Ammonia.json @@ -300,6 +300,22 @@ "p_units": "Pa", "rhomolar": 13211.777154312385, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 195.495, + "T_units": "K", + "p": 6.091223107699592, + "p_units": "Pa", + "rhomolar": 43035.3392920732, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 195.495, + "T_units": "K", + "p": 6.091223107699592, + "p_units": "Pa", + "rhomolar": 3.76350602709112, + "rhomolar_units": "mol/m^3" } }, "TRANSPORT": { diff --git a/dev/fluids/Argon.json b/dev/fluids/Argon.json index 8cb15e42..51a929b7 100644 --- a/dev/fluids/Argon.json +++ b/dev/fluids/Argon.json @@ -392,6 +392,22 @@ "p_units": "Pa", "rhomolar": 13407.429658556124, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 83.806, + "T_units": "K", + "p": 68.89247707906286, + "p_units": "Pa", + "rhomolar": 35465.24383230812, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 83.806, + "T_units": "K", + "p": 68.89247707906286, + "p_units": "Pa", + "rhomolar": 101.49850850490478, + "rhomolar_units": "mol/m^3" } }, "TRANSPORT": { diff --git a/dev/fluids/Benzene.json b/dev/fluids/Benzene.json index c80f5aa4..5b676dad 100644 --- a/dev/fluids/Benzene.json +++ b/dev/fluids/Benzene.json @@ -307,6 +307,22 @@ "p_units": "Pa", "rhomolar": 3902.0, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 278.674, + "T_units": "K", + "p": 4.783772578048188, + "p_units": "Pa", + "rhomolar": 11446.465591920278, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 278.674, + "T_units": "K", + "p": 4.783772578048188, + "p_units": "Pa", + "rhomolar": 2.0716402525505235, + "rhomolar_units": "mol/m^3" } }, "TRANSPORT": { diff --git a/dev/fluids/CarbonDioxide.json b/dev/fluids/CarbonDioxide.json index 32cff981..a1ce523c 100644 --- a/dev/fluids/CarbonDioxide.json +++ b/dev/fluids/CarbonDioxide.json @@ -456,6 +456,22 @@ "p_units": "Pa", "rhomolar": 10624.906299999999, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 216.592, + "T_units": "K", + "p": 517.9643433349185, + "p_units": "Pa", + "rhomolar": 26777.277860212125, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 216.592, + "T_units": "K", + "p": 517.9643433349185, + "p_units": "Pa", + "rhomolar": 312.6777446892703, + "rhomolar_units": "mol/m^3" } }, "TRANSPORT": { diff --git a/dev/fluids/CarbonMonoxide.json b/dev/fluids/CarbonMonoxide.json index bcb69f63..38aa6761 100644 --- a/dev/fluids/CarbonMonoxide.json +++ b/dev/fluids/CarbonMonoxide.json @@ -265,6 +265,22 @@ "p_units": "Pa", "rhomolar": 10850.0, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 68.16, + "T_units": "K", + "p": 15.536876656377347, + "p_units": "Pa", + "rhomolar": 30329.705964719713, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 68.16, + "T_units": "K", + "p": 15.536876656377347, + "p_units": "Pa", + "rhomolar": 27.707433845423196, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/CarbonylSulfide.json b/dev/fluids/CarbonylSulfide.json index a67f488e..67dfeb29 100644 --- a/dev/fluids/CarbonylSulfide.json +++ b/dev/fluids/CarbonylSulfide.json @@ -262,6 +262,22 @@ "p_units": "Pa", "rhomolar": 7410.0, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 134.3, + "T_units": "K", + "p": 0.06443457746825784, + "p_units": "Pa", + "rhomolar": 22517.918912779165, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 134.3, + "T_units": "K", + "p": 0.06443457746825784, + "p_units": "Pa", + "rhomolar": 0.05771047185816631, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/CycloHexane.json b/dev/fluids/CycloHexane.json index f0d2397f..e0e02b70 100644 --- a/dev/fluids/CycloHexane.json +++ b/dev/fluids/CycloHexane.json @@ -347,6 +347,22 @@ "p_units": "Pa", "rhomolar": 3224.0, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 279.47, + "T_units": "K", + "p": 5.240240246526451, + "p_units": "Pa", + "rhomolar": 9403.362051842001, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 279.47, + "T_units": "K", + "p": 5.240240246526451, + "p_units": "Pa", + "rhomolar": 2.264530785370476, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/CycloPropane.json b/dev/fluids/CycloPropane.json index 6680a87a..15df0b06 100644 --- a/dev/fluids/CycloPropane.json +++ b/dev/fluids/CycloPropane.json @@ -302,6 +302,8 @@ "p_units": "Pa", "rhomolar": 6142.9149, "rhomolar_units": "mol/m^3" - } + }, + "triple_liquid": {}, + "triple_vapor": {} } } \ No newline at end of file diff --git a/dev/fluids/Cyclopentane.json b/dev/fluids/Cyclopentane.json index cf9ab2c7..8b682baf 100644 --- a/dev/fluids/Cyclopentane.json +++ b/dev/fluids/Cyclopentane.json @@ -289,6 +289,22 @@ "p_units": "Pa", "rhomolar": 3820.0000000000005, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 179.7, + "T_units": "K", + "p": 0.00885427141819524, + "p_units": "Pa", + "rhomolar": 12107.608792031857, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 179.7, + "T_units": "K", + "p": 0.00885427141819524, + "p_units": "Pa", + "rhomolar": 0.0059262178661649515, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/D4.json b/dev/fluids/D4.json index d77851f9..790508c4 100644 --- a/dev/fluids/D4.json +++ b/dev/fluids/D4.json @@ -263,6 +263,22 @@ "p_units": "Pa", "rhomolar": 1030.928, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 290.25, + "T_units": "K", + "p": 0.06960923766877697, + "p_units": "Pa", + "rhomolar": 3200.445098116998, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 290.25, + "T_units": "K", + "p": 0.06960923766877697, + "p_units": "Pa", + "rhomolar": 0.028853717844681662, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/D5.json b/dev/fluids/D5.json index cbb48924..df7b55a1 100644 --- a/dev/fluids/D5.json +++ b/dev/fluids/D5.json @@ -263,6 +263,8 @@ "p_units": "Pa", "rhomolar": 822.3684, "rhomolar_units": "mol/m^3" - } + }, + "triple_liquid": {}, + "triple_vapor": {} } } \ No newline at end of file diff --git a/dev/fluids/D6.json b/dev/fluids/D6.json index 41edb001..beba6421 100644 --- a/dev/fluids/D6.json +++ b/dev/fluids/D6.json @@ -254,6 +254,22 @@ "p_units": "Pa", "rhomolar": 627.2885477999996, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 270.2, + "T_units": "K", + "p": 0.00015975303819928407, + "p_units": "Pa", + "rhomolar": 2245.0762899076435, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 270.2, + "T_units": "K", + "p": 0.00015975303819928407, + "p_units": "Pa", + "rhomolar": 7.11098197032432e-05, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/Deuterium.json b/dev/fluids/Deuterium.json index 279c4028..0d8f926e 100644 --- a/dev/fluids/Deuterium.json +++ b/dev/fluids/Deuterium.json @@ -353,6 +353,22 @@ "p_units": "Pa", "rhomolar": 17230.0, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 18.724, + "T_units": "K", + "p": 17.1891019732537, + "p_units": "Pa", + "rhomolar": 43350.920890356414, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 18.724, + "T_units": "K", + "p": 17.1891019732537, + "p_units": "Pa", + "rhomolar": 112.95640342174914, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/DimethylCarbonate.json b/dev/fluids/DimethylCarbonate.json index acd4c02a..009f908d 100644 --- a/dev/fluids/DimethylCarbonate.json +++ b/dev/fluids/DimethylCarbonate.json @@ -311,6 +311,22 @@ "p_units": "Pa", "rhomolar": 4000.0, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 277.06, + "T_units": "K", + "p": 2.226523726360071, + "p_units": "Pa", + "rhomolar": 12111.201661172097, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 277.06, + "T_units": "K", + "p": 2.226523726360071, + "p_units": "Pa", + "rhomolar": 0.9680130259154924, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/DimethylEther.json b/dev/fluids/DimethylEther.json index b0d57a31..909b59e1 100644 --- a/dev/fluids/DimethylEther.json +++ b/dev/fluids/DimethylEther.json @@ -302,6 +302,22 @@ "p_units": "Pa", "rhomolar": 5940.000000000001, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 131.66, + "T_units": "K", + "p": 0.0022107283172852626, + "p_units": "Pa", + "rhomolar": 19149.523468676703, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 131.66, + "T_units": "K", + "p": 0.0022107283172852626, + "p_units": "Pa", + "rhomolar": 0.0020195317198284978, + "rhomolar_units": "mol/m^3" } }, "TRANSPORT": { diff --git a/dev/fluids/Ethane.json b/dev/fluids/Ethane.json index 9554fac2..42ca1a5a 100644 --- a/dev/fluids/Ethane.json +++ b/dev/fluids/Ethane.json @@ -430,6 +430,22 @@ "p_units": "Pa", "rhomolar": 6856.886685, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 90.368, + "T_units": "K", + "p": 0.0011421081151322327, + "p_units": "Pa", + "rhomolar": 21667.78455939388, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 90.368, + "T_units": "K", + "p": 0.0011421081151322327, + "p_units": "Pa", + "rhomolar": 0.0015200554552625017, + "rhomolar_units": "mol/m^3" } }, "TRANSPORT": { diff --git a/dev/fluids/Ethanol.json b/dev/fluids/Ethanol.json index 9a266f0e..eb8b312e 100644 --- a/dev/fluids/Ethanol.json +++ b/dev/fluids/Ethanol.json @@ -365,6 +365,22 @@ "p_units": "Pa", "rhomolar": 5930.0, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 159.1, + "T_units": "K", + "p": 7.350470774723326e-07, + "p_units": "Pa", + "rhomolar": 19729.11257931593, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 159.1, + "T_units": "K", + "p": 7.350470774723326e-07, + "p_units": "Pa", + "rhomolar": 5.556614984609347e-07, + "rhomolar_units": "mol/m^3" } }, "TRANSPORT": { diff --git a/dev/fluids/EthylBenzene.json b/dev/fluids/EthylBenzene.json index 85741fe7..9cae96fe 100644 --- a/dev/fluids/EthylBenzene.json +++ b/dev/fluids/EthylBenzene.json @@ -283,6 +283,22 @@ "p_units": "Pa", "rhomolar": 2741.016, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 178.2, + "T_units": "K", + "p": 4.0029613919817915e-06, + "p_units": "Pa", + "rhomolar": 9123.245960497055, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 178.2, + "T_units": "K", + "p": 4.0029613919817915e-06, + "p_units": "Pa", + "rhomolar": 2.7017119098181417e-06, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/Ethylene.json b/dev/fluids/Ethylene.json index 708a3d17..66e2c8b9 100644 --- a/dev/fluids/Ethylene.json +++ b/dev/fluids/Ethylene.json @@ -392,6 +392,22 @@ "p_units": "Pa", "rhomolar": 7636.76598074554, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 103.989, + "T_units": "K", + "p": 0.1220267638428971, + "p_units": "Pa", + "rhomolar": 23333.806692211565, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 103.989, + "T_units": "K", + "p": 0.1220267638428971, + "p_units": "Pa", + "rhomolar": 0.1411618295576975, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/Fluorine.json b/dev/fluids/Fluorine.json index ee03af60..6085bbde 100644 --- a/dev/fluids/Fluorine.json +++ b/dev/fluids/Fluorine.json @@ -392,6 +392,22 @@ "p_units": "Pa", "rhomolar": 15603.0, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 53.4811, + "T_units": "K", + "p": 0.2388103329299759, + "p_units": "Pa", + "rhomolar": 44917.31036907297, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 53.4811, + "T_units": "K", + "p": 0.2388103329299759, + "p_units": "Pa", + "rhomolar": 0.537248503917467, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/HFE143m.json b/dev/fluids/HFE143m.json index f3df557f..4a7ba82a 100644 --- a/dev/fluids/HFE143m.json +++ b/dev/fluids/HFE143m.json @@ -275,6 +275,22 @@ "p_units": "Pa", "rhomolar": 4648.140744, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 240.0, + "T_units": "K", + "p": 65.35939300696849, + "p_units": "Pa", + "rhomolar": 12615.354950558858, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 240.0, + "T_units": "K", + "p": 65.35939300696849, + "p_units": "Pa", + "rhomolar": 34.01804620551361, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/Helium.json b/dev/fluids/Helium.json index 2bf989ba..0992b24c 100644 --- a/dev/fluids/Helium.json +++ b/dev/fluids/Helium.json @@ -338,6 +338,22 @@ "p_units": "Pa", "rhomolar": 18130.0, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 2.1768, + "T_units": "K", + "p": 5.04275718944867, + "p_units": "Pa", + "rhomolar": 36459.66840252621, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 2.1768, + "T_units": "K", + "p": 5.04275718944867, + "p_units": "Pa", + "rhomolar": 293.3016136659702, + "rhomolar_units": "mol/m^3" } }, "TRANSPORT": { diff --git a/dev/fluids/Hydrogen.json b/dev/fluids/Hydrogen.json index 70b3fc77..fa4867d6 100644 --- a/dev/fluids/Hydrogen.json +++ b/dev/fluids/Hydrogen.json @@ -310,6 +310,22 @@ "p_units": "Pa", "rhomolar": 15508.0, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 13.957, + "T_units": "K", + "p": 7.357828141690358, + "p_units": "Pa", + "rhomolar": 38198.54161031631, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 13.957, + "T_units": "K", + "p": 7.357828141690358, + "p_units": "Pa", + "rhomolar": 64.41526917350258, + "rhomolar_units": "mol/m^3" } }, "TRANSPORT": { diff --git a/dev/fluids/HydrogenSulfide.json b/dev/fluids/HydrogenSulfide.json index adca547e..1774eb2c 100644 --- a/dev/fluids/HydrogenSulfide.json +++ b/dev/fluids/HydrogenSulfide.json @@ -267,6 +267,22 @@ "p_units": "Pa", "rhomolar": 10190.0, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 187.7, + "T_units": "K", + "p": 23.258855840736683, + "p_units": "Pa", + "rhomolar": 29116.326840626763, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 187.7, + "T_units": "K", + "p": 23.258855840736683, + "p_units": "Pa", + "rhomolar": 15.024228571877876, + "rhomolar_units": "mol/m^3" } }, "TRANSPORT": { diff --git a/dev/fluids/IsoButane.json b/dev/fluids/IsoButane.json index 962274c8..a259622d 100644 --- a/dev/fluids/IsoButane.json +++ b/dev/fluids/IsoButane.json @@ -348,6 +348,22 @@ "p_units": "Pa", "rhomolar": 3879.756788283995, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 113.73, + "T_units": "K", + "p": 2.2879446966082075e-05, + "p_units": "Pa", + "rhomolar": 12737.656182433244, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 113.73, + "T_units": "K", + "p": 2.2879446966082075e-05, + "p_units": "Pa", + "rhomolar": 2.4195571571567102e-05, + "rhomolar_units": "mol/m^3" } }, "TRANSPORT": { diff --git a/dev/fluids/IsoButene.json b/dev/fluids/IsoButene.json index f84e9d29..34cb50aa 100644 --- a/dev/fluids/IsoButene.json +++ b/dev/fluids/IsoButene.json @@ -262,6 +262,22 @@ "p_units": "Pa", "rhomolar": 4170.0, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 132.4, + "T_units": "K", + "p": 0.0006761899732718035, + "p_units": "Pa", + "rhomolar": 13666.751920875638, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 132.4, + "T_units": "K", + "p": 0.0006761899732718035, + "p_units": "Pa", + "rhomolar": 0.0006142550272163055, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/Isohexane.json b/dev/fluids/Isohexane.json index 4dc70b9a..caca3504 100644 --- a/dev/fluids/Isohexane.json +++ b/dev/fluids/Isohexane.json @@ -262,6 +262,22 @@ "p_units": "Pa", "rhomolar": 2715.0000000000005, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 119.6, + "T_units": "K", + "p": 7.673974446178324e-09, + "p_units": "Pa", + "rhomolar": 9370.782450632156, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 119.6, + "T_units": "K", + "p": 7.673974446178324e-09, + "p_units": "Pa", + "rhomolar": 7.71710650450467e-09, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/Isopentane.json b/dev/fluids/Isopentane.json index 4aeb26b8..c846a89f 100644 --- a/dev/fluids/Isopentane.json +++ b/dev/fluids/Isopentane.json @@ -263,6 +263,22 @@ "p_units": "Pa", "rhomolar": 3271.0, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 112.65, + "T_units": "K", + "p": 8.952745179434145e-08, + "p_units": "Pa", + "rhomolar": 10935.8893141883, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 112.65, + "T_units": "K", + "p": 8.952745179434145e-08, + "p_units": "Pa", + "rhomolar": 9.558513393991809e-08, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/Krypton.json b/dev/fluids/Krypton.json index 25168de7..703a3a0a 100644 --- a/dev/fluids/Krypton.json +++ b/dev/fluids/Krypton.json @@ -247,6 +247,22 @@ "p_units": "Pa", "rhomolar": 10850.0, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 115.77, + "T_units": "K", + "p": 73.502837475028, + "p_units": "Pa", + "rhomolar": 29197.32240678559, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 115.77, + "T_units": "K", + "p": 73.502837475028, + "p_units": "Pa", + "rhomolar": 78.4175234091632, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/MD2M.json b/dev/fluids/MD2M.json index b2864162..4d1bf9a8 100644 --- a/dev/fluids/MD2M.json +++ b/dev/fluids/MD2M.json @@ -254,6 +254,22 @@ "p_units": "Pa", "rhomolar": 914.6616014999984, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 205.2, + "T_units": "K", + "p": 4.7950993795487e-07, + "p_units": "Pa", + "rhomolar": 3032.1188560391715, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 205.2, + "T_units": "K", + "p": 4.7950993795487e-07, + "p_units": "Pa", + "rhomolar": 2.810512915459994e-07, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/MD3M.json b/dev/fluids/MD3M.json index 35f2c533..0a86f676 100644 --- a/dev/fluids/MD3M.json +++ b/dev/fluids/MD3M.json @@ -254,6 +254,22 @@ "p_units": "Pa", "rhomolar": 685.7981626999992, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 192.0, + "T_units": "K", + "p": 2.057747643530664e-10, + "p_units": "Pa", + "rhomolar": 2541.798960773628, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 192.0, + "T_units": "K", + "p": 2.057747643530664e-10, + "p_units": "Pa", + "rhomolar": 1.2890097703756894e-10, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/MD4M.json b/dev/fluids/MD4M.json index 728b07c8..b637553d 100644 --- a/dev/fluids/MD4M.json +++ b/dev/fluids/MD4M.json @@ -246,6 +246,8 @@ "p_units": "Pa", "rhomolar": 606.0605999999999, "rhomolar_units": "mol/m^3" - } + }, + "triple_liquid": {}, + "triple_vapor": {} } } \ No newline at end of file diff --git a/dev/fluids/MDM.json b/dev/fluids/MDM.json index 5c505be5..7f7d0a2a 100644 --- a/dev/fluids/MDM.json +++ b/dev/fluids/MDM.json @@ -254,6 +254,22 @@ "p_units": "Pa", "rhomolar": 1085.436621399999, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 187.2, + "T_units": "K", + "p": 7.991110509185762e-07, + "p_units": "Pa", + "rhomolar": 3930.8232636425755, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 187.2, + "T_units": "K", + "p": 7.991110509185762e-07, + "p_units": "Pa", + "rhomolar": 5.134127178430179e-07, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/MM.json b/dev/fluids/MM.json index 269ca8fa..4bc3d3ef 100644 --- a/dev/fluids/MM.json +++ b/dev/fluids/MM.json @@ -263,6 +263,8 @@ "p_units": "Pa", "rhomolar": 1589.825, "rhomolar_units": "mol/m^3" - } + }, + "triple_liquid": {}, + "triple_vapor": {} } } \ No newline at end of file diff --git a/dev/fluids/Methane.json b/dev/fluids/Methane.json index 76110559..f652e7cc 100644 --- a/dev/fluids/Methane.json +++ b/dev/fluids/Methane.json @@ -416,6 +416,22 @@ "p_units": "Pa", "rhomolar": 10139.127999999999, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 90.6941, + "T_units": "K", + "p": 11.696064115134503, + "p_units": "Pa", + "rhomolar": 28141.91479265917, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 90.6941, + "T_units": "K", + "p": 11.696064115134503, + "p_units": "Pa", + "rhomolar": 15.62969180971744, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/Methanol.json b/dev/fluids/Methanol.json index afea5d3e..eef1cb7a 100644 --- a/dev/fluids/Methanol.json +++ b/dev/fluids/Methanol.json @@ -311,6 +311,22 @@ "p_units": "Pa", "rhomolar": 8520.024867237415, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 175.61, + "T_units": "K", + "p": 0.0001867637574117855, + "p_units": "Pa", + "rhomolar": 28227.37433284738, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 175.61, + "T_units": "K", + "p": 0.0001867637574117855, + "p_units": "Pa", + "rhomolar": 0.0001279343965397924, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/MethylLinoleate.json b/dev/fluids/MethylLinoleate.json index 5c4fdce2..5e461fa7 100644 --- a/dev/fluids/MethylLinoleate.json +++ b/dev/fluids/MethylLinoleate.json @@ -291,6 +291,22 @@ "p_units": "Pa", "rhomolar": 808.4, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 260.0, + "T_units": "K", + "p": 1.3717048086741424e-09, + "p_units": "Pa", + "rhomolar": 3092.919060951427, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 260.0, + "T_units": "K", + "p": 1.3717048086741424e-09, + "p_units": "Pa", + "rhomolar": 6.345306984937442e-10, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/MethylLinolenate.json b/dev/fluids/MethylLinolenate.json index cf021a27..86499273 100644 --- a/dev/fluids/MethylLinolenate.json +++ b/dev/fluids/MethylLinolenate.json @@ -295,6 +295,22 @@ "p_units": "Pa", "rhomolar": 847.3000000000001, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 260.0, + "T_units": "K", + "p": 4.250280354778991e-10, + "p_units": "Pa", + "rhomolar": 3162.072727020763, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 260.0, + "T_units": "K", + "p": 4.250280354778991e-10, + "p_units": "Pa", + "rhomolar": 1.9661178886570436e-10, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/MethylOleate.json b/dev/fluids/MethylOleate.json index f52c7910..e18be819 100644 --- a/dev/fluids/MethylOleate.json +++ b/dev/fluids/MethylOleate.json @@ -295,6 +295,22 @@ "p_units": "Pa", "rhomolar": 812.8499999999999, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 253.47, + "T_units": "K", + "p": 3.7818661051540565e-10, + "p_units": "Pa", + "rhomolar": 3048.2387941791717, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 253.47, + "T_units": "K", + "p": 3.7818661051540565e-10, + "p_units": "Pa", + "rhomolar": 1.79450597579303e-10, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/MethylPalmitate.json b/dev/fluids/MethylPalmitate.json index f7ac09c2..63322d8b 100644 --- a/dev/fluids/MethylPalmitate.json +++ b/dev/fluids/MethylPalmitate.json @@ -295,6 +295,22 @@ "p_units": "Pa", "rhomolar": 897.0, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 302.71, + "T_units": "K", + "p": 1.6401286519191667e-05, + "p_units": "Pa", + "rhomolar": 3181.442539250496, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 302.71, + "T_units": "K", + "p": 1.6401286519191667e-05, + "p_units": "Pa", + "rhomolar": 6.516532510861514e-06, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/MethylStearate.json b/dev/fluids/MethylStearate.json index 9abd7eae..efe5392e 100644 --- a/dev/fluids/MethylStearate.json +++ b/dev/fluids/MethylStearate.json @@ -295,6 +295,22 @@ "p_units": "Pa", "rhomolar": 794.3, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 311.84, + "T_units": "K", + "p": 6.0109471888446706e-06, + "p_units": "Pa", + "rhomolar": 2851.4327320670277, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 311.84, + "T_units": "K", + "p": 6.0109471888446706e-06, + "p_units": "Pa", + "rhomolar": 2.3183363928545357e-06, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/Neon.json b/dev/fluids/Neon.json index e46071ed..5319dbe2 100644 --- a/dev/fluids/Neon.json +++ b/dev/fluids/Neon.json @@ -325,6 +325,22 @@ "p_units": "Pa", "rhomolar": 23882.0, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 24.56, + "T_units": "K", + "p": 43.432076403077566, + "p_units": "Pa", + "rhomolar": 62061.106062436906, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 24.56, + "T_units": "K", + "p": 43.432076403077566, + "p_units": "Pa", + "rhomolar": 220.1097622314587, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/Neopentane.json b/dev/fluids/Neopentane.json index a3cdc98a..14139386 100644 --- a/dev/fluids/Neopentane.json +++ b/dev/fluids/Neopentane.json @@ -251,6 +251,22 @@ "p_units": "Pa", "rhomolar": 3270.0, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 256.6, + "T_units": "K", + "p": 35.40094732708782, + "p_units": "Pa", + "rhomolar": 8701.720394850296, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 256.6, + "T_units": "K", + "p": 35.40094732708782, + "p_units": "Pa", + "rhomolar": 16.951063913080816, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/Nitrogen.json b/dev/fluids/Nitrogen.json index 650157d5..9e1f8e3a 100644 --- a/dev/fluids/Nitrogen.json +++ b/dev/fluids/Nitrogen.json @@ -395,6 +395,22 @@ "p_units": "Pa", "rhomolar": 11183.901464580624, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 63.151, + "T_units": "K", + "p": 12.519783487429175, + "p_units": "Pa", + "rhomolar": 30957.310274698266, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 63.151, + "T_units": "K", + "p": 12.519783487429175, + "p_units": "Pa", + "rhomolar": 24.069564468084323, + "rhomolar_units": "mol/m^3" } }, "TRANSPORT": { diff --git a/dev/fluids/NitrousOxide.json b/dev/fluids/NitrousOxide.json index 0f1d2dd0..73a1a860 100644 --- a/dev/fluids/NitrousOxide.json +++ b/dev/fluids/NitrousOxide.json @@ -260,6 +260,22 @@ "p_units": "Pa", "rhomolar": 10270.000000000002, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 182.33, + "T_units": "K", + "p": 87.83743922580841, + "p_units": "Pa", + "rhomolar": 28113.432079357477, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 182.33, + "T_units": "K", + "p": 87.83743922580841, + "p_units": "Pa", + "rhomolar": 59.33601783159357, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/OrthoDeuterium.json b/dev/fluids/OrthoDeuterium.json index e5aa088d..789d4ee1 100644 --- a/dev/fluids/OrthoDeuterium.json +++ b/dev/fluids/OrthoDeuterium.json @@ -330,6 +330,22 @@ "p_units": "Pa", "rhomolar": 17230.0, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 18.724, + "T_units": "K", + "p": 17.1891019732537, + "p_units": "Pa", + "rhomolar": 43350.920890356414, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 18.724, + "T_units": "K", + "p": 17.1891019732537, + "p_units": "Pa", + "rhomolar": 112.95640342174914, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/OrthoHydrogen.json b/dev/fluids/OrthoHydrogen.json index adcd5f62..7d93f9f6 100644 --- a/dev/fluids/OrthoHydrogen.json +++ b/dev/fluids/OrthoHydrogen.json @@ -292,6 +292,22 @@ "p_units": "Pa", "rhomolar": 15444.540313699812, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 14.008, + "T_units": "K", + "p": 7.559882341056905, + "p_units": "Pa", + "rhomolar": 38199.18470071943, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 14.008, + "T_units": "K", + "p": 7.559882341056905, + "p_units": "Pa", + "rhomolar": 65.83968194171914, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/Oxygen.json b/dev/fluids/Oxygen.json index 1e4c3055..1a1263bf 100644 --- a/dev/fluids/Oxygen.json +++ b/dev/fluids/Oxygen.json @@ -371,6 +371,22 @@ "p_units": "Pa", "rhomolar": 13630.0, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 54.361, + "T_units": "K", + "p": 0.14627764704447577, + "p_units": "Pa", + "rhomolar": 40816.430817738415, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 54.361, + "T_units": "K", + "p": 0.14627764704447577, + "p_units": "Pa", + "rhomolar": 0.32370317009092064, + "rhomolar_units": "mol/m^3" } }, "TRANSPORT": { diff --git a/dev/fluids/ParaDeuterium.json b/dev/fluids/ParaDeuterium.json index f0b6eef2..bcd765f2 100644 --- a/dev/fluids/ParaDeuterium.json +++ b/dev/fluids/ParaDeuterium.json @@ -328,6 +328,22 @@ "p_units": "Pa", "rhomolar": 17230.0, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 18.724, + "T_units": "K", + "p": 17.1891019732537, + "p_units": "Pa", + "rhomolar": 43350.920890356414, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 18.724, + "T_units": "K", + "p": 17.1891019732537, + "p_units": "Pa", + "rhomolar": 112.95640342174914, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/ParaHydrogen.json b/dev/fluids/ParaHydrogen.json index 18b03f7b..bd7548e8 100644 --- a/dev/fluids/ParaHydrogen.json +++ b/dev/fluids/ParaHydrogen.json @@ -309,6 +309,22 @@ "p_units": "Pa", "rhomolar": 15538.0, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 13.8033, + "T_units": "K", + "p": 7.041086751148159, + "p_units": "Pa", + "rhomolar": 38185.34690822156, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 13.8033, + "T_units": "K", + "p": 7.041086751148159, + "p_units": "Pa", + "rhomolar": 62.28040619273301, + "rhomolar_units": "mol/m^3" } }, "TRANSPORT": { diff --git a/dev/fluids/Propylene.json b/dev/fluids/Propylene.json index d2e8840b..3fd6c520 100644 --- a/dev/fluids/Propylene.json +++ b/dev/fluids/Propylene.json @@ -348,6 +348,22 @@ "p_units": "Pa", "rhomolar": 5457.0, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 87.953, + "T_units": "K", + "p": 7.471728686559866e-07, + "p_units": "Pa", + "rhomolar": 18254.562780551245, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 87.953, + "T_units": "K", + "p": 7.471728686559866e-07, + "p_units": "Pa", + "rhomolar": 1.0217291002947154e-06, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/Propyne.json b/dev/fluids/Propyne.json index 136d8ad7..4afb5cb8 100644 --- a/dev/fluids/Propyne.json +++ b/dev/fluids/Propyne.json @@ -331,6 +331,8 @@ "p_units": "Pa", "rhomolar": 6113.33, "rhomolar_units": "mol/m^3" - } + }, + "triple_liquid": {}, + "triple_vapor": {} } } \ No newline at end of file diff --git a/dev/fluids/R11.json b/dev/fluids/R11.json index 18307f38..02d1b663 100644 --- a/dev/fluids/R11.json +++ b/dev/fluids/R11.json @@ -286,6 +286,22 @@ "p_units": "Pa", "rhomolar": 4113.0394269407725, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 162.68, + "T_units": "K", + "p": 0.006691548080564487, + "p_units": "Pa", + "rhomolar": 12962.580254202647, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 162.68, + "T_units": "K", + "p": 0.006691548080564487, + "p_units": "Pa", + "rhomolar": 0.0049471885961455235, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/R113.json b/dev/fluids/R113.json index 91779bfe..65e85674 100644 --- a/dev/fluids/R113.json +++ b/dev/fluids/R113.json @@ -289,6 +289,22 @@ "p_units": "Pa", "rhomolar": 2988.6591060707137, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 236.93, + "T_units": "K", + "p": 1.8714275474637754, + "p_units": "Pa", + "rhomolar": 9098.73910142307, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 236.93, + "T_units": "K", + "p": 1.8714275474637754, + "p_units": "Pa", + "rhomolar": 0.9519906098017169, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/R114.json b/dev/fluids/R114.json index 6e8e6786..0e441366 100644 --- a/dev/fluids/R114.json +++ b/dev/fluids/R114.json @@ -328,6 +328,8 @@ "p_units": "Pa", "rhomolar": 3393.2000000000003, "rhomolar_units": "mol/m^3" - } + }, + "triple_liquid": {}, + "triple_vapor": {} } } \ No newline at end of file diff --git a/dev/fluids/R116.json b/dev/fluids/R116.json index 00825743..587d7a02 100644 --- a/dev/fluids/R116.json +++ b/dev/fluids/R116.json @@ -259,6 +259,22 @@ "p_units": "Pa", "rhomolar": 4444.0, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 173.1, + "T_units": "K", + "p": 26.083734153791088, + "p_units": "Pa", + "rhomolar": 12304.01402333065, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 173.1, + "T_units": "K", + "p": 26.083734153791088, + "p_units": "Pa", + "rhomolar": 18.437295644282788, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/R12.json b/dev/fluids/R12.json index 745d9e84..56ce206e 100644 --- a/dev/fluids/R12.json +++ b/dev/fluids/R12.json @@ -307,6 +307,22 @@ "p_units": "Pa", "rhomolar": 4672.781255944357, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 116.099, + "T_units": "K", + "p": 0.00024255019529824656, + "p_units": "Pa", + "rhomolar": 15125.291310337965, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 116.099, + "T_units": "K", + "p": 0.00024255019529824656, + "p_units": "Pa", + "rhomolar": 0.00025126911645679634, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/R123.json b/dev/fluids/R123.json index d2e246ea..fb341978 100644 --- a/dev/fluids/R123.json +++ b/dev/fluids/R123.json @@ -271,6 +271,22 @@ "p_units": "Pa", "rhomolar": 3616.0098345005263, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 166.0, + "T_units": "K", + "p": 0.004153442716713842, + "p_units": "Pa", + "rhomolar": 11612.830801100323, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 166.0, + "T_units": "K", + "p": 0.004153442716713842, + "p_units": "Pa", + "rhomolar": 0.0030093692214729455, + "rhomolar_units": "mol/m^3" } }, "TRANSPORT": { diff --git a/dev/fluids/R1233zd(E).json b/dev/fluids/R1233zd(E).json index 12b828c6..eb6dd35f 100644 --- a/dev/fluids/R1233zd(E).json +++ b/dev/fluids/R1233zd(E).json @@ -298,6 +298,22 @@ "p_units": "Pa", "rhomolar": 3670.0, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 195.15, + "T_units": "K", + "p": 0.2502655780810593, + "p_units": "Pa", + "rhomolar": 11408.679640912957, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 195.15, + "T_units": "K", + "p": 0.2502655780810593, + "p_units": "Pa", + "rhomolar": 0.1543039194302124, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/R1234yf.json b/dev/fluids/R1234yf.json index ae39aba5..204ee179 100644 --- a/dev/fluids/R1234yf.json +++ b/dev/fluids/R1234yf.json @@ -305,6 +305,22 @@ "p_units": "Pa", "rhomolar": 4170.0, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 220.0, + "T_units": "K", + "p": 31.50755884790354, + "p_units": "Pa", + "rhomolar": 11633.107308832525, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 220.0, + "T_units": "K", + "p": 31.50755884790354, + "p_units": "Pa", + "rhomolar": 17.583525551960502, + "rhomolar_units": "mol/m^3" } }, "TRANSPORT": { diff --git a/dev/fluids/R1234ze(E).json b/dev/fluids/R1234ze(E).json index 3578e7c5..2447be22 100644 --- a/dev/fluids/R1234ze(E).json +++ b/dev/fluids/R1234ze(E).json @@ -300,6 +300,22 @@ "p_units": "Pa", "rhomolar": 4290.0, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 168.62, + "T_units": "K", + "p": 0.23128175666601208, + "p_units": "Pa", + "rhomolar": 13194.862559792387, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 168.62, + "T_units": "K", + "p": 0.23128175666601208, + "p_units": "Pa", + "rhomolar": 0.1650276209820342, + "rhomolar_units": "mol/m^3" } }, "TRANSPORT": { diff --git a/dev/fluids/R1234ze(Z).json b/dev/fluids/R1234ze(Z).json index 7c24b366..51d62541 100644 --- a/dev/fluids/R1234ze(Z).json +++ b/dev/fluids/R1234ze(Z).json @@ -261,6 +261,22 @@ "p_units": "Pa", "rhomolar": 4121.303363626818, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 273.0, + "T_units": "K", + "p": 67.8029393595567, + "p_units": "Pa", + "rhomolar": 11250.756301033864, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 273.0, + "T_units": "K", + "p": 67.8029393595567, + "p_units": "Pa", + "rhomolar": 31.076296533864262, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/R124.json b/dev/fluids/R124.json index 04f5a8d4..5f8c6cca 100644 --- a/dev/fluids/R124.json +++ b/dev/fluids/R124.json @@ -295,7 +295,9 @@ "p_units": "Pa", "rhomolar": 4103.279546177282, "rhomolar_units": "mol/m^3" - } + }, + "triple_liquid": {}, + "triple_vapor": {} }, "TRANSPORT": { "conductivity": { diff --git a/dev/fluids/R125.json b/dev/fluids/R125.json index 7b2bdf98..ec600bbc 100644 --- a/dev/fluids/R125.json +++ b/dev/fluids/R125.json @@ -310,6 +310,22 @@ "p_units": "Pa", "rhomolar": 4779.0, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 172.52, + "T_units": "K", + "p": 2.9140460090935645, + "p_units": "Pa", + "rhomolar": 14086.490950189835, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 172.52, + "T_units": "K", + "p": 2.9140460090935645, + "p_units": "Pa", + "rhomolar": 2.038105466033143, + "rhomolar_units": "mol/m^3" } }, "TRANSPORT": { diff --git a/dev/fluids/R13.json b/dev/fluids/R13.json index e62eb9cb..6e62856a 100644 --- a/dev/fluids/R13.json +++ b/dev/fluids/R13.json @@ -328,6 +328,8 @@ "p_units": "Pa", "rhomolar": 5580.0, "rhomolar_units": "mol/m^3" - } + }, + "triple_liquid": {}, + "triple_vapor": {} } } \ No newline at end of file diff --git a/dev/fluids/R134a.json b/dev/fluids/R134a.json index c9ae0899..789f9c26 100644 --- a/dev/fluids/R134a.json +++ b/dev/fluids/R134a.json @@ -293,6 +293,22 @@ "p_units": "Pa", "rhomolar": 5017.053, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 169.85, + "T_units": "K", + "p": 0.3895637886074885, + "p_units": "Pa", + "rhomolar": 15594.200379934839, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 169.85, + "T_units": "K", + "p": 0.3895637886074885, + "p_units": "Pa", + "rhomolar": 0.2761122800115172, + "rhomolar_units": "mol/m^3" } }, "TRANSPORT": { diff --git a/dev/fluids/R14.json b/dev/fluids/R14.json index 67e15dd7..25b1c64e 100644 --- a/dev/fluids/R14.json +++ b/dev/fluids/R14.json @@ -322,6 +322,8 @@ "p_units": "Pa", "rhomolar": 7109.4194, "rhomolar_units": "mol/m^3" - } + }, + "triple_liquid": {}, + "triple_vapor": {} } } \ No newline at end of file diff --git a/dev/fluids/R141b.json b/dev/fluids/R141b.json index 1444336a..d2683ee6 100644 --- a/dev/fluids/R141b.json +++ b/dev/fluids/R141b.json @@ -261,6 +261,22 @@ "p_units": "Pa", "rhomolar": 3921.0000000000005, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 169.68, + "T_units": "K", + "p": 0.0064927351770598255, + "p_units": "Pa", + "rhomolar": 12559.705823578954, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 169.68, + "T_units": "K", + "p": 0.0064927351770598255, + "p_units": "Pa", + "rhomolar": 0.004602358265154211, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/R142b.json b/dev/fluids/R142b.json index 9fde003a..3ca3589a 100644 --- a/dev/fluids/R142b.json +++ b/dev/fluids/R142b.json @@ -261,6 +261,22 @@ "p_units": "Pa", "rhomolar": 4438.0, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 142.72, + "T_units": "K", + "p": 0.0036326517168714123, + "p_units": "Pa", + "rhomolar": 14439.015484955165, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 142.72, + "T_units": "K", + "p": 0.0036326517168714123, + "p_units": "Pa", + "rhomolar": 0.003061359346361367, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/R143a.json b/dev/fluids/R143a.json index 134af465..21c8f366 100644 --- a/dev/fluids/R143a.json +++ b/dev/fluids/R143a.json @@ -294,6 +294,22 @@ "p_units": "Pa", "rhomolar": 5128.45, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 161.34, + "T_units": "K", + "p": 1.074945443137482, + "p_units": "Pa", + "rhomolar": 15832.104698511099, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 161.34, + "T_units": "K", + "p": 1.074945443137482, + "p_units": "Pa", + "rhomolar": 0.803616507488138, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/R152A.json b/dev/fluids/R152A.json index 4a6f834e..736f6b41 100644 --- a/dev/fluids/R152A.json +++ b/dev/fluids/R152A.json @@ -265,6 +265,22 @@ "p_units": "Pa", "rhomolar": 5571.452362568319, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 154.56, + "T_units": "K", + "p": 0.06408986801291847, + "p_units": "Pa", + "rhomolar": 18031.095642133463, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 154.56, + "T_units": "K", + "p": 0.06408986801291847, + "p_units": "Pa", + "rhomolar": 0.04989056799859409, + "rhomolar_units": "mol/m^3" } }, "TRANSPORT": { diff --git a/dev/fluids/R161.json b/dev/fluids/R161.json index 3caf5cf8..34ac7f44 100644 --- a/dev/fluids/R161.json +++ b/dev/fluids/R161.json @@ -310,6 +310,22 @@ "p_units": "Pa", "rhomolar": 6280.0, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 130.0, + "T_units": "K", + "p": 0.00551226945206069, + "p_units": "Pa", + "rhomolar": 19913.25305828297, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 130.0, + "T_units": "K", + "p": 0.00551226945206069, + "p_units": "Pa", + "rhomolar": 0.005099837512332045, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/R21.json b/dev/fluids/R21.json index 592740aa..75f3de07 100644 --- a/dev/fluids/R21.json +++ b/dev/fluids/R21.json @@ -328,6 +328,8 @@ "p_units": "Pa", "rhomolar": 5110.765599999999, "rhomolar_units": "mol/m^3" - } + }, + "triple_liquid": {}, + "triple_vapor": {} } } \ No newline at end of file diff --git a/dev/fluids/R218.json b/dev/fluids/R218.json index 691d92a8..ea5ebbf4 100644 --- a/dev/fluids/R218.json +++ b/dev/fluids/R218.json @@ -257,6 +257,22 @@ "p_units": "Pa", "rhomolar": 3340.0000000000005, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 125.45, + "T_units": "K", + "p": 0.0020185735581448633, + "p_units": "Pa", + "rhomolar": 10687.00507449543, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 125.45, + "T_units": "K", + "p": 0.0020185735581448633, + "p_units": "Pa", + "rhomolar": 0.0019353026559895711, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/R22.json b/dev/fluids/R22.json index 16077704..917c1f13 100644 --- a/dev/fluids/R22.json +++ b/dev/fluids/R22.json @@ -386,6 +386,22 @@ "p_units": "Pa", "rhomolar": 6058.220000000001, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 115.73, + "T_units": "K", + "p": 0.0003794696733352661, + "p_units": "Pa", + "rhomolar": 19906.5340608497, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 115.73, + "T_units": "K", + "p": 0.0003794696733352661, + "p_units": "Pa", + "rhomolar": 0.0003943621124878414, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/R227EA.json b/dev/fluids/R227EA.json index a47fcff4..a36fcc94 100644 --- a/dev/fluids/R227EA.json +++ b/dev/fluids/R227EA.json @@ -329,6 +329,22 @@ "p_units": "Pa", "rhomolar": 3495.0, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 146.35, + "T_units": "K", + "p": 0.0073315671532078065, + "p_units": "Pa", + "rhomolar": 11046.705899800072, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 146.35, + "T_units": "K", + "p": 0.0073315671532078065, + "p_units": "Pa", + "rhomolar": 0.006025348183498564, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/R23.json b/dev/fluids/R23.json index 70e94dc6..c43bf723 100644 --- a/dev/fluids/R23.json +++ b/dev/fluids/R23.json @@ -281,6 +281,22 @@ "p_units": "Pa", "rhomolar": 7519.999999999999, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 118.02, + "T_units": "K", + "p": 0.05804099433470835, + "p_units": "Pa", + "rhomolar": 24307.711593514352, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 118.02, + "T_units": "K", + "p": 0.05804099433470835, + "p_units": "Pa", + "rhomolar": 0.059176475268810494, + "rhomolar_units": "mol/m^3" } }, "TRANSPORT": { diff --git a/dev/fluids/R236EA.json b/dev/fluids/R236EA.json index cce3c879..c37fd232 100644 --- a/dev/fluids/R236EA.json +++ b/dev/fluids/R236EA.json @@ -307,6 +307,8 @@ "p_units": "Pa", "rhomolar": 3715.9999999999995, "rhomolar_units": "mol/m^3" - } + }, + "triple_liquid": {}, + "triple_vapor": {} } } \ No newline at end of file diff --git a/dev/fluids/R236FA.json b/dev/fluids/R236FA.json index b6d2f360..c0a41730 100644 --- a/dev/fluids/R236FA.json +++ b/dev/fluids/R236FA.json @@ -303,6 +303,22 @@ "p_units": "Pa", "rhomolar": 3626.0, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 179.6, + "T_units": "K", + "p": 0.16032677876015008, + "p_units": "Pa", + "rhomolar": 11234.50556190224, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 179.6, + "T_units": "K", + "p": 0.16032677876015008, + "p_units": "Pa", + "rhomolar": 0.1073988072445306, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/R245fa.json b/dev/fluids/R245fa.json index 11f77d97..9e78723a 100644 --- a/dev/fluids/R245fa.json +++ b/dev/fluids/R245fa.json @@ -263,6 +263,22 @@ "p_units": "Pa", "rhomolar": 3849.9999999999995, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 171.05, + "T_units": "K", + "p": 0.012514805987099153, + "p_units": "Pa", + "rhomolar": 12292.489206924556, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 171.05, + "T_units": "K", + "p": 0.012514805987099153, + "p_units": "Pa", + "rhomolar": 0.008800777185860847, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/R32.json b/dev/fluids/R32.json index 336525d1..393d3132 100644 --- a/dev/fluids/R32.json +++ b/dev/fluids/R32.json @@ -287,6 +287,22 @@ "p_units": "Pa", "rhomolar": 8150.084599999999, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 136.34, + "T_units": "K", + "p": 0.04799989366493727, + "p_units": "Pa", + "rhomolar": 27473.344990002275, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 136.34, + "T_units": "K", + "p": 0.04799989366493727, + "p_units": "Pa", + "rhomolar": 0.04235254435590307, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/R365MFC.json b/dev/fluids/R365MFC.json index 74a0d8e6..63229d74 100644 --- a/dev/fluids/R365MFC.json +++ b/dev/fluids/R365MFC.json @@ -304,6 +304,22 @@ "p_units": "Pa", "rhomolar": 3200.0, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 239.0, + "T_units": "K", + "p": 2.478418202176464, + "p_units": "Pa", + "rhomolar": 9298.157101466448, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 239.0, + "T_units": "K", + "p": 2.478418202176464, + "p_units": "Pa", + "rhomolar": 1.2511727163730078, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/R404A.json b/dev/fluids/R404A.json index 88b3b9d2..a99b174c 100644 --- a/dev/fluids/R404A.json +++ b/dev/fluids/R404A.json @@ -297,6 +297,22 @@ "p_units": "Pa", "rhomolar": 4939.999999999999, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 200.0, + "T_units": "K", + "p": 22.64918747516521, + "p_units": "Pa", + "rhomolar": 14209.140749102651, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 200.0, + "T_units": "K", + "p": 21.264273816834987, + "p_units": "Pa", + "rhomolar": 13.009612612697538, + "rhomolar_units": "mol/m^3" } }, "TRANSPORT": { diff --git a/dev/fluids/R407C.json b/dev/fluids/R407C.json index de727dca..35028f30 100644 --- a/dev/fluids/R407C.json +++ b/dev/fluids/R407C.json @@ -293,6 +293,22 @@ "p_units": "Pa", "rhomolar": 5260.000046401775, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 200.0, + "T_units": "K", + "p": 19.15805451544979, + "p_units": "Pa", + "rhomolar": 17036.35645139292, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 200.0, + "T_units": "K", + "p": 11.311511234771459, + "p_units": "Pa", + "rhomolar": 6.864256457230267, + "rhomolar_units": "mol/m^3" } }, "TRANSPORT": { diff --git a/dev/fluids/R407F.json b/dev/fluids/R407F.json index 662a88b3..2db79658 100644 --- a/dev/fluids/R407F.json +++ b/dev/fluids/R407F.json @@ -252,6 +252,22 @@ "p_units": "Pa", "rhomolar": 5816.413452386901, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 200.0, + "T_units": "K", + "p": 21.85074400548867, + "p_units": "Pa", + "rhomolar": 17707.28915058032, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 200.0, + "T_units": "K", + "p": 13.568238570898698, + "p_units": "Pa", + "rhomolar": 8.242011270809071, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/R41.json b/dev/fluids/R41.json index 48f8cd0b..92299571 100644 --- a/dev/fluids/R41.json +++ b/dev/fluids/R41.json @@ -270,6 +270,22 @@ "p_units": "Pa", "rhomolar": 9300.0, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 129.82, + "T_units": "K", + "p": 0.34419906454658705, + "p_units": "Pa", + "rhomolar": 29560.843595523063, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 129.82, + "T_units": "K", + "p": 0.34419906454658705, + "p_units": "Pa", + "rhomolar": 0.31927855600765737, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/R410A.json b/dev/fluids/R410A.json index 3fe2695a..d034ee24 100644 --- a/dev/fluids/R410A.json +++ b/dev/fluids/R410A.json @@ -293,6 +293,22 @@ "p_units": "Pa", "rhomolar": 6323.999999999999, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 200.0, + "T_units": "K", + "p": 29.160335374760287, + "p_units": "Pa", + "rhomolar": 19509.728512139023, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 200.0, + "T_units": "K", + "p": 29.009781591566753, + "p_units": "Pa", + "rhomolar": 17.796769503206775, + "rhomolar_units": "mol/m^3" } }, "TRANSPORT": { diff --git a/dev/fluids/R507A.json b/dev/fluids/R507A.json index 2a9e8cac..5f2801c4 100644 --- a/dev/fluids/R507A.json +++ b/dev/fluids/R507A.json @@ -303,6 +303,22 @@ "p_units": "Pa", "rhomolar": 4964.029650250053, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 200.0, + "T_units": "K", + "p": 23.232992819809652, + "p_units": "Pa", + "rhomolar": 14129.88676815666, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 200.0, + "T_units": "K", + "p": 23.22194234304102, + "p_units": "Pa", + "rhomolar": 14.225518221449525, + "rhomolar_units": "mol/m^3" } }, "TRANSPORT": { diff --git a/dev/fluids/RC318.json b/dev/fluids/RC318.json index 80dbb1f0..73aa54c9 100644 --- a/dev/fluids/RC318.json +++ b/dev/fluids/RC318.json @@ -326,6 +326,22 @@ "p_units": "Pa", "rhomolar": 3099.38, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 233.35, + "T_units": "K", + "p": 19.46105608072302, + "p_units": "Pa", + "rhomolar": 8645.183286519046, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 233.35, + "T_units": "K", + "p": 19.46105608072302, + "p_units": "Pa", + "rhomolar": 10.156903370547868, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/SES36.json b/dev/fluids/SES36.json index ffa525dd..065c95ac 100644 --- a/dev/fluids/SES36.json +++ b/dev/fluids/SES36.json @@ -274,6 +274,22 @@ "p_units": "Pa", "rhomolar": 2800.0, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 200.0, + "T_units": "K", + "p": 0.5732898712226775, + "p_units": "Pa", + "rhomolar": 8604.642607036254, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 200.0, + "T_units": "K", + "p": 0.5732898712226775, + "p_units": "Pa", + "rhomolar": 0.3451560286454884, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/SulfurDioxide.json b/dev/fluids/SulfurDioxide.json index ad13aebe..3983e623 100644 --- a/dev/fluids/SulfurDioxide.json +++ b/dev/fluids/SulfurDioxide.json @@ -271,6 +271,22 @@ "p_units": "Pa", "rhomolar": 8195.0, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 197.7, + "T_units": "K", + "p": 1.6602201925894202, + "p_units": "Pa", + "rhomolar": 25290.03160667636, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 197.7, + "T_units": "K", + "p": 1.6602201925894202, + "p_units": "Pa", + "rhomolar": 1.0119785850101077, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/SulfurHexafluoride.json b/dev/fluids/SulfurHexafluoride.json index dfd4533f..d86ec784 100644 --- a/dev/fluids/SulfurHexafluoride.json +++ b/dev/fluids/SulfurHexafluoride.json @@ -423,6 +423,22 @@ "p_units": "Pa", "rhomolar": 5082.317411198119, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 223.555, + "T_units": "K", + "p": 231.42447394939663, + "p_units": "Pa", + "rhomolar": 12632.389958220476, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 223.555, + "T_units": "K", + "p": 231.42447394939663, + "p_units": "Pa", + "rhomolar": 133.9236131741382, + "rhomolar_units": "mol/m^3" } }, "TRANSPORT": { diff --git a/dev/fluids/Toluene.json b/dev/fluids/Toluene.json index ceda26dc..459a0c16 100644 --- a/dev/fluids/Toluene.json +++ b/dev/fluids/Toluene.json @@ -264,6 +264,22 @@ "p_units": "Pa", "rhomolar": 3169.0, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 178.0, + "T_units": "K", + "p": 3.9393478817276356e-05, + "p_units": "Pa", + "rhomolar": 10580.06048163071, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 178.0, + "T_units": "K", + "p": 3.9393478817276356e-05, + "p_units": "Pa", + "rhomolar": 2.661765525110245e-05, + "rhomolar_units": "mol/m^3" } }, "TRANSPORT": { diff --git a/dev/fluids/Water.json b/dev/fluids/Water.json index 95bc8ece..c9d3e81e 100644 --- a/dev/fluids/Water.json +++ b/dev/fluids/Water.json @@ -497,6 +497,22 @@ "p_units": "Pa", "rhomolar": 17873.72799560906, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 273.16, + "T_units": "K", + "p": 0.6116547710080396, + "p_units": "Pa", + "rhomolar": 55496.95514003037, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 273.16, + "T_units": "K", + "p": 0.6116547710080396, + "p_units": "Pa", + "rhomolar": 0.26947008086577756, + "rhomolar_units": "mol/m^3" } }, "TRANSPORT": { diff --git a/dev/fluids/Xenon.json b/dev/fluids/Xenon.json index 2a901533..2a570f42 100644 --- a/dev/fluids/Xenon.json +++ b/dev/fluids/Xenon.json @@ -250,6 +250,22 @@ "p_units": "Pa", "rhomolar": 8400.0, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 161.4, + "T_units": "K", + "p": 81.74779907319369, + "p_units": "Pa", + "rhomolar": 22592.342443412075, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 161.4, + "T_units": "K", + "p": 81.74779907319369, + "p_units": "Pa", + "rhomolar": 62.61266658271794, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/cis-2-Butene.json b/dev/fluids/cis-2-Butene.json index 7e0b8577..6601a0e7 100644 --- a/dev/fluids/cis-2-Butene.json +++ b/dev/fluids/cis-2-Butene.json @@ -251,6 +251,22 @@ "p_units": "Pa", "rhomolar": 4244.0, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 134.3, + "T_units": "K", + "p": 0.00026364966495250915, + "p_units": "Pa", + "rhomolar": 14084.011372882016, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 134.3, + "T_units": "K", + "p": 0.00026364966495250915, + "p_units": "Pa", + "rhomolar": 0.0002361117808314181, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/m-Xylene.json b/dev/fluids/m-Xylene.json index df23011c..d413f79b 100644 --- a/dev/fluids/m-Xylene.json +++ b/dev/fluids/m-Xylene.json @@ -288,6 +288,22 @@ "p_units": "Pa", "rhomolar": 2665.0, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 225.3, + "T_units": "K", + "p": 0.0031232674928265464, + "p_units": "Pa", + "rhomolar": 8676.64949512722, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 225.3, + "T_units": "K", + "p": 0.0031232674928265464, + "p_units": "Pa", + "rhomolar": 0.0016673173990112478, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/n-Butane.json b/dev/fluids/n-Butane.json index 41198c64..eb7aa8a4 100644 --- a/dev/fluids/n-Butane.json +++ b/dev/fluids/n-Butane.json @@ -345,6 +345,22 @@ "p_units": "Pa", "rhomolar": 3922.7696129878086, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 134.895, + "T_units": "K", + "p": 0.0006656588871710992, + "p_units": "Pa", + "rhomolar": 12645.062133275154, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 134.895, + "T_units": "K", + "p": 0.0006656588871710992, + "p_units": "Pa", + "rhomolar": 0.0005935026998216425, + "rhomolar_units": "mol/m^3" } }, "TRANSPORT": { diff --git a/dev/fluids/n-Decane.json b/dev/fluids/n-Decane.json index 7b008823..519819ac 100644 --- a/dev/fluids/n-Decane.json +++ b/dev/fluids/n-Decane.json @@ -264,6 +264,22 @@ "p_units": "Pa", "rhomolar": 1640.0000000000002, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 243.5, + "T_units": "K", + "p": 0.0014041836415494265, + "p_units": "Pa", + "rhomolar": 5406.416906179153, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 243.5, + "T_units": "K", + "p": 0.0014041836415494265, + "p_units": "Pa", + "rhomolar": 0.0006935770572152337, + "rhomolar_units": "mol/m^3" } }, "TRANSPORT": { diff --git a/dev/fluids/n-Dodecane.json b/dev/fluids/n-Dodecane.json index 89f13405..bfadc7e6 100644 --- a/dev/fluids/n-Dodecane.json +++ b/dev/fluids/n-Dodecane.json @@ -272,6 +272,22 @@ "p_units": "Pa", "rhomolar": 1330.0, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 263.6, + "T_units": "K", + "p": 0.0006262109235467472, + "p_units": "Pa", + "rhomolar": 4529.1463736398255, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 263.6, + "T_units": "K", + "p": 0.0006262109235467472, + "p_units": "Pa", + "rhomolar": 0.00028572146420915024, + "rhomolar_units": "mol/m^3" } }, "TRANSPORT": { diff --git a/dev/fluids/n-Heptane.json b/dev/fluids/n-Heptane.json index a6924166..663780ad 100644 --- a/dev/fluids/n-Heptane.json +++ b/dev/fluids/n-Heptane.json @@ -281,6 +281,22 @@ "p_units": "Pa", "rhomolar": 2315.3230474441625, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 182.55, + "T_units": "K", + "p": 0.00017549039806495355, + "p_units": "Pa", + "rhomolar": 7745.685209191345, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 182.55, + "T_units": "K", + "p": 0.00017549039806495355, + "p_units": "Pa", + "rhomolar": 0.00011562068460706438, + "rhomolar_units": "mol/m^3" } }, "TRANSPORT": { diff --git a/dev/fluids/n-Hexane.json b/dev/fluids/n-Hexane.json index 01ffc89a..45aa3307 100644 --- a/dev/fluids/n-Hexane.json +++ b/dev/fluids/n-Hexane.json @@ -281,6 +281,22 @@ "p_units": "Pa", "rhomolar": 2705.877875067769, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 177.83, + "T_units": "K", + "p": 0.001277140421339977, + "p_units": "Pa", + "rhomolar": 8839.379285343, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 177.83, + "T_units": "K", + "p": 0.001277140421339977, + "p_units": "Pa", + "rhomolar": 0.0008637746216777618, + "rhomolar_units": "mol/m^3" } }, "TRANSPORT": { diff --git a/dev/fluids/n-Nonane.json b/dev/fluids/n-Nonane.json index f2007c8b..38f25ba0 100644 --- a/dev/fluids/n-Nonane.json +++ b/dev/fluids/n-Nonane.json @@ -263,6 +263,22 @@ "p_units": "Pa", "rhomolar": 1810.0, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 219.7, + "T_units": "K", + "p": 0.0004444854177429873, + "p_units": "Pa", + "rhomolar": 6051.9562481855255, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 219.7, + "T_units": "K", + "p": 0.0004444854177429873, + "p_units": "Pa", + "rhomolar": 0.00024332923985968528, + "rhomolar_units": "mol/m^3" } }, "TRANSPORT": { diff --git a/dev/fluids/n-Octane.json b/dev/fluids/n-Octane.json index 3ecf246d..d26f3c5c 100644 --- a/dev/fluids/n-Octane.json +++ b/dev/fluids/n-Octane.json @@ -283,6 +283,22 @@ "p_units": "Pa", "rhomolar": 2056.4, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 216.37, + "T_units": "K", + "p": 0.0019889161884656943, + "p_units": "Pa", + "rhomolar": 6686.398950048654, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 216.37, + "T_units": "K", + "p": 0.0019889161884656943, + "p_units": "Pa", + "rhomolar": 0.001105574732115143, + "rhomolar_units": "mol/m^3" } }, "TRANSPORT": { diff --git a/dev/fluids/n-Pentane.json b/dev/fluids/n-Pentane.json index b5b2afd6..8a3b0f35 100644 --- a/dev/fluids/n-Pentane.json +++ b/dev/fluids/n-Pentane.json @@ -284,6 +284,22 @@ "p_units": "Pa", "rhomolar": 3215.5775884221466, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 143.47, + "T_units": "K", + "p": 7.632218395084951e-05, + "p_units": "Pa", + "rhomolar": 10566.403034046354, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 143.47, + "T_units": "K", + "p": 7.632218395084951e-05, + "p_units": "Pa", + "rhomolar": 6.398133659997455e-05, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/n-Propane.json b/dev/fluids/n-Propane.json index c4eec390..f0038515 100644 --- a/dev/fluids/n-Propane.json +++ b/dev/fluids/n-Propane.json @@ -330,6 +330,22 @@ "p_units": "Pa", "rhomolar": 5000.000000000001, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 85.525, + "T_units": "K", + "p": 1.7204618151212885e-07, + "p_units": "Pa", + "rhomolar": 16625.805559650216, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 85.525, + "T_units": "K", + "p": 1.7204618151212885e-07, + "p_units": "Pa", + "rhomolar": 2.4194535056958734e-07, + "rhomolar_units": "mol/m^3" } }, "TRANSPORT": { diff --git a/dev/fluids/n-Undecane.json b/dev/fluids/n-Undecane.json index 87106ac8..811ae6ec 100644 --- a/dev/fluids/n-Undecane.json +++ b/dev/fluids/n-Undecane.json @@ -262,6 +262,22 @@ "p_units": "Pa", "rhomolar": 1514.9168636385564, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 247.541, + "T_units": "K", + "p": 0.00044605591855216597, + "p_units": "Pa", + "rhomolar": 4962.066427665783, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 247.541, + "T_units": "K", + "p": 0.00044605591855216597, + "p_units": "Pa", + "rhomolar": 0.00021672611484766812, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/o-Xylene.json b/dev/fluids/o-Xylene.json index 84868306..0aa63b95 100644 --- a/dev/fluids/o-Xylene.json +++ b/dev/fluids/o-Xylene.json @@ -286,6 +286,22 @@ "p_units": "Pa", "rhomolar": 2684.5000000000005, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 247.985, + "T_units": "K", + "p": 0.02280577638859245, + "p_units": "Pa", + "rhomolar": 8647.220325712748, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 247.985, + "T_units": "K", + "p": 0.02280577638859245, + "p_units": "Pa", + "rhomolar": 0.011061576929647127, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/p-Xylene.json b/dev/fluids/p-Xylene.json index 6fddbd8b..5664a644 100644 --- a/dev/fluids/p-Xylene.json +++ b/dev/fluids/p-Xylene.json @@ -286,6 +286,22 @@ "p_units": "Pa", "rhomolar": 2693.92, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 286.4, + "T_units": "K", + "p": 0.5800850024867812, + "p_units": "Pa", + "rhomolar": 8165.004739624582, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 286.4, + "T_units": "K", + "p": 0.5800850024867812, + "p_units": "Pa", + "rhomolar": 0.24384664074124282, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file diff --git a/dev/fluids/trans-2-Butene.json b/dev/fluids/trans-2-Butene.json index 01cbafa9..bc3630f1 100644 --- a/dev/fluids/trans-2-Butene.json +++ b/dev/fluids/trans-2-Butene.json @@ -251,6 +251,22 @@ "p_units": "Pa", "rhomolar": 4213.0, "rhomolar_units": "mol/m^3" + }, + "triple_liquid": { + "T": 167.6, + "T_units": "K", + "p": 0.07481669079819876, + "p_units": "Pa", + "rhomolar": 13140.755821358482, + "rhomolar_units": "mol/m^3" + }, + "triple_vapor": { + "T": 167.6, + "T_units": "K", + "p": 0.07481669079819876, + "p_units": "Pa", + "rhomolar": 0.05370261847351349, + "rhomolar_units": "mol/m^3" } } } \ No newline at end of file From 7896845a5d1c061eaab20db9c4f530c46df8c5b9 Mon Sep 17 00:00:00 2001 From: Ian Bell Date: Fri, 6 Jun 2014 10:01:09 +0200 Subject: [PATCH 03/26] Added minimum saturation states to fluid files Signed-off-by: Ian Bell --- dev/fluids/1-Butene.json | 42 +++++++++++++++++++----------- dev/fluids/AceticAcid.json | 42 +++++++++++++++++++----------- dev/fluids/Acetone.json | 42 +++++++++++++++++++----------- dev/fluids/Air.json | 42 +++++++++++++++++++----------- dev/fluids/Ammonia.json | 42 +++++++++++++++++++----------- dev/fluids/Argon.json | 42 +++++++++++++++++++----------- dev/fluids/Benzene.json | 42 +++++++++++++++++++----------- dev/fluids/CarbonDioxide.json | 42 +++++++++++++++++++----------- dev/fluids/CarbonMonoxide.json | 42 +++++++++++++++++++----------- dev/fluids/CarbonylSulfide.json | 42 +++++++++++++++++++----------- dev/fluids/CycloHexane.json | 42 +++++++++++++++++++----------- dev/fluids/CycloPropane.json | 42 +++++++++++++++++++----------- dev/fluids/Cyclopentane.json | 42 +++++++++++++++++++----------- dev/fluids/D4.json | 42 +++++++++++++++++++----------- dev/fluids/D5.json | 42 +++++++++++++++++++----------- dev/fluids/D6.json | 42 +++++++++++++++++++----------- dev/fluids/Deuterium.json | 42 +++++++++++++++++++----------- dev/fluids/DimethylCarbonate.json | 42 +++++++++++++++++++----------- dev/fluids/DimethylEther.json | 42 +++++++++++++++++++----------- dev/fluids/Ethane.json | 42 +++++++++++++++++++----------- dev/fluids/Ethanol.json | 42 +++++++++++++++++++----------- dev/fluids/EthylBenzene.json | 42 +++++++++++++++++++----------- dev/fluids/Ethylene.json | 42 +++++++++++++++++++----------- dev/fluids/Fluorine.json | 42 +++++++++++++++++++----------- dev/fluids/HFE143m.json | 42 +++++++++++++++++++----------- dev/fluids/Helium.json | 42 +++++++++++++++++++----------- dev/fluids/Hydrogen.json | 42 +++++++++++++++++++----------- dev/fluids/HydrogenSulfide.json | 42 +++++++++++++++++++----------- dev/fluids/IsoButane.json | 42 +++++++++++++++++++----------- dev/fluids/IsoButene.json | 42 +++++++++++++++++++----------- dev/fluids/Isohexane.json | 42 +++++++++++++++++++----------- dev/fluids/Isopentane.json | 42 +++++++++++++++++++----------- dev/fluids/Krypton.json | 42 +++++++++++++++++++----------- dev/fluids/MD2M.json | 42 +++++++++++++++++++----------- dev/fluids/MD3M.json | 42 +++++++++++++++++++----------- dev/fluids/MD4M.json | 42 +++++++++++++++++++----------- dev/fluids/MDM.json | 42 +++++++++++++++++++----------- dev/fluids/MM.json | 42 +++++++++++++++++++----------- dev/fluids/Methane.json | 42 +++++++++++++++++++----------- dev/fluids/Methanol.json | 42 +++++++++++++++++++----------- dev/fluids/MethylLinoleate.json | 42 +++++++++++++++++++----------- dev/fluids/MethylLinolenate.json | 42 +++++++++++++++++++----------- dev/fluids/MethylOleate.json | 42 +++++++++++++++++++----------- dev/fluids/MethylPalmitate.json | 42 +++++++++++++++++++----------- dev/fluids/MethylStearate.json | 42 +++++++++++++++++++----------- dev/fluids/Neon.json | 42 +++++++++++++++++++----------- dev/fluids/Neopentane.json | 42 +++++++++++++++++++----------- dev/fluids/Nitrogen.json | 42 +++++++++++++++++++----------- dev/fluids/NitrousOxide.json | 42 +++++++++++++++++++----------- dev/fluids/OrthoDeuterium.json | 42 +++++++++++++++++++----------- dev/fluids/OrthoHydrogen.json | 42 +++++++++++++++++++----------- dev/fluids/Oxygen.json | 42 +++++++++++++++++++----------- dev/fluids/ParaDeuterium.json | 42 +++++++++++++++++++----------- dev/fluids/ParaHydrogen.json | 42 +++++++++++++++++++----------- dev/fluids/Propylene.json | 42 +++++++++++++++++++----------- dev/fluids/Propyne.json | 42 +++++++++++++++++++----------- dev/fluids/R11.json | 42 +++++++++++++++++++----------- dev/fluids/R113.json | 42 +++++++++++++++++++----------- dev/fluids/R114.json | 42 +++++++++++++++++++----------- dev/fluids/R116.json | 42 +++++++++++++++++++----------- dev/fluids/R12.json | 42 +++++++++++++++++++----------- dev/fluids/R123.json | 42 +++++++++++++++++++----------- dev/fluids/R1233zd(E).json | 42 +++++++++++++++++++----------- dev/fluids/R1234yf.json | 42 +++++++++++++++++++----------- dev/fluids/R1234ze(E).json | 42 +++++++++++++++++++----------- dev/fluids/R1234ze(Z).json | 42 +++++++++++++++++++----------- dev/fluids/R124.json | 42 +++++++++++++++++++----------- dev/fluids/R125.json | 42 +++++++++++++++++++----------- dev/fluids/R13.json | 42 +++++++++++++++++++----------- dev/fluids/R134a.json | 42 +++++++++++++++++++----------- dev/fluids/R14.json | 42 +++++++++++++++++++----------- dev/fluids/R141b.json | 42 +++++++++++++++++++----------- dev/fluids/R142b.json | 42 +++++++++++++++++++----------- dev/fluids/R143a.json | 42 +++++++++++++++++++----------- dev/fluids/R152A.json | 42 +++++++++++++++++++----------- dev/fluids/R161.json | 42 +++++++++++++++++++----------- dev/fluids/R21.json | 42 +++++++++++++++++++----------- dev/fluids/R218.json | 42 +++++++++++++++++++----------- dev/fluids/R22.json | 42 +++++++++++++++++++----------- dev/fluids/R227EA.json | 42 +++++++++++++++++++----------- dev/fluids/R23.json | 42 +++++++++++++++++++----------- dev/fluids/R236EA.json | 42 +++++++++++++++++++----------- dev/fluids/R236FA.json | 42 +++++++++++++++++++----------- dev/fluids/R245fa.json | 42 +++++++++++++++++++----------- dev/fluids/R32.json | 42 +++++++++++++++++++----------- dev/fluids/R365MFC.json | 42 +++++++++++++++++++----------- dev/fluids/R404A.json | 42 +++++++++++++++++++----------- dev/fluids/R407C.json | 42 +++++++++++++++++++----------- dev/fluids/R407F.json | 42 +++++++++++++++++++----------- dev/fluids/R41.json | 42 +++++++++++++++++++----------- dev/fluids/R410A.json | 42 +++++++++++++++++++----------- dev/fluids/R507A.json | 42 +++++++++++++++++++----------- dev/fluids/RC318.json | 42 +++++++++++++++++++----------- dev/fluids/SES36.json | 42 +++++++++++++++++++----------- dev/fluids/SulfurDioxide.json | 42 +++++++++++++++++++----------- dev/fluids/SulfurHexafluoride.json | 42 +++++++++++++++++++----------- dev/fluids/Toluene.json | 42 +++++++++++++++++++----------- dev/fluids/Water.json | 42 +++++++++++++++++++----------- dev/fluids/Xenon.json | 42 +++++++++++++++++++----------- dev/fluids/cis-2-Butene.json | 42 +++++++++++++++++++----------- dev/fluids/m-Xylene.json | 42 +++++++++++++++++++----------- dev/fluids/n-Butane.json | 42 +++++++++++++++++++----------- dev/fluids/n-Decane.json | 42 +++++++++++++++++++----------- dev/fluids/n-Dodecane.json | 42 +++++++++++++++++++----------- dev/fluids/n-Heptane.json | 42 +++++++++++++++++++----------- dev/fluids/n-Hexane.json | 42 +++++++++++++++++++----------- dev/fluids/n-Nonane.json | 42 +++++++++++++++++++----------- dev/fluids/n-Octane.json | 42 +++++++++++++++++++----------- dev/fluids/n-Pentane.json | 42 +++++++++++++++++++----------- dev/fluids/n-Propane.json | 42 +++++++++++++++++++----------- dev/fluids/n-Undecane.json | 42 +++++++++++++++++++----------- dev/fluids/o-Xylene.json | 42 +++++++++++++++++++----------- dev/fluids/p-Xylene.json | 42 +++++++++++++++++++----------- dev/fluids/trans-2-Butene.json | 42 +++++++++++++++++++----------- 114 files changed, 3078 insertions(+), 1710 deletions(-) diff --git a/dev/fluids/1-Butene.json b/dev/fluids/1-Butene.json index e73dc887..886d4c58 100644 --- a/dev/fluids/1-Butene.json +++ b/dev/fluids/1-Butene.json @@ -138,6 +138,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Lemmon-FPE-2005", + "STATES": { + "reducing": { + "T": 419.29, + "T_units": "K", + "p": 4005100, + "p_units": "Pa", + "rhomolar": 4240, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 87.8, + "T_units": "K", + "p": 5.945299459547533e-10, + "p_units": "Pa", + "rhomolar": 14581.857989478618, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 87.8, + "T_units": "K", + "p": 5.945299459547533e-10, + "p_units": "Pa", + "rhomolar": 8.144127114069056e-10, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 525, "T_max_units": "K", "Ttriple": 87.8, @@ -237,21 +263,7 @@ "molar_mass_units": "kg/mol", "p_max": 50000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 5.94529946e-07, - "ptriple_units": "Pa", - "reducing_state": { - "T": 419.29, - "T_units": "K", - "p": 4005100, - "p_units": "Pa", - "rhomolar": 4240, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 14581.83824668767, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 8.148005394321945e-10, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "1-Butene", diff --git a/dev/fluids/AceticAcid.json b/dev/fluids/AceticAcid.json index 38c7b34b..16a9c448 100644 --- a/dev/fluids/AceticAcid.json +++ b/dev/fluids/AceticAcid.json @@ -113,6 +113,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Piazza-FPE-2011", + "STATES": { + "reducing": { + "T": 590.7, + "T_units": "K", + "p": 5817526.273111491, + "p_units": "Pa", + "rhomolar": 5844.938283446536, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 289.8, + "T_units": "K", + "p": 1.075589507812013, + "p_units": "Pa", + "rhomolar": 17521.28114508397, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 289.8, + "T_units": "K", + "p": 1.075589507812013, + "p_units": "Pa", + "rhomolar": 0.8334185536602265, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 500, "T_max_units": "K", "Ttriple": 289.8, @@ -239,21 +265,7 @@ "molar_mass_units": "kg/mol", "p_max": 30000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 1075.589508, - "ptriple_units": "Pa", - "reducing_state": { - "T": 590.7, - "T_units": "K", - "p": 5817526.273111491, - "p_units": "Pa", - "rhomolar": 5844.938283446536, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 17521.26343475435, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 0.8334697179759745, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "AceticAcid", diff --git a/dev/fluids/Acetone.json b/dev/fluids/Acetone.json index e178e419..51fd5d3c 100644 --- a/dev/fluids/Acetone.json +++ b/dev/fluids/Acetone.json @@ -136,6 +136,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Lemmon-JCED-2006", + "STATES": { + "reducing": { + "T": 508.1, + "T_units": "K", + "p": 4700000, + "p_units": "Pa", + "rhomolar": 4699.999999999999, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 178.5, + "T_units": "K", + "p": 0.002326486782481569, + "p_units": "Pa", + "rhomolar": 15722.96134426609, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 178.5, + "T_units": "K", + "p": 0.002326486782481569, + "p_units": "Pa", + "rhomolar": 0.001567650380630057, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 550, "T_max_units": "K", "Ttriple": 178.5, @@ -239,21 +265,7 @@ "molar_mass_units": "kg/mol", "p_max": 700000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 2.326486782, - "ptriple_units": "Pa", - "reducing_state": { - "T": 508.1, - "T_units": "K", - "p": 4700000, - "p_units": "Pa", - "rhomolar": 4699.999999999999, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 15722.94256896055, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 0.001567864714047582, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "Acetone", diff --git a/dev/fluids/Air.json b/dev/fluids/Air.json index 3620dab9..43dd5049 100644 --- a/dev/fluids/Air.json +++ b/dev/fluids/Air.json @@ -125,6 +125,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Lemmon-JPCRD-2000", + "STATES": { + "reducing": { + "T": 132.6312, + "T_units": "K", + "p": 3785020, + "p_units": "Pa", + "rhomolar": 10447.7, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 59.75, + "T_units": "K", + "p": 5.2646378681251385, + "p_units": "Pa", + "rhomolar": 33066.64175205524, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 59.75, + "T_units": "K", + "p": 2.4316336588845036, + "p_units": "Pa", + "rhomolar": 4.906850672383319, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 2000, "T_max_units": "K", "Ttriple": 59.75, @@ -282,21 +308,7 @@ "molar_mass_units": "kg/mol", "p_max": 2000000000, "p_max_units": "Pa", - "pseudo_pure": true, - "ptriple": 2431.633659, - "ptriple_units": "Pa", - "reducing_state": { - "T": 132.6312, - "T_units": "K", - "p": 3785020, - "p_units": "Pa", - "rhomolar": 10447.7, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 3.452387774956794e+100, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 3.452387774956794e+100, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": true } ], "NAME": "Air", diff --git a/dev/fluids/Ammonia.json b/dev/fluids/Ammonia.json index b0f5bd6e..4df5eb20 100644 --- a/dev/fluids/Ammonia.json +++ b/dev/fluids/Ammonia.json @@ -140,6 +140,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "TillnerRoth-DKV-1993", + "STATES": { + "reducing": { + "T": 405.4, + "T_units": "K", + "p": 11333000, + "p_units": "Pa", + "rhomolar": 13211.77715431239, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 195.495, + "T_units": "K", + "p": 6.091223107699592, + "p_units": "Pa", + "rhomolar": 43035.3392920732, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 195.495, + "T_units": "K", + "p": 6.091223107699592, + "p_units": "Pa", + "rhomolar": 3.76350602709112, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 700, "T_max_units": "K", "Ttriple": 195.495, @@ -273,21 +299,7 @@ "molar_mass_units": "kg/mol", "p_max": 1000000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 6091.223108, - "ptriple_units": "Pa", - "reducing_state": { - "T": 405.4, - "T_units": "K", - "p": 11333000, - "p_units": "Pa", - "rhomolar": 13211.77715431239, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 43035.27755672421, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 3.763788357868352, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "Ammonia", diff --git a/dev/fluids/Argon.json b/dev/fluids/Argon.json index 51a929b7..9e87182c 100644 --- a/dev/fluids/Argon.json +++ b/dev/fluids/Argon.json @@ -136,6 +136,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Tegeler-JPCRD-1999", + "STATES": { + "reducing": { + "T": 150.687, + "T_units": "K", + "p": 4863000, + "p_units": "Pa", + "rhomolar": 13407.42965855612, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 83.806, + "T_units": "K", + "p": 68.89247707906286, + "p_units": "Pa", + "rhomolar": 35465.24383230812, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 83.806, + "T_units": "K", + "p": 68.89247707906286, + "p_units": "Pa", + "rhomolar": 101.49850850490478, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 700, "T_max_units": "K", "Ttriple": 83.806, @@ -365,21 +391,7 @@ "molar_mass_units": "kg/mol", "p_max": 1000000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 68892.47708, - "ptriple_units": "Pa", - "reducing_state": { - "T": 150.687, - "T_units": "K", - "p": 4863000, - "p_units": "Pa", - "rhomolar": 13407.42965855612, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 35465.09209833706, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 101.5092253011949, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "Argon", diff --git a/dev/fluids/Benzene.json b/dev/fluids/Benzene.json index 5b676dad..d07bc172 100644 --- a/dev/fluids/Benzene.json +++ b/dev/fluids/Benzene.json @@ -140,6 +140,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Thol-HTHP-2012", + "STATES": { + "reducing": { + "T": 562.02, + "T_units": "K", + "p": 4894000, + "p_units": "Pa", + "rhomolar": 3902, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 278.674, + "T_units": "K", + "p": 4.783772578048188, + "p_units": "Pa", + "rhomolar": 11446.465591920278, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 278.674, + "T_units": "K", + "p": 4.783772578048188, + "p_units": "Pa", + "rhomolar": 2.0716402525505235, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 725, "T_max_units": "K", "Ttriple": 278.674, @@ -280,21 +306,7 @@ "molar_mass_units": "kg/mol", "p_max": 500000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 4783.772578, - "ptriple_units": "Pa", - "reducing_state": { - "T": 562.02, - "T_units": "K", - "p": 4894000, - "p_units": "Pa", - "rhomolar": 3902, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 11446.45205146822, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 2.07174574079405, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "Benzene", diff --git a/dev/fluids/CarbonDioxide.json b/dev/fluids/CarbonDioxide.json index a1ce523c..8c72f078 100644 --- a/dev/fluids/CarbonDioxide.json +++ b/dev/fluids/CarbonDioxide.json @@ -139,6 +139,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Span-JPCRD-1996", + "STATES": { + "reducing": { + "T": 304.1282, + "T_units": "K", + "p": 7377300, + "p_units": "Pa", + "rhomolar": 10624.9063, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 216.592, + "T_units": "K", + "p": 517.9643433349185, + "p_units": "Pa", + "rhomolar": 26777.277860212125, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 216.592, + "T_units": "K", + "p": 517.9643433349185, + "p_units": "Pa", + "rhomolar": 312.6777446892703, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 1100, "T_max_units": "K", "Ttriple": 216.592, @@ -429,21 +455,7 @@ "molar_mass_units": "kg/mol", "p_max": 800000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 517964.3433, - "ptriple_units": "Pa", - "reducing_state": { - "T": 304.1282, - "T_units": "K", - "p": 7377300, - "p_units": "Pa", - "rhomolar": 10624.9063, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 26777.19637087835, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 312.6907221828656, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "CarbonDioxide", diff --git a/dev/fluids/CarbonMonoxide.json b/dev/fluids/CarbonMonoxide.json index 38aa6761..0451de18 100644 --- a/dev/fluids/CarbonMonoxide.json +++ b/dev/fluids/CarbonMonoxide.json @@ -136,6 +136,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Lemmon-JCED-2006", + "STATES": { + "reducing": { + "T": 132.86, + "T_units": "K", + "p": 3494000, + "p_units": "Pa", + "rhomolar": 10850, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 68.16, + "T_units": "K", + "p": 15.536876656377347, + "p_units": "Pa", + "rhomolar": 30329.705964719713, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 68.16, + "T_units": "K", + "p": 15.536876656377347, + "p_units": "Pa", + "rhomolar": 27.707433845423196, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 500, "T_max_units": "K", "Ttriple": 68.16, @@ -238,21 +264,7 @@ "molar_mass_units": "kg/mol", "p_max": 100000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 15536.87666, - "ptriple_units": "Pa", - "reducing_state": { - "T": 132.86, - "T_units": "K", - "p": 3494000, - "p_units": "Pa", - "rhomolar": 10850, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 30329.56214318188, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 27.71177905101628, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "CarbonMonoxide", diff --git a/dev/fluids/CarbonylSulfide.json b/dev/fluids/CarbonylSulfide.json index 67dfeb29..942d6370 100644 --- a/dev/fluids/CarbonylSulfide.json +++ b/dev/fluids/CarbonylSulfide.json @@ -136,6 +136,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Lemmon-JCED-2006", + "STATES": { + "reducing": { + "T": 378.77, + "T_units": "K", + "p": 6370000, + "p_units": "Pa", + "rhomolar": 7410, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 134.3, + "T_units": "K", + "p": 0.06443457746825784, + "p_units": "Pa", + "rhomolar": 22517.918912779165, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 134.3, + "T_units": "K", + "p": 0.06443457746825784, + "p_units": "Pa", + "rhomolar": 0.05771047185816631, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 650, "T_max_units": "K", "Ttriple": 134.3, @@ -235,21 +261,7 @@ "molar_mass_units": "kg/mol", "p_max": 50000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 64.43457747, - "ptriple_units": "Pa", - "reducing_state": { - "T": 378.77, - "T_units": "K", - "p": 6370000, - "p_units": "Pa", - "rhomolar": 7410, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 22517.88586815158, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 0.05771851535442867, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "CarbonylSulfide", diff --git a/dev/fluids/CycloHexane.json b/dev/fluids/CycloHexane.json index e0e02b70..ea133c5d 100644 --- a/dev/fluids/CycloHexane.json +++ b/dev/fluids/CycloHexane.json @@ -136,6 +136,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Zhou-PREPRINT-2014", + "STATES": { + "reducing": { + "T": 553.6, + "T_units": "K", + "p": 4082400, + "p_units": "Pa", + "rhomolar": 3224, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 279.47, + "T_units": "K", + "p": 5.240240246526451, + "p_units": "Pa", + "rhomolar": 9403.362051842001, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 279.47, + "T_units": "K", + "p": 5.240240246526451, + "p_units": "Pa", + "rhomolar": 2.264530785370476, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 700, "T_max_units": "K", "Ttriple": 279.47, @@ -320,21 +346,7 @@ "molar_mass_units": "kg/mol", "p_max": 250000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 5240.240247, - "ptriple_units": "Pa", - "reducing_state": { - "T": 553.6, - "T_units": "K", - "p": 4082400, - "p_units": "Pa", - "rhomolar": 3224, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 9403.351008678657, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 2.264642210488062, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "CycloHexane", diff --git a/dev/fluids/CycloPropane.json b/dev/fluids/CycloPropane.json index 15df0b06..22b38411 100644 --- a/dev/fluids/CycloPropane.json +++ b/dev/fluids/CycloPropane.json @@ -126,6 +126,32 @@ { "BibTeX_CP0": "Polt-CT-1992", "BibTeX_EOS": "Polt-CT-1992", + "STATES": { + "reducing": { + "T": 398.3, + "T_units": "K", + "p": 5579700, + "p_units": "Pa", + "rhomolar": 6142.9149, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 273.0, + "T_units": "K", + "p": 342.7022037357092, + "p_units": "Pa", + "rhomolar": 15594.27233601817, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 273.0, + "T_units": "K", + "p": 342.7022037357092, + "p_units": "Pa", + "rhomolar": 164.03030361467836, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 473, "T_max_units": "K", "Ttriple": 145.7, @@ -275,21 +301,7 @@ "molar_mass_units": "kg/mol", "p_max": 28000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 342702.2037, - "ptriple_units": "Pa", - "reducing_state": { - "T": 398.3, - "T_units": "K", - "p": 5579700, - "p_units": "Pa", - "rhomolar": 6142.9149, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 2.376369382856871e+100, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 2.376369382856871e+100, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "CycloPropane", diff --git a/dev/fluids/Cyclopentane.json b/dev/fluids/Cyclopentane.json index 8b682baf..27d785f8 100644 --- a/dev/fluids/Cyclopentane.json +++ b/dev/fluids/Cyclopentane.json @@ -126,6 +126,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Gedanitz-PREPRINT-2013", + "STATES": { + "reducing": { + "T": 511.72, + "T_units": "K", + "p": 4571200, + "p_units": "Pa", + "rhomolar": 3820.000000000001, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 179.7, + "T_units": "K", + "p": 0.00885427141819524, + "p_units": "Pa", + "rhomolar": 12107.608792031857, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 179.7, + "T_units": "K", + "p": 0.00885427141819524, + "p_units": "Pa", + "rhomolar": 0.0059262178661649515, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 550, "T_max_units": "K", "Ttriple": 179.7, @@ -262,21 +288,7 @@ "molar_mass_units": "kg/mol", "p_max": 250000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 8.854271418, - "ptriple_units": "Pa", - "reducing_state": { - "T": 511.72, - "T_units": "K", - "p": 4571200, - "p_units": "Pa", - "rhomolar": 3820.000000000001, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 12107.59623891635, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 0.00592693841039708, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "Cyclopentane", diff --git a/dev/fluids/D4.json b/dev/fluids/D4.json index 790508c4..2be20f0a 100644 --- a/dev/fluids/D4.json +++ b/dev/fluids/D4.json @@ -125,6 +125,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Colonna-FPE-2006", + "STATES": { + "reducing": { + "T": 586.49127187, + "T_units": "K", + "p": 1332000, + "p_units": "Pa", + "rhomolar": 1035.122310000001, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 290.25, + "T_units": "K", + "p": 0.06960923766877697, + "p_units": "Pa", + "rhomolar": 3200.445098116998, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 290.25, + "T_units": "K", + "p": 0.06960923766877697, + "p_units": "Pa", + "rhomolar": 0.028853717844681662, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 673, "T_max_units": "K", "Ttriple": 290.25, @@ -236,21 +262,7 @@ "molar_mass_units": "kg/mol", "p_max": 30000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 69.60923767, - "ptriple_units": "Pa", - "reducing_state": { - "T": 586.49127187, - "T_units": "K", - "p": 1332000, - "p_units": "Pa", - "rhomolar": 1035.122310000001, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 3200.441443603881, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 0.02885594486307443, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "D4", diff --git a/dev/fluids/D5.json b/dev/fluids/D5.json index df7b55a1..84d51322 100644 --- a/dev/fluids/D5.json +++ b/dev/fluids/D5.json @@ -125,6 +125,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Colonna-FPE-2006", + "STATES": { + "reducing": { + "T": 619.23462341, + "T_units": "K", + "p": 1161460, + "p_units": "Pa", + "rhomolar": 789.0902699999999, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 300.0, + "T_units": "K", + "p": 0.027511665281725335, + "p_units": "Pa", + "rhomolar": 2590.015134448574, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 300.0, + "T_units": "K", + "p": 0.027511665281725335, + "p_units": "Pa", + "rhomolar": 0.011031433967445782, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 673, "T_max_units": "K", "Ttriple": 226, @@ -236,21 +262,7 @@ "molar_mass_units": "kg/mol", "p_max": 30000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 27.51166528, - "ptriple_units": "Pa", - "reducing_state": { - "T": 619.23462341, - "T_units": "K", - "p": 1161460, - "p_units": "Pa", - "rhomolar": 789.0902699999999, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 2.69709202235242e+99, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 2.69709202235242e+99, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "D5", diff --git a/dev/fluids/D6.json b/dev/fluids/D6.json index beba6421..f05af3a5 100644 --- a/dev/fluids/D6.json +++ b/dev/fluids/D6.json @@ -125,6 +125,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Colonna-FPE-2008", + "STATES": { + "reducing": { + "T": 645.78, + "T_units": "K", + "p": 961000, + "p_units": "Pa", + "rhomolar": 627.2885477999996, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 270.2, + "T_units": "K", + "p": 0.00015975303819928407, + "p_units": "Pa", + "rhomolar": 2245.0762899076435, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 270.2, + "T_units": "K", + "p": 0.00015975303819928407, + "p_units": "Pa", + "rhomolar": 7.11098197032432e-05, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 673, "T_max_units": "K", "Ttriple": 270.2, @@ -227,21 +253,7 @@ "molar_mass_units": "kg/mol", "p_max": 30000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 0.1597530382, - "ptriple_units": "Pa", - "reducing_state": { - "T": 645.78, - "T_units": "K", - "p": 961000, - "p_units": "Pa", - "rhomolar": 627.2885477999996, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 2245.073821584233, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 7.111827573678096e-05, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "D6", diff --git a/dev/fluids/Deuterium.json b/dev/fluids/Deuterium.json index 0d8f926e..4f6f388a 100644 --- a/dev/fluids/Deuterium.json +++ b/dev/fluids/Deuterium.json @@ -137,6 +137,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Richardson-JPCRD-2013", + "STATES": { + "reducing": { + "T": 38.34, + "T_units": "K", + "p": 1679600, + "p_units": "Pa", + "rhomolar": 17230, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 18.724, + "T_units": "K", + "p": 17.1891019732537, + "p_units": "Pa", + "rhomolar": 43350.920890356414, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 18.724, + "T_units": "K", + "p": 17.1891019732537, + "p_units": "Pa", + "rhomolar": 112.95640342174914, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 600, "T_max_units": "K", "Ttriple": 18.724, @@ -326,21 +352,7 @@ "molar_mass_units": "kg/mol", "p_max": 2000000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 17189.10197, - "ptriple_units": "Pa", - "reducing_state": { - "T": 38.34, - "T_units": "K", - "p": 1679600, - "p_units": "Pa", - "rhomolar": 17230, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 43350.35393172985, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 113.0018950964478, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "Deuterium", diff --git a/dev/fluids/DimethylCarbonate.json b/dev/fluids/DimethylCarbonate.json index 009f908d..0812be52 100644 --- a/dev/fluids/DimethylCarbonate.json +++ b/dev/fluids/DimethylCarbonate.json @@ -126,6 +126,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Zhou-JPCRD-2011", + "STATES": { + "reducing": { + "T": 557, + "T_units": "K", + "p": 4908800, + "p_units": "Pa", + "rhomolar": 4000, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 277.06, + "T_units": "K", + "p": 2.226523726360071, + "p_units": "Pa", + "rhomolar": 12111.201661172097, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 277.06, + "T_units": "K", + "p": 2.226523726360071, + "p_units": "Pa", + "rhomolar": 0.9680130259154924, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 600, "T_max_units": "K", "Ttriple": 277.06, @@ -284,21 +310,7 @@ "molar_mass_units": "kg/mol", "p_max": 60000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 2226.523726, - "ptriple_units": "Pa", - "reducing_state": { - "T": 557, - "T_units": "K", - "p": 4908800, - "p_units": "Pa", - "rhomolar": 4000, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 12111.18713006095, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 0.9680689047177409, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "DimethylCarbonate", diff --git a/dev/fluids/DimethylEther.json b/dev/fluids/DimethylEther.json index 909b59e1..adad9cf0 100644 --- a/dev/fluids/DimethylEther.json +++ b/dev/fluids/DimethylEther.json @@ -135,6 +135,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Wu-JPCRD-2011", + "STATES": { + "reducing": { + "T": 400.378, + "T_units": "K", + "p": 5336800, + "p_units": "Pa", + "rhomolar": 5940.000000000001, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 131.66, + "T_units": "K", + "p": 0.0022107283172852626, + "p_units": "Pa", + "rhomolar": 19149.523468676703, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 131.66, + "T_units": "K", + "p": 0.0022107283172852626, + "p_units": "Pa", + "rhomolar": 0.0020195317198284978, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 550, "T_max_units": "K", "Ttriple": 131.66, @@ -275,21 +301,7 @@ "molar_mass_units": "kg/mol", "p_max": 50000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 2.210728317, - "ptriple_units": "Pa", - "reducing_state": { - "T": 400.378, - "T_units": "K", - "p": 5336800, - "p_units": "Pa", - "rhomolar": 5940.000000000001, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 19149.49715074463, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 0.002019896781384355, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "DimethylEther", diff --git a/dev/fluids/Ethane.json b/dev/fluids/Ethane.json index 42ca1a5a..bda54dd3 100644 --- a/dev/fluids/Ethane.json +++ b/dev/fluids/Ethane.json @@ -138,6 +138,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Buecker-JPCRD-2006", + "STATES": { + "reducing": { + "T": 305.322, + "T_units": "K", + "p": 4872200, + "p_units": "Pa", + "rhomolar": 6856.886685, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 90.368, + "T_units": "K", + "p": 0.0011421081151322327, + "p_units": "Pa", + "rhomolar": 21667.78455939388, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 90.368, + "T_units": "K", + "p": 0.0011421081151322327, + "p_units": "Pa", + "rhomolar": 0.0015200554552625017, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 675, "T_max_units": "K", "Ttriple": 90.368, @@ -403,21 +429,7 @@ "molar_mass_units": "kg/mol", "p_max": 900000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 1.142108115, - "ptriple_units": "Pa", - "reducing_state": { - "T": 305.322, - "T_units": "K", - "p": 4872200, - "p_units": "Pa", - "rhomolar": 6856.886685, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 21667.74788890113, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 0.001520439053820902, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "Ethane", diff --git a/dev/fluids/Ethanol.json b/dev/fluids/Ethanol.json index eb8b312e..25a12ebe 100644 --- a/dev/fluids/Ethanol.json +++ b/dev/fluids/Ethanol.json @@ -137,6 +137,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Schroeder-MSTHESIS-2011", + "STATES": { + "reducing": { + "T": 514.71, + "T_units": "K", + "p": 6268000, + "p_units": "Pa", + "rhomolar": 5930, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 159.1, + "T_units": "K", + "p": 7.350470774723326e-07, + "p_units": "Pa", + "rhomolar": 19729.11257931593, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 159.1, + "T_units": "K", + "p": 7.350470774723326e-07, + "p_units": "Pa", + "rhomolar": 5.556614984609347e-07, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 650, "T_max_units": "K", "Ttriple": 159.1, @@ -338,21 +364,7 @@ "molar_mass_units": "kg/mol", "p_max": 280000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 0.0007350470775, - "ptriple_units": "Pa", - "reducing_state": { - "T": 514.71, - "T_units": "K", - "p": 6268000, - "p_units": "Pa", - "rhomolar": 5930, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 19729.08885611082, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 5.557847680758439e-07, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "Ethanol", diff --git a/dev/fluids/EthylBenzene.json b/dev/fluids/EthylBenzene.json index 9cae96fe..74f5b442 100644 --- a/dev/fluids/EthylBenzene.json +++ b/dev/fluids/EthylBenzene.json @@ -114,6 +114,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Zhou-JPCRD-2012", + "STATES": { + "reducing": { + "T": 617.12, + "T_units": "K", + "p": 3622400, + "p_units": "Pa", + "rhomolar": 2741.016, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 178.2, + "T_units": "K", + "p": 4.0029613919817915e-06, + "p_units": "Pa", + "rhomolar": 9123.245960497055, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 178.2, + "T_units": "K", + "p": 4.0029613919817915e-06, + "p_units": "Pa", + "rhomolar": 2.7017119098181417e-06, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 700, "T_max_units": "K", "Ttriple": 178.2, @@ -256,21 +282,7 @@ "molar_mass_units": "kg/mol", "p_max": 60000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 0.004002961392, - "ptriple_units": "Pa", - "reducing_state": { - "T": 617.12, - "T_units": "K", - "p": 3622400, - "p_units": "Pa", - "rhomolar": 2741.016, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 9123.237141963473, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 2.702209571410398e-06, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "EthylBenzene", diff --git a/dev/fluids/Ethylene.json b/dev/fluids/Ethylene.json index 66e2c8b9..cf5d5d21 100644 --- a/dev/fluids/Ethylene.json +++ b/dev/fluids/Ethylene.json @@ -136,6 +136,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Smukala-JPCRD-2000", + "STATES": { + "reducing": { + "T": 282.35, + "T_units": "K", + "p": 5041800, + "p_units": "Pa", + "rhomolar": 7636.76598074554, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 103.989, + "T_units": "K", + "p": 0.1220267638428971, + "p_units": "Pa", + "rhomolar": 23333.806692211565, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 103.989, + "T_units": "K", + "p": 0.1220267638428971, + "p_units": "Pa", + "rhomolar": 0.1411618295576975, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 450, "T_max_units": "K", "Ttriple": 103.989, @@ -365,21 +391,7 @@ "molar_mass_units": "kg/mol", "p_max": 300000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 122.0267638, - "ptriple_units": "Pa", - "reducing_state": { - "T": 282.35, - "T_units": "K", - "p": 5041800, - "p_units": "Pa", - "rhomolar": 7636.76598074554, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 23333.76164627406, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 0.1411854791624635, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "Ethylene", diff --git a/dev/fluids/Fluorine.json b/dev/fluids/Fluorine.json index 6085bbde..8a426e14 100644 --- a/dev/fluids/Fluorine.json +++ b/dev/fluids/Fluorine.json @@ -136,6 +136,32 @@ { "BibTeX_CP0": "deReuck-BOOK-1990", "BibTeX_EOS": "deReuck-BOOK-1990", + "STATES": { + "reducing": { + "T": 144.414, + "T_units": "K", + "p": 5172400, + "p_units": "Pa", + "rhomolar": 15603, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 53.4811, + "T_units": "K", + "p": 0.2388103329299759, + "p_units": "Pa", + "rhomolar": 44917.31036907297, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 53.4811, + "T_units": "K", + "p": 0.2388103329299759, + "p_units": "Pa", + "rhomolar": 0.537248503917467, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 300, "T_max_units": "K", "Ttriple": 53.4811, @@ -365,21 +391,7 @@ "molar_mass_units": "kg/mol", "p_max": 20000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 238.8103329, - "ptriple_units": "Pa", - "reducing_state": { - "T": 144.414, - "T_units": "K", - "p": 5172400, - "p_units": "Pa", - "rhomolar": 15603, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 44917.13573008027, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 0.5374094722802236, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "Fluorine", diff --git a/dev/fluids/HFE143m.json b/dev/fluids/HFE143m.json index 4a7ba82a..f6ec2c41 100644 --- a/dev/fluids/HFE143m.json +++ b/dev/fluids/HFE143m.json @@ -117,6 +117,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Akasaka-IJR-2012", + "STATES": { + "reducing": { + "T": 377.921, + "T_units": "K", + "p": 3635000, + "p_units": "Pa", + "rhomolar": 4648.140744, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 240.0, + "T_units": "K", + "p": 65.35939300696849, + "p_units": "Pa", + "rhomolar": 12615.354950558858, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 240.0, + "T_units": "K", + "p": 65.35939300696849, + "p_units": "Pa", + "rhomolar": 34.01804620551361, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 4220, "T_max_units": "K", "Ttriple": 240, @@ -248,21 +274,7 @@ "molar_mass_units": "kg/mol", "p_max": 7200000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 65359.39301, - "ptriple_units": "Pa", - "reducing_state": { - "T": 377.921, - "T_units": "K", - "p": 3635000, - "p_units": "Pa", - "rhomolar": 4648.140744, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 12615.3284879174, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 34.01957819070063, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "HFE143m", diff --git a/dev/fluids/Helium.json b/dev/fluids/Helium.json index 0992b24c..9563bc07 100644 --- a/dev/fluids/Helium.json +++ b/dev/fluids/Helium.json @@ -141,6 +141,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "OrtizVega-2010", + "STATES": { + "reducing": { + "T": 5.1953, + "T_units": "K", + "p": 227600, + "p_units": "Pa", + "rhomolar": 17383.7, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 2.1768, + "T_units": "K", + "p": 5.04275718944867, + "p_units": "Pa", + "rhomolar": 36459.66840252621, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 2.1768, + "T_units": "K", + "p": 5.04275718944867, + "p_units": "Pa", + "rhomolar": 293.3016136659702, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 2000, "T_max_units": "K", "Ttriple": 2.1768, @@ -311,21 +337,7 @@ "molar_mass_units": "kg/mol", "p_max": 1000000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 5042.757189, - "ptriple_units": "Pa", - "reducing_state": { - "T": 5.1953, - "T_units": "K", - "p": 227600, - "p_units": "Pa", - "rhomolar": 17383.7, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 36459.45454859136, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 293.9108313933456, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "Helium", diff --git a/dev/fluids/Hydrogen.json b/dev/fluids/Hydrogen.json index fa4867d6..d0a177a8 100644 --- a/dev/fluids/Hydrogen.json +++ b/dev/fluids/Hydrogen.json @@ -142,6 +142,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Leachman-JPCRD-2009", + "STATES": { + "reducing": { + "T": 33.145, + "T_units": "K", + "p": 1296400, + "p_units": "Pa", + "rhomolar": 15508, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 13.957, + "T_units": "K", + "p": 7.357828141690358, + "p_units": "Pa", + "rhomolar": 38198.54161031631, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 13.957, + "T_units": "K", + "p": 7.357828141690358, + "p_units": "Pa", + "rhomolar": 64.41526917350258, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 1000, "T_max_units": "K", "Ttriple": 13.957, @@ -283,21 +309,7 @@ "molar_mass_units": "kg/mol", "p_max": 2000000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 7357.828142, - "ptriple_units": "Pa", - "reducing_state": { - "T": 33.145, - "T_units": "K", - "p": 1296400, - "p_units": "Pa", - "rhomolar": 15508, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 38198.13818258921, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 64.44810198985165, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "Hydrogen", diff --git a/dev/fluids/HydrogenSulfide.json b/dev/fluids/HydrogenSulfide.json index 1774eb2c..6d5a276b 100644 --- a/dev/fluids/HydrogenSulfide.json +++ b/dev/fluids/HydrogenSulfide.json @@ -136,6 +136,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Lemmon-JCED-2006", + "STATES": { + "reducing": { + "T": 373.1, + "T_units": "K", + "p": 9000000, + "p_units": "Pa", + "rhomolar": 10190, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 187.7, + "T_units": "K", + "p": 23.258855840736683, + "p_units": "Pa", + "rhomolar": 29116.326840626763, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 187.7, + "T_units": "K", + "p": 23.258855840736683, + "p_units": "Pa", + "rhomolar": 15.024228571877876, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 760, "T_max_units": "K", "Ttriple": 187.7, @@ -240,21 +266,7 @@ "molar_mass_units": "kg/mol", "p_max": 170000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 23258.85584, - "ptriple_units": "Pa", - "reducing_state": { - "T": 373.1, - "T_units": "K", - "p": 9000000, - "p_units": "Pa", - "rhomolar": 10190, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 29116.27758075055, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 15.02516830469272, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "HydrogenSulfide", diff --git a/dev/fluids/IsoButane.json b/dev/fluids/IsoButane.json index a259622d..eebb5e5b 100644 --- a/dev/fluids/IsoButane.json +++ b/dev/fluids/IsoButane.json @@ -141,6 +141,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Buecker-JPCRD-2006B", + "STATES": { + "reducing": { + "T": 407.81, + "T_units": "K", + "p": 3629000, + "p_units": "Pa", + "rhomolar": 3879.756788283995, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 113.73, + "T_units": "K", + "p": 2.2879446966082075e-05, + "p_units": "Pa", + "rhomolar": 12737.656182433244, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 113.73, + "T_units": "K", + "p": 2.2879446966082075e-05, + "p_units": "Pa", + "rhomolar": 2.4195571571567102e-05, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 575, "T_max_units": "K", "Ttriple": 113.73, @@ -321,21 +347,7 @@ "molar_mass_units": "kg/mol", "p_max": 35000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 0.02287944697, - "ptriple_units": "Pa", - "reducing_state": { - "T": 407.81, - "T_units": "K", - "p": 3629000, - "p_units": "Pa", - "rhomolar": 3879.756788283995, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 12737.63993166686, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 2.420164552028876e-05, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "IsoButane", diff --git a/dev/fluids/IsoButene.json b/dev/fluids/IsoButene.json index 34cb50aa..25c09048 100644 --- a/dev/fluids/IsoButene.json +++ b/dev/fluids/IsoButene.json @@ -136,6 +136,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Lemmon-FPE-2005", + "STATES": { + "reducing": { + "T": 418.09, + "T_units": "K", + "p": 4009800, + "p_units": "Pa", + "rhomolar": 4170, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 132.4, + "T_units": "K", + "p": 0.0006761899732718035, + "p_units": "Pa", + "rhomolar": 13666.751920875638, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 132.4, + "T_units": "K", + "p": 0.0006761899732718035, + "p_units": "Pa", + "rhomolar": 0.0006142550272163055, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 525, "T_max_units": "K", "Ttriple": 132.4, @@ -235,21 +261,7 @@ "molar_mass_units": "kg/mol", "p_max": 50000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 0.6761899733, - "ptriple_units": "Pa", - "reducing_state": { - "T": 418.09, - "T_units": "K", - "p": 4009800, - "p_units": "Pa", - "rhomolar": 4170, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 13666.73347813296, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 0.0006143704326081906, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "IsoButene", diff --git a/dev/fluids/Isohexane.json b/dev/fluids/Isohexane.json index caca3504..b01e1bd3 100644 --- a/dev/fluids/Isohexane.json +++ b/dev/fluids/Isohexane.json @@ -136,6 +136,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Lemmon-JCED-2006", + "STATES": { + "reducing": { + "T": 497.7, + "T_units": "K", + "p": 3040000, + "p_units": "Pa", + "rhomolar": 2715.000000000001, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 119.6, + "T_units": "K", + "p": 7.673974446178324e-09, + "p_units": "Pa", + "rhomolar": 9370.782450632156, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 119.6, + "T_units": "K", + "p": 7.673974446178324e-09, + "p_units": "Pa", + "rhomolar": 7.71710650450467e-09, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 500, "T_max_units": "K", "Ttriple": 119.6, @@ -235,21 +261,7 @@ "molar_mass_units": "kg/mol", "p_max": 1000000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 7.673974446e-06, - "ptriple_units": "Pa", - "reducing_state": { - "T": 497.7, - "T_units": "K", - "p": 3040000, - "p_units": "Pa", - "rhomolar": 2715.000000000001, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 9370.770983488099, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 7.71968171674387e-09, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "Isohexane", diff --git a/dev/fluids/Isopentane.json b/dev/fluids/Isopentane.json index c846a89f..b13fdcf3 100644 --- a/dev/fluids/Isopentane.json +++ b/dev/fluids/Isopentane.json @@ -137,6 +137,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Lemmon-JCED-2006", + "STATES": { + "reducing": { + "T": 460.35, + "T_units": "K", + "p": 3378000, + "p_units": "Pa", + "rhomolar": 3271, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 112.65, + "T_units": "K", + "p": 8.952745179434145e-08, + "p_units": "Pa", + "rhomolar": 10935.8893141883, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 112.65, + "T_units": "K", + "p": 8.952745179434145e-08, + "p_units": "Pa", + "rhomolar": 9.558513393991809e-08, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 500, "T_max_units": "K", "Ttriple": 112.65, @@ -236,21 +262,7 @@ "molar_mass_units": "kg/mol", "p_max": 1000000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 8.952745179e-05, - "ptriple_units": "Pa", - "reducing_state": { - "T": 460.35, - "T_units": "K", - "p": 3378000, - "p_units": "Pa", - "rhomolar": 3271, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 10935.8752298512, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 9.561583001422481e-08, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "Isopentane", diff --git a/dev/fluids/Krypton.json b/dev/fluids/Krypton.json index 703a3a0a..173120fa 100644 --- a/dev/fluids/Krypton.json +++ b/dev/fluids/Krypton.json @@ -136,6 +136,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Lemmon-JCED-2006", + "STATES": { + "reducing": { + "T": 209.48, + "T_units": "K", + "p": 5525000, + "p_units": "Pa", + "rhomolar": 10850, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 115.77, + "T_units": "K", + "p": 73.502837475028, + "p_units": "Pa", + "rhomolar": 29197.32240678559, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 115.77, + "T_units": "K", + "p": 73.502837475028, + "p_units": "Pa", + "rhomolar": 78.4175234091632, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 750, "T_max_units": "K", "Ttriple": 115.77, @@ -220,21 +246,7 @@ "molar_mass_units": "kg/mol", "p_max": 200000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 73502.83748, - "ptriple_units": "Pa", - "reducing_state": { - "T": 209.48, - "T_units": "K", - "p": 5525000, - "p_units": "Pa", - "rhomolar": 10850, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 29197.23261176175, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 78.42355224696817, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "Krypton", diff --git a/dev/fluids/MD2M.json b/dev/fluids/MD2M.json index 4d1bf9a8..001996cb 100644 --- a/dev/fluids/MD2M.json +++ b/dev/fluids/MD2M.json @@ -125,6 +125,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Colonna-FPE-2008", + "STATES": { + "reducing": { + "T": 599.4, + "T_units": "K", + "p": 1227000, + "p_units": "Pa", + "rhomolar": 914.6616014999984, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 205.2, + "T_units": "K", + "p": 4.7950993795487e-07, + "p_units": "Pa", + "rhomolar": 3032.1188560391715, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 205.2, + "T_units": "K", + "p": 4.7950993795487e-07, + "p_units": "Pa", + "rhomolar": 2.810512915459994e-07, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 673, "T_max_units": "K", "Ttriple": 205.2, @@ -227,21 +253,7 @@ "molar_mass_units": "kg/mol", "p_max": 30000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 0.000479509938, - "ptriple_units": "Pa", - "reducing_state": { - "T": 599.4, - "T_units": "K", - "p": 1227000, - "p_units": "Pa", - "rhomolar": 914.6616014999984, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 3032.115488664193, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 2.811052609114695e-07, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "MD2M", diff --git a/dev/fluids/MD3M.json b/dev/fluids/MD3M.json index 0a86f676..a2717049 100644 --- a/dev/fluids/MD3M.json +++ b/dev/fluids/MD3M.json @@ -125,6 +125,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Colonna-FPE-2008", + "STATES": { + "reducing": { + "T": 628.36, + "T_units": "K", + "p": 945000, + "p_units": "Pa", + "rhomolar": 685.7981626999992, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 192.0, + "T_units": "K", + "p": 2.057747643530664e-10, + "p_units": "Pa", + "rhomolar": 2541.798960773628, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 192.0, + "T_units": "K", + "p": 2.057747643530664e-10, + "p_units": "Pa", + "rhomolar": 1.2890097703756894e-10, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 673, "T_max_units": "K", "Ttriple": 192, @@ -227,21 +253,7 @@ "molar_mass_units": "kg/mol", "p_max": 30000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 2.057747644e-07, - "ptriple_units": "Pa", - "reducing_state": { - "T": 628.36, - "T_units": "K", - "p": 945000, - "p_units": "Pa", - "rhomolar": 685.7981626999992, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 2541.796114376564, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 1.289360613297565e-10, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "MD3M", diff --git a/dev/fluids/MD4M.json b/dev/fluids/MD4M.json index b637553d..6a0e2517 100644 --- a/dev/fluids/MD4M.json +++ b/dev/fluids/MD4M.json @@ -114,6 +114,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Colonna-FPE-2006", + "STATES": { + "reducing": { + "T": 653.2, + "T_units": "K", + "p": 877470, + "p_units": "Pa", + "rhomolar": 622.3569399999996, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 300.0, + "T_units": "K", + "p": 0.001093376953540781, + "p_units": "Pa", + "rhomolar": 1914.3670674385771, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 300.0, + "T_units": "K", + "p": 0.001093376953540781, + "p_units": "Pa", + "rhomolar": 0.00043834773801798706, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 673, "T_max_units": "K", "Ttriple": 214.15, @@ -219,21 +245,7 @@ "molar_mass_units": "kg/mol", "p_max": 30000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 1.093376954, - "ptriple_units": "Pa", - "reducing_state": { - "T": 653.2, - "T_units": "K", - "p": 877470, - "p_units": "Pa", - "rhomolar": 622.3569399999996, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 2.178681134503756e+99, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 2.178681134503756e+99, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "MD4M", diff --git a/dev/fluids/MDM.json b/dev/fluids/MDM.json index 7f7d0a2a..c1735569 100644 --- a/dev/fluids/MDM.json +++ b/dev/fluids/MDM.json @@ -125,6 +125,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Colonna-FPE-2008", + "STATES": { + "reducing": { + "T": 564.09, + "T_units": "K", + "p": 1415000, + "p_units": "Pa", + "rhomolar": 1085.436621399999, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 187.2, + "T_units": "K", + "p": 7.991110509185762e-07, + "p_units": "Pa", + "rhomolar": 3930.8232636425755, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 187.2, + "T_units": "K", + "p": 7.991110509185762e-07, + "p_units": "Pa", + "rhomolar": 5.134127178430179e-07, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 673, "T_max_units": "K", "Ttriple": 187.2, @@ -227,21 +253,7 @@ "molar_mass_units": "kg/mol", "p_max": 30000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 0.0007991110509, - "ptriple_units": "Pa", - "reducing_state": { - "T": 564.09, - "T_units": "K", - "p": 1415000, - "p_units": "Pa", - "rhomolar": 1085.436621399999, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 3930.818760661736, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 5.135191499435775e-07, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "MDM", diff --git a/dev/fluids/MM.json b/dev/fluids/MM.json index 4bc3d3ef..4bd9d1a4 100644 --- a/dev/fluids/MM.json +++ b/dev/fluids/MM.json @@ -125,6 +125,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Colonna-FPE-2006", + "STATES": { + "reducing": { + "T": 518.69997204, + "T_units": "K", + "p": 1939390, + "p_units": "Pa", + "rhomolar": 1874.67076, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 273.0, + "T_units": "K", + "p": 1.316986383534492, + "p_units": "Pa", + "rhomolar": 4817.682589392576, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 273.0, + "T_units": "K", + "p": 1.316986383534492, + "p_units": "Pa", + "rhomolar": 0.5820069274508293, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 673, "T_max_units": "K", "Ttriple": 204.93, @@ -236,21 +262,7 @@ "molar_mass_units": "kg/mol", "p_max": 30000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 1316.986384, - "ptriple_units": "Pa", - "reducing_state": { - "T": 518.69997204, - "T_units": "K", - "p": 1939390, - "p_units": "Pa", - "rhomolar": 1874.67076, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 6.158487948331765e+99, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 6.158487948331765e+99, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "MM", diff --git a/dev/fluids/Methane.json b/dev/fluids/Methane.json index f652e7cc..0df4885b 100644 --- a/dev/fluids/Methane.json +++ b/dev/fluids/Methane.json @@ -141,6 +141,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Setzmann-JPCRD-1991", + "STATES": { + "reducing": { + "T": 190.564, + "T_units": "K", + "p": 4599200, + "p_units": "Pa", + "rhomolar": 10139.128, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 90.6941, + "T_units": "K", + "p": 11.696064115134503, + "p_units": "Pa", + "rhomolar": 28141.91479265917, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 90.6941, + "T_units": "K", + "p": 11.696064115134503, + "p_units": "Pa", + "rhomolar": 15.62969180971744, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 625, "T_max_units": "K", "Ttriple": 90.6941, @@ -389,21 +415,7 @@ "molar_mass_units": "kg/mol", "p_max": 1000000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 11696.06412, - "ptriple_units": "Pa", - "reducing_state": { - "T": 190.564, - "T_units": "K", - "p": 4599200, - "p_units": "Pa", - "rhomolar": 10139.128, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 28141.83192295947, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 15.63154286998348, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "Methane", diff --git a/dev/fluids/Methanol.json b/dev/fluids/Methanol.json index eef1cb7a..0f35151a 100644 --- a/dev/fluids/Methanol.json +++ b/dev/fluids/Methanol.json @@ -140,6 +140,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Piazza-FPE-2013", + "STATES": { + "reducing": { + "T": 512.5, + "T_units": "K", + "p": 8215850, + "p_units": "Pa", + "rhomolar": 8520.024867237415, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 175.61, + "T_units": "K", + "p": 0.0001867637574117855, + "p_units": "Pa", + "rhomolar": 28227.37433284738, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 175.61, + "T_units": "K", + "p": 0.0001867637574117855, + "p_units": "Pa", + "rhomolar": 0.0001279343965397924, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 580, "T_max_units": "K", "Ttriple": 175.61, @@ -284,21 +310,7 @@ "molar_mass_units": "kg/mol", "p_max": 500000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 0.1867637574, - "ptriple_units": "Pa", - "reducing_state": { - "T": 512.5, - "T_units": "K", - "p": 8215850, - "p_units": "Pa", - "rhomolar": 8520.024867237415, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 28227.34381723926, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 0.0001279546715210285, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "Methanol", diff --git a/dev/fluids/MethylLinoleate.json b/dev/fluids/MethylLinoleate.json index 5e461fa7..f8212076 100644 --- a/dev/fluids/MethylLinoleate.json +++ b/dev/fluids/MethylLinoleate.json @@ -124,6 +124,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Huber-EF-2009", + "STATES": { + "reducing": { + "T": 799, + "T_units": "K", + "p": 1341000, + "p_units": "Pa", + "rhomolar": 808.4, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 260.0, + "T_units": "K", + "p": 1.3717048086741424e-09, + "p_units": "Pa", + "rhomolar": 3092.919060951427, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 260.0, + "T_units": "K", + "p": 1.3717048086741424e-09, + "p_units": "Pa", + "rhomolar": 6.345306984937442e-10, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 700, "T_max_units": "K", "Ttriple": 238.1, @@ -264,21 +290,7 @@ "molar_mass_units": "kg/mol", "p_max": 50000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 7.719884129e-09, - "ptriple_units": "Pa", - "reducing_state": { - "T": 799, - "T_units": "K", - "p": 1341000, - "p_units": "Pa", - "rhomolar": 808.4, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 3153.235854714205, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 3.900590310452233e-12, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "MethylLinoleate", diff --git a/dev/fluids/MethylLinolenate.json b/dev/fluids/MethylLinolenate.json index 86499273..2e99662f 100644 --- a/dev/fluids/MethylLinolenate.json +++ b/dev/fluids/MethylLinolenate.json @@ -124,6 +124,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Huber-EF-2009", + "STATES": { + "reducing": { + "T": 772, + "T_units": "K", + "p": 1369000, + "p_units": "Pa", + "rhomolar": 847.3000000000001, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 260.0, + "T_units": "K", + "p": 4.250280354778991e-10, + "p_units": "Pa", + "rhomolar": 3162.072727020763, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 260.0, + "T_units": "K", + "p": 4.250280354778991e-10, + "p_units": "Pa", + "rhomolar": 1.9661178886570436e-10, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 700, "T_max_units": "K", "Ttriple": 218.65, @@ -268,21 +294,7 @@ "molar_mass_units": "kg/mol", "p_max": 50000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 8.281383742e-12, - "ptriple_units": "Pa", - "reducing_state": { - "T": 772, - "T_units": "K", - "p": 1369000, - "p_units": "Pa", - "rhomolar": 847.3000000000001, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 3281.983110581293, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 4.556783070257036e-15, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "MethylLinolenate", diff --git a/dev/fluids/MethylOleate.json b/dev/fluids/MethylOleate.json index e18be819..6e3c7e62 100644 --- a/dev/fluids/MethylOleate.json +++ b/dev/fluids/MethylOleate.json @@ -124,6 +124,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Huber-EF-2009", + "STATES": { + "reducing": { + "T": 782, + "T_units": "K", + "p": 1246000, + "p_units": "Pa", + "rhomolar": 812.8499999999999, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 253.47, + "T_units": "K", + "p": 3.7818661051540565e-10, + "p_units": "Pa", + "rhomolar": 3048.2387941791717, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 253.47, + "T_units": "K", + "p": 3.7818661051540565e-10, + "p_units": "Pa", + "rhomolar": 1.79450597579303e-10, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 700, "T_max_units": "K", "Ttriple": 253.47, @@ -268,21 +294,7 @@ "molar_mass_units": "kg/mol", "p_max": 50000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 3.781866105e-07, - "ptriple_units": "Pa", - "reducing_state": { - "T": 782, - "T_units": "K", - "p": 1246000, - "p_units": "Pa", - "rhomolar": 812.8499999999999, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 3048.236151846261, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 1.794893849114351e-10, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "MethylOleate", diff --git a/dev/fluids/MethylPalmitate.json b/dev/fluids/MethylPalmitate.json index 63322d8b..237099a4 100644 --- a/dev/fluids/MethylPalmitate.json +++ b/dev/fluids/MethylPalmitate.json @@ -124,6 +124,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Huber-EF-2009", + "STATES": { + "reducing": { + "T": 755, + "T_units": "K", + "p": 1350000, + "p_units": "Pa", + "rhomolar": 897, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 302.71, + "T_units": "K", + "p": 1.6401286519191667e-05, + "p_units": "Pa", + "rhomolar": 3181.442539250496, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 302.71, + "T_units": "K", + "p": 1.6401286519191667e-05, + "p_units": "Pa", + "rhomolar": 6.516532510861514e-06, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 700, "T_max_units": "K", "Ttriple": 302.71, @@ -268,21 +294,7 @@ "molar_mass_units": "kg/mol", "p_max": 50000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 0.01640128652, - "ptriple_units": "Pa", - "reducing_state": { - "T": 755, - "T_units": "K", - "p": 1350000, - "p_units": "Pa", - "rhomolar": 897, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 3181.439786123884, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 6.517312696695113e-06, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "MethylPalmitate", diff --git a/dev/fluids/MethylStearate.json b/dev/fluids/MethylStearate.json index efe5392e..0ad1c170 100644 --- a/dev/fluids/MethylStearate.json +++ b/dev/fluids/MethylStearate.json @@ -124,6 +124,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Huber-EF-2009", + "STATES": { + "reducing": { + "T": 775, + "T_units": "K", + "p": 1239000, + "p_units": "Pa", + "rhomolar": 794.3, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 311.84, + "T_units": "K", + "p": 6.0109471888446706e-06, + "p_units": "Pa", + "rhomolar": 2851.4327320670277, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 311.84, + "T_units": "K", + "p": 6.0109471888446706e-06, + "p_units": "Pa", + "rhomolar": 2.3183363928545357e-06, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 700, "T_max_units": "K", "Ttriple": 311.84, @@ -268,21 +294,7 @@ "molar_mass_units": "kg/mol", "p_max": 50000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 0.006010947189, - "ptriple_units": "Pa", - "reducing_state": { - "T": 775, - "T_units": "K", - "p": 1239000, - "p_units": "Pa", - "rhomolar": 794.3, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 2851.430203644649, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 2.318621202355879e-06, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "MethylStearate", diff --git a/dev/fluids/Neon.json b/dev/fluids/Neon.json index 5319dbe2..c49259d1 100644 --- a/dev/fluids/Neon.json +++ b/dev/fluids/Neon.json @@ -140,6 +140,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Katti-ACE-1986", + "STATES": { + "reducing": { + "T": 44.4918, + "T_units": "K", + "p": 2680000, + "p_units": "Pa", + "rhomolar": 23882, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 24.56, + "T_units": "K", + "p": 43.432076403077566, + "p_units": "Pa", + "rhomolar": 62061.106062436906, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 24.56, + "T_units": "K", + "p": 43.432076403077566, + "p_units": "Pa", + "rhomolar": 220.1097622314587, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 723, "T_max_units": "K", "Ttriple": 24.56, @@ -298,21 +324,7 @@ "molar_mass_units": "kg/mol", "p_max": 700000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 43432.0764, - "ptriple_units": "Pa", - "reducing_state": { - "T": 44.4918, - "T_units": "K", - "p": 2680000, - "p_units": "Pa", - "rhomolar": 23882, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 62060.12963247318, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 220.1827660676654, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "Neon", diff --git a/dev/fluids/Neopentane.json b/dev/fluids/Neopentane.json index 14139386..23e4de25 100644 --- a/dev/fluids/Neopentane.json +++ b/dev/fluids/Neopentane.json @@ -125,6 +125,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Lemmon-JCED-2006", + "STATES": { + "reducing": { + "T": 433.74, + "T_units": "K", + "p": 3196000, + "p_units": "Pa", + "rhomolar": 3270, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 256.6, + "T_units": "K", + "p": 35.40094732708782, + "p_units": "Pa", + "rhomolar": 8701.720394850296, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 256.6, + "T_units": "K", + "p": 35.40094732708782, + "p_units": "Pa", + "rhomolar": 16.951063913080816, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 550, "T_max_units": "K", "Ttriple": 256.6, @@ -224,21 +250,7 @@ "molar_mass_units": "kg/mol", "p_max": 200000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 35400.94733, - "ptriple_units": "Pa", - "reducing_state": { - "T": 433.74, - "T_units": "K", - "p": 3196000, - "p_units": "Pa", - "rhomolar": 3270, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 8701.706626683947, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 16.95177504859362, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "Neopentane", diff --git a/dev/fluids/Nitrogen.json b/dev/fluids/Nitrogen.json index 9e1f8e3a..1d593b00 100644 --- a/dev/fluids/Nitrogen.json +++ b/dev/fluids/Nitrogen.json @@ -137,6 +137,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Span-JPCRD-2000", + "STATES": { + "reducing": { + "T": 126.192, + "T_units": "K", + "p": 3395800, + "p_units": "Pa", + "rhomolar": 11183.90146458062, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 63.151, + "T_units": "K", + "p": 12.519783487429175, + "p_units": "Pa", + "rhomolar": 30957.310274698266, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 63.151, + "T_units": "K", + "p": 12.519783487429175, + "p_units": "Pa", + "rhomolar": 24.069564468084323, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 1100, "T_max_units": "K", "Ttriple": 63.151, @@ -368,21 +394,7 @@ "molar_mass_units": "kg/mol", "p_max": 2200000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 12519.78349, - "ptriple_units": "Pa", - "reducing_state": { - "T": 126.192, - "T_units": "K", - "p": 3395800, - "p_units": "Pa", - "rhomolar": 11183.90146458062, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 30957.16390402974, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 24.07364223019857, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "Nitrogen", diff --git a/dev/fluids/NitrousOxide.json b/dev/fluids/NitrousOxide.json index 73a1a860..2e7ea10c 100644 --- a/dev/fluids/NitrousOxide.json +++ b/dev/fluids/NitrousOxide.json @@ -136,6 +136,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Lemmon-JCED-2006", + "STATES": { + "reducing": { + "T": 309.52, + "T_units": "K", + "p": 7245000, + "p_units": "Pa", + "rhomolar": 10270, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 182.33, + "T_units": "K", + "p": 87.83743922580841, + "p_units": "Pa", + "rhomolar": 28113.432079357477, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 182.33, + "T_units": "K", + "p": 87.83743922580841, + "p_units": "Pa", + "rhomolar": 59.33601783159357, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 525, "T_max_units": "K", "Ttriple": 182.33, @@ -233,21 +259,7 @@ "molar_mass_units": "kg/mol", "p_max": 50000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 87837.43923, - "ptriple_units": "Pa", - "reducing_state": { - "T": 309.52, - "T_units": "K", - "p": 7245000, - "p_units": "Pa", - "rhomolar": 10270, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 28113.36563491833, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 59.33941145458979, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "NitrousOxide", diff --git a/dev/fluids/OrthoDeuterium.json b/dev/fluids/OrthoDeuterium.json index 789d4ee1..ea9526d4 100644 --- a/dev/fluids/OrthoDeuterium.json +++ b/dev/fluids/OrthoDeuterium.json @@ -114,6 +114,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Richardson-JPCRD-2013", + "STATES": { + "reducing": { + "T": 38.34, + "T_units": "K", + "p": 1679600, + "p_units": "Pa", + "rhomolar": 17230, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 18.724, + "T_units": "K", + "p": 17.1891019732537, + "p_units": "Pa", + "rhomolar": 43350.920890356414, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 18.724, + "T_units": "K", + "p": 17.1891019732537, + "p_units": "Pa", + "rhomolar": 112.95640342174914, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 600, "T_max_units": "K", "Ttriple": 18.724, @@ -303,21 +329,7 @@ "molar_mass_units": "kg/mol", "p_max": 2000000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 17189.10197, - "ptriple_units": "Pa", - "reducing_state": { - "T": 38.34, - "T_units": "K", - "p": 1679600, - "p_units": "Pa", - "rhomolar": 17230, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 43350.35393172985, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 113.0018950964478, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "OrthoDeuterium", diff --git a/dev/fluids/OrthoHydrogen.json b/dev/fluids/OrthoHydrogen.json index 7d93f9f6..306c2730 100644 --- a/dev/fluids/OrthoHydrogen.json +++ b/dev/fluids/OrthoHydrogen.json @@ -126,6 +126,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Leachman-JPCRD-2009", + "STATES": { + "reducing": { + "T": 33.22, + "T_units": "K", + "p": 1310650, + "p_units": "Pa", + "rhomolar": 15444.54031369981, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 14.008, + "T_units": "K", + "p": 7.559882341056905, + "p_units": "Pa", + "rhomolar": 38199.18470071943, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 14.008, + "T_units": "K", + "p": 7.559882341056905, + "p_units": "Pa", + "rhomolar": 65.83968194171914, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 1000, "T_max_units": "K", "Ttriple": 14.008, @@ -265,21 +291,7 @@ "molar_mass_units": "kg/mol", "p_max": 2000000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 7559.882341, - "ptriple_units": "Pa", - "reducing_state": { - "T": 33.22, - "T_units": "K", - "p": 1310650, - "p_units": "Pa", - "rhomolar": 15444.54031369981, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 38198.76565183698, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 65.87296564338153, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "OrthoHydrogen", diff --git a/dev/fluids/Oxygen.json b/dev/fluids/Oxygen.json index 1a1263bf..d93b53dd 100644 --- a/dev/fluids/Oxygen.json +++ b/dev/fluids/Oxygen.json @@ -137,6 +137,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Stewart-JPCRD-1991", + "STATES": { + "reducing": { + "T": 154.581, + "T_units": "K", + "p": 5043000, + "p_units": "Pa", + "rhomolar": 13630, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 54.361, + "T_units": "K", + "p": 0.14627764704447577, + "p_units": "Pa", + "rhomolar": 40816.430817738415, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 54.361, + "T_units": "K", + "p": 0.14627764704447577, + "p_units": "Pa", + "rhomolar": 0.32370317009092064, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 300, "T_max_units": "K", "Ttriple": 54.361, @@ -344,21 +370,7 @@ "molar_mass_units": "kg/mol", "p_max": 80000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 146.277647, - "ptriple_units": "Pa", - "reducing_state": { - "T": 154.581, - "T_units": "K", - "p": 5043000, - "p_units": "Pa", - "rhomolar": 13630, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 40816.30337657147, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 0.3237995947960466, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "Oxygen", diff --git a/dev/fluids/ParaDeuterium.json b/dev/fluids/ParaDeuterium.json index bcd765f2..ea560d2e 100644 --- a/dev/fluids/ParaDeuterium.json +++ b/dev/fluids/ParaDeuterium.json @@ -114,6 +114,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Richardson-JPCRD-2013", + "STATES": { + "reducing": { + "T": 38.34, + "T_units": "K", + "p": 1679600, + "p_units": "Pa", + "rhomolar": 17230, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 18.724, + "T_units": "K", + "p": 17.1891019732537, + "p_units": "Pa", + "rhomolar": 43350.920890356414, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 18.724, + "T_units": "K", + "p": 17.1891019732537, + "p_units": "Pa", + "rhomolar": 112.95640342174914, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 600, "T_max_units": "K", "Ttriple": 18.724, @@ -301,21 +327,7 @@ "molar_mass_units": "kg/mol", "p_max": 2000000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 17189.10197, - "ptriple_units": "Pa", - "reducing_state": { - "T": 38.34, - "T_units": "K", - "p": 1679600, - "p_units": "Pa", - "rhomolar": 17230, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 43350.35393172985, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 113.0018950964478, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "ParaDeuterium", diff --git a/dev/fluids/ParaHydrogen.json b/dev/fluids/ParaHydrogen.json index bd7548e8..af3d97b3 100644 --- a/dev/fluids/ParaHydrogen.json +++ b/dev/fluids/ParaHydrogen.json @@ -137,6 +137,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Leachman-JPCRD-2009", + "STATES": { + "reducing": { + "T": 32.938, + "T_units": "K", + "p": 1285800, + "p_units": "Pa", + "rhomolar": 15538, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 13.8033, + "T_units": "K", + "p": 7.041086751148159, + "p_units": "Pa", + "rhomolar": 38185.34690822156, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 13.8033, + "T_units": "K", + "p": 7.041086751148159, + "p_units": "Pa", + "rhomolar": 62.28040619273301, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 1000, "T_max_units": "K", "Ttriple": 13.8033, @@ -282,21 +308,7 @@ "molar_mass_units": "kg/mol", "p_max": 2000000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 7041.086751, - "ptriple_units": "Pa", - "reducing_state": { - "T": 32.938, - "T_units": "K", - "p": 1285800, - "p_units": "Pa", - "rhomolar": 15538, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 38184.94839776529, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 62.31256337798966, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "ParaHydrogen", diff --git a/dev/fluids/Propylene.json b/dev/fluids/Propylene.json index 3fd6c520..5661d4bc 100644 --- a/dev/fluids/Propylene.json +++ b/dev/fluids/Propylene.json @@ -136,6 +136,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Lemmon-PROPYLENE-2013", + "STATES": { + "reducing": { + "T": 364.211, + "T_units": "K", + "p": 4555000, + "p_units": "Pa", + "rhomolar": 5457, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 87.953, + "T_units": "K", + "p": 7.471728686559866e-07, + "p_units": "Pa", + "rhomolar": 18254.562780551245, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 87.953, + "T_units": "K", + "p": 7.471728686559866e-07, + "p_units": "Pa", + "rhomolar": 1.0217291002947154e-06, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 575, "T_max_units": "K", "Ttriple": 87.953, @@ -321,21 +347,7 @@ "molar_mass_units": "kg/mol", "p_max": 1000000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 0.0007471728687, - "ptriple_units": "Pa", - "reducing_state": { - "T": 364.211, - "T_units": "K", - "p": 4555000, - "p_units": "Pa", - "rhomolar": 5457, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 18254.53452723806, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 1.022108934557587e-06, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "Propylene", diff --git a/dev/fluids/Propyne.json b/dev/fluids/Propyne.json index 4afb5cb8..93f85597 100644 --- a/dev/fluids/Propyne.json +++ b/dev/fluids/Propyne.json @@ -136,6 +136,32 @@ { "BibTeX_CP0": "Polt-CT-1992", "BibTeX_EOS": "Polt-CT-1992", + "STATES": { + "reducing": { + "T": 402.38, + "T_units": "K", + "p": 5626000, + "p_units": "Pa", + "rhomolar": 6113.33, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 273.0, + "T_units": "K", + "p": 263.5669059887786, + "p_units": "Pa", + "rhomolar": 16279.0418039543, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 273.0, + "T_units": "K", + "p": 263.5669059887786, + "p_units": "Pa", + "rhomolar": 124.13577693070359, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 474, "T_max_units": "K", "Ttriple": 170.5, @@ -304,21 +330,7 @@ "molar_mass_units": "kg/mol", "p_max": 31800000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 263566.906, - "ptriple_units": "Pa", - "reducing_state": { - "T": 402.38, - "T_units": "K", - "p": 5626000, - "p_units": "Pa", - "rhomolar": 6113.33, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 2.496255616575137e+100, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 2.496255616575137e+100, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "Propyne", diff --git a/dev/fluids/R11.json b/dev/fluids/R11.json index 02d1b663..ead88786 100644 --- a/dev/fluids/R11.json +++ b/dev/fluids/R11.json @@ -133,6 +133,32 @@ { "BibTeX_CP0": "Jacobsen-FPE-1992", "BibTeX_EOS": "Span-IJT-2003C", + "STATES": { + "reducing": { + "T": 471.06, + "T_units": "K", + "p": 4394000, + "p_units": "Pa", + "rhomolar": 4113.039426940773, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 162.68, + "T_units": "K", + "p": 0.006691548080564487, + "p_units": "Pa", + "rhomolar": 12962.580254202647, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 162.68, + "T_units": "K", + "p": 0.006691548080564487, + "p_units": "Pa", + "rhomolar": 0.0049471885961455235, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 595, "T_max_units": "K", "Ttriple": 162.68, @@ -259,21 +285,7 @@ "molar_mass_units": "kg/mol", "p_max": 100000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 6.691548081, - "ptriple_units": "Pa", - "reducing_state": { - "T": 471.06, - "T_units": "K", - "p": 4394000, - "p_units": "Pa", - "rhomolar": 4113.039426940773, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 12962.56328885987, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 0.004947861179952363, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "R11", diff --git a/dev/fluids/R113.json b/dev/fluids/R113.json index 65e85674..c6399004 100644 --- a/dev/fluids/R113.json +++ b/dev/fluids/R113.json @@ -133,6 +133,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Marx-BOOK-1992", + "STATES": { + "reducing": { + "T": 487.21, + "T_units": "K", + "p": 3392200, + "p_units": "Pa", + "rhomolar": 2988.659106070714, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 236.93, + "T_units": "K", + "p": 1.8714275474637754, + "p_units": "Pa", + "rhomolar": 9098.73910142307, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 236.93, + "T_units": "K", + "p": 1.8714275474637754, + "p_units": "Pa", + "rhomolar": 0.9519906098017169, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 525, "T_max_units": "K", "Ttriple": 236.93, @@ -262,21 +288,7 @@ "molar_mass_units": "kg/mol", "p_max": 200000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 1871.427547, - "ptriple_units": "Pa", - "reducing_state": { - "T": 487.21, - "T_units": "K", - "p": 3392200, - "p_units": "Pa", - "rhomolar": 2988.659106070714, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 9098.726940322524, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 0.9520516197832899, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "R113", diff --git a/dev/fluids/R114.json b/dev/fluids/R114.json index 0e441366..eac74764 100644 --- a/dev/fluids/R114.json +++ b/dev/fluids/R114.json @@ -133,6 +133,32 @@ { "BibTeX_CP0": "Platzer-BOOK-1990", "BibTeX_EOS": "Platzer-BOOK-1990", + "STATES": { + "reducing": { + "T": 418.83, + "T_units": "K", + "p": 3257000, + "p_units": "Pa", + "rhomolar": 3393.2, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 273.15, + "T_units": "K", + "p": 88.16238676245308, + "p_units": "Pa", + "rhomolar": 8941.873943827432, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 273.15, + "T_units": "K", + "p": 88.16238676245308, + "p_units": "Pa", + "rhomolar": 40.2224880739269, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 507, "T_max_units": "K", "Ttriple": 180.63, @@ -301,21 +327,7 @@ "molar_mass_units": "kg/mol", "p_max": 21000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 88162.38676, - "ptriple_units": "Pa", - "reducing_state": { - "T": 418.83, - "T_units": "K", - "p": 3257000, - "p_units": "Pa", - "rhomolar": 3393.2, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 5.850656151087344e+99, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 5.850656151087344e+99, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "R114", diff --git a/dev/fluids/R116.json b/dev/fluids/R116.json index 587d7a02..26803e16 100644 --- a/dev/fluids/R116.json +++ b/dev/fluids/R116.json @@ -135,6 +135,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Lemmon-JCED-2006", + "STATES": { + "reducing": { + "T": 293.03, + "T_units": "K", + "p": 3048000, + "p_units": "Pa", + "rhomolar": 4444, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 173.1, + "T_units": "K", + "p": 26.083734153791088, + "p_units": "Pa", + "rhomolar": 12304.01402333065, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 173.1, + "T_units": "K", + "p": 26.083734153791088, + "p_units": "Pa", + "rhomolar": 18.437295644282788, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 425, "T_max_units": "K", "Ttriple": 173.1, @@ -232,21 +258,7 @@ "molar_mass_units": "kg/mol", "p_max": 50000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 26083.73415, - "ptriple_units": "Pa", - "reducing_state": { - "T": 293.03, - "T_units": "K", - "p": 3048000, - "p_units": "Pa", - "rhomolar": 4444, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 12303.98435269038, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 18.43851575195629, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "R116", diff --git a/dev/fluids/R12.json b/dev/fluids/R12.json index 56ce206e..11e926aa 100644 --- a/dev/fluids/R12.json +++ b/dev/fluids/R12.json @@ -135,6 +135,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Marx-BOOK-1992", + "STATES": { + "reducing": { + "T": 385.12, + "T_units": "K", + "p": 4136100.000000001, + "p_units": "Pa", + "rhomolar": 4672.781255944357, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 116.099, + "T_units": "K", + "p": 0.00024255019529824656, + "p_units": "Pa", + "rhomolar": 15125.291310337965, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 116.099, + "T_units": "K", + "p": 0.00024255019529824656, + "p_units": "Pa", + "rhomolar": 0.00025126911645679634, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 525, "T_max_units": "K", "Ttriple": 116.099, @@ -280,21 +306,7 @@ "molar_mass_units": "kg/mol", "p_max": 200000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 0.2425501953, - "ptriple_units": "Pa", - "reducing_state": { - "T": 385.12, - "T_units": "K", - "p": 4136100.000000001, - "p_units": "Pa", - "rhomolar": 4672.781255944357, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 15125.26924010347, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 0.0002513257531784137, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "R12", diff --git a/dev/fluids/R123.json b/dev/fluids/R123.json index fb341978..eed6fa59 100644 --- a/dev/fluids/R123.json +++ b/dev/fluids/R123.json @@ -133,6 +133,32 @@ { "BibTeX_CP0": "Younglove-JPCRD-1994", "BibTeX_EOS": "Span-IJT-2003C", + "STATES": { + "reducing": { + "T": 456.82, + "T_units": "K", + "p": 3672000, + "p_units": "Pa", + "rhomolar": 3616.009834500526, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 166.0, + "T_units": "K", + "p": 0.004153442716713842, + "p_units": "Pa", + "rhomolar": 11612.830801100323, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 166.0, + "T_units": "K", + "p": 0.004153442716713842, + "p_units": "Pa", + "rhomolar": 0.0030093692214729455, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 523, "T_max_units": "K", "Ttriple": 166, @@ -244,21 +270,7 @@ "molar_mass_units": "kg/mol", "p_max": 76000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 4.153442717, - "ptriple_units": "Pa", - "reducing_state": { - "T": 456.82, - "T_units": "K", - "p": 3672000, - "p_units": "Pa", - "rhomolar": 3616.009834500526, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 11612.8148830159, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 0.003009801496735872, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "R123", diff --git a/dev/fluids/R1233zd(E).json b/dev/fluids/R1233zd(E).json index eb6dd35f..449dd367 100644 --- a/dev/fluids/R1233zd(E).json +++ b/dev/fluids/R1233zd(E).json @@ -115,6 +115,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "", + "STATES": { + "reducing": { + "T": 438.75, + "T_units": "K", + "p": 3570900, + "p_units": "Pa", + "rhomolar": 3670, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 195.15, + "T_units": "K", + "p": 0.2502655780810593, + "p_units": "Pa", + "rhomolar": 11408.679640912957, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 195.15, + "T_units": "K", + "p": 0.2502655780810593, + "p_units": "Pa", + "rhomolar": 0.1543039194302124, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 550, "T_max_units": "K", "Ttriple": 195.15, @@ -271,21 +297,7 @@ "molar_mass_units": "kg/mol", "p_max": 100000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 250.2655781, - "ptriple_units": "Pa", - "reducing_state": { - "T": 438.75, - "T_units": "K", - "p": 3570900, - "p_units": "Pa", - "rhomolar": 3670, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 11408.66354648404, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 0.1543187791572448, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "R1233zd(E)", diff --git a/dev/fluids/R1234yf.json b/dev/fluids/R1234yf.json index 204ee179..cc87e297 100644 --- a/dev/fluids/R1234yf.json +++ b/dev/fluids/R1234yf.json @@ -135,6 +135,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Richter-JCED-2011", + "STATES": { + "reducing": { + "T": 367.85, + "T_units": "K", + "p": 3382200, + "p_units": "Pa", + "rhomolar": 4170, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 220.0, + "T_units": "K", + "p": 31.50755884790354, + "p_units": "Pa", + "rhomolar": 11633.107308832525, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 220.0, + "T_units": "K", + "p": 31.50755884790354, + "p_units": "Pa", + "rhomolar": 17.583525551960502, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 410, "T_max_units": "K", "Ttriple": 220, @@ -278,21 +304,7 @@ "molar_mass_units": "kg/mol", "p_max": 30000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 31507.55885, - "ptriple_units": "Pa", - "reducing_state": { - "T": 367.85, - "T_units": "K", - "p": 3382200, - "p_units": "Pa", - "rhomolar": 4170, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 11633.08448763467, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 17.58443653644202, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "R1234yf", diff --git a/dev/fluids/R1234ze(E).json b/dev/fluids/R1234ze(E).json index 2447be22..f946015c 100644 --- a/dev/fluids/R1234ze(E).json +++ b/dev/fluids/R1234ze(E).json @@ -126,6 +126,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "McLinden-PURDUE-2010", + "STATES": { + "reducing": { + "T": 382.52, + "T_units": "K", + "p": 3636250, + "p_units": "Pa", + "rhomolar": 4290, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 168.62, + "T_units": "K", + "p": 0.23128175666601208, + "p_units": "Pa", + "rhomolar": 13194.862559792387, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 168.62, + "T_units": "K", + "p": 0.23128175666601208, + "p_units": "Pa", + "rhomolar": 0.1650276209820342, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 410, "T_max_units": "K", "Ttriple": 168.62, @@ -273,21 +299,7 @@ "molar_mass_units": "kg/mol", "p_max": 15000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 231.2817567, - "ptriple_units": "Pa", - "reducing_state": { - "T": 382.52, - "T_units": "K", - "p": 3636250, - "p_units": "Pa", - "rhomolar": 4290, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 8.768730560908124e+99, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 8.768730560908124e+99, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "R1234ze(E)", diff --git a/dev/fluids/R1234ze(Z).json b/dev/fluids/R1234ze(Z).json index 51d62541..231371f5 100644 --- a/dev/fluids/R1234ze(Z).json +++ b/dev/fluids/R1234ze(Z).json @@ -113,6 +113,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Akasaka-DELFT-2013", + "STATES": { + "reducing": { + "T": 423.27, + "T_units": "K", + "p": 3533000, + "p_units": "Pa", + "rhomolar": 4126.696132921778, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 273.0, + "T_units": "K", + "p": 67.8029393595567, + "p_units": "Pa", + "rhomolar": 11250.756301033864, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 273.0, + "T_units": "K", + "p": 67.8029393595567, + "p_units": "Pa", + "rhomolar": 31.076296533864262, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 430, "T_max_units": "K", "Ttriple": 273, @@ -234,21 +260,7 @@ "molar_mass_units": "kg/mol", "p_max": 6000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 67802.93936, - "ptriple_units": "Pa", - "reducing_state": { - "T": 423.27, - "T_units": "K", - "p": 3533000, - "p_units": "Pa", - "rhomolar": 4126.696132921778, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 11250.73553652318, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 31.07753309192204, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "R1234ze(Z)", diff --git a/dev/fluids/R124.json b/dev/fluids/R124.json index 5f8c6cca..4d935308 100644 --- a/dev/fluids/R124.json +++ b/dev/fluids/R124.json @@ -133,6 +133,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "deVries-ICR-1995", + "STATES": { + "reducing": { + "T": 395.425, + "T_units": "K", + "p": 3624295, + "p_units": "Pa", + "rhomolar": 4103.279546177282, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 120.0, + "T_units": "K", + "p": 2.6738378997651697e-05, + "p_units": "Pa", + "rhomolar": 13575.60781120709, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 120.0, + "T_units": "K", + "p": 2.6738378997651697e-05, + "p_units": "Pa", + "rhomolar": 2.679904646421173e-05, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 470, "T_max_units": "K", "Ttriple": 75, @@ -268,21 +294,7 @@ "molar_mass_units": "kg/mol", "p_max": 40000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 0.026738379, - "ptriple_units": "Pa", - "reducing_state": { - "T": 395.425, - "T_units": "K", - "p": 3624295, - "p_units": "Pa", - "rhomolar": 4103.279546177282, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 7.327284903888004e+99, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 7.327284903888004e+99, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "R124", diff --git a/dev/fluids/R125.json b/dev/fluids/R125.json index ec600bbc..2d6554d4 100644 --- a/dev/fluids/R125.json +++ b/dev/fluids/R125.json @@ -133,6 +133,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Lemmon-JPCRD-2005", + "STATES": { + "reducing": { + "T": 339.173, + "T_units": "K", + "p": 3617700, + "p_units": "Pa", + "rhomolar": 4779, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 172.52, + "T_units": "K", + "p": 2.9140460090935645, + "p_units": "Pa", + "rhomolar": 14086.490950189835, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 172.52, + "T_units": "K", + "p": 2.9140460090935645, + "p_units": "Pa", + "rhomolar": 2.038105466033143, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 500, "T_max_units": "K", "Ttriple": 172.52, @@ -283,21 +309,7 @@ "molar_mass_units": "kg/mol", "p_max": 60000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 2914.046009, - "ptriple_units": "Pa", - "reducing_state": { - "T": 339.173, - "T_units": "K", - "p": 3617700, - "p_units": "Pa", - "rhomolar": 4779, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 14086.46410777493, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 2.038282831772791, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "R125", diff --git a/dev/fluids/R13.json b/dev/fluids/R13.json index 6e62856a..3fba7fc3 100644 --- a/dev/fluids/R13.json +++ b/dev/fluids/R13.json @@ -133,6 +133,32 @@ { "BibTeX_CP0": "Platzer-BOOK-1990", "BibTeX_EOS": "Platzer-BOOK-1990", + "STATES": { + "reducing": { + "T": 301.88, + "T_units": "K", + "p": 3879000, + "p_units": "Pa", + "rhomolar": 5580, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 98.15, + "T_units": "K", + "p": 0.0009070389769883204, + "p_units": "Pa", + "rhomolar": 17728.463741136216, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 98.15, + "T_units": "K", + "p": 0.0009070389769883204, + "p_units": "Pa", + "rhomolar": 0.001111476996623622, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 450, "T_max_units": "K", "Ttriple": 92, @@ -301,21 +327,7 @@ "molar_mass_units": "kg/mol", "p_max": 50000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 0.907038977, - "ptriple_units": "Pa", - "reducing_state": { - "T": 301.88, - "T_units": "K", - "p": 3879000, - "p_units": "Pa", - "rhomolar": 5580, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 9.573133956863457e+99, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 9.573133956863457e+99, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "R13", diff --git a/dev/fluids/R134a.json b/dev/fluids/R134a.json index 789f9c26..e0762fd9 100644 --- a/dev/fluids/R134a.json +++ b/dev/fluids/R134a.json @@ -135,6 +135,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "TillnerRoth-JPCRD-1994", + "STATES": { + "reducing": { + "T": 374.18, + "T_units": "K", + "p": 4059280, + "p_units": "Pa", + "rhomolar": 4978.830171000001, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 169.85, + "T_units": "K", + "p": 0.3895637886074885, + "p_units": "Pa", + "rhomolar": 15594.200379934839, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 169.85, + "T_units": "K", + "p": 0.3895637886074885, + "p_units": "Pa", + "rhomolar": 0.2761122800115172, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 455, "T_max_units": "K", "Ttriple": 169.85, @@ -266,21 +292,7 @@ "molar_mass_units": "kg/mol", "p_max": 70000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 389.5637886, - "ptriple_units": "Pa", - "reducing_state": { - "T": 374.18, - "T_units": "K", - "p": 4059280, - "p_units": "Pa", - "rhomolar": 4978.830171000001, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 15594.17453546275, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 0.2761416512149696, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "R134a", diff --git a/dev/fluids/R14.json b/dev/fluids/R14.json index 25b1c64e..e35b7aa1 100644 --- a/dev/fluids/R14.json +++ b/dev/fluids/R14.json @@ -133,6 +133,32 @@ { "BibTeX_CP0": "Platzer-BOOK-1990", "BibTeX_EOS": "Platzer-BOOK-1990", + "STATES": { + "reducing": { + "T": 227.51, + "T_units": "K", + "p": 3750000, + "p_units": "Pa", + "rhomolar": 7109.4194, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 120.0, + "T_units": "K", + "p": 11.294329044453496, + "p_units": "Pa", + "rhomolar": 19669.032618775986, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 120.0, + "T_units": "K", + "p": 11.294329044453496, + "p_units": "Pa", + "rhomolar": 11.391239450518714, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 623, "T_max_units": "K", "Ttriple": 89.54, @@ -295,21 +321,7 @@ "molar_mass_units": "kg/mol", "p_max": 51000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 11294.32904, - "ptriple_units": "Pa", - "reducing_state": { - "T": 227.51, - "T_units": "K", - "p": 3750000, - "p_units": "Pa", - "rhomolar": 7109.4194, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 1.136304238642071e+100, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 1.136304238642071e+100, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "R14", diff --git a/dev/fluids/R141b.json b/dev/fluids/R141b.json index d2683ee6..85877f18 100644 --- a/dev/fluids/R141b.json +++ b/dev/fluids/R141b.json @@ -137,6 +137,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Lemmon-JCED-2006", + "STATES": { + "reducing": { + "T": 477.5, + "T_units": "K", + "p": 4212000, + "p_units": "Pa", + "rhomolar": 3921.000000000001, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 169.68, + "T_units": "K", + "p": 0.0064927351770598255, + "p_units": "Pa", + "rhomolar": 12559.705823578954, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 169.68, + "T_units": "K", + "p": 0.0064927351770598255, + "p_units": "Pa", + "rhomolar": 0.004602358265154211, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 500, "T_max_units": "K", "Ttriple": 169.68, @@ -234,21 +260,7 @@ "molar_mass_units": "kg/mol", "p_max": 400000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 6.492735177, - "ptriple_units": "Pa", - "reducing_state": { - "T": 477.5, - "T_units": "K", - "p": 4212000, - "p_units": "Pa", - "rhomolar": 3921.000000000001, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 12559.6898931719, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 0.004602980802102235, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "R141b", diff --git a/dev/fluids/R142b.json b/dev/fluids/R142b.json index 3ca3589a..19f47dff 100644 --- a/dev/fluids/R142b.json +++ b/dev/fluids/R142b.json @@ -135,6 +135,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Lemmon-JCED-2006", + "STATES": { + "reducing": { + "T": 410.26, + "T_units": "K", + "p": 4055000, + "p_units": "Pa", + "rhomolar": 4438, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 142.72, + "T_units": "K", + "p": 0.0036326517168714123, + "p_units": "Pa", + "rhomolar": 14439.015484955165, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 142.72, + "T_units": "K", + "p": 0.0036326517168714123, + "p_units": "Pa", + "rhomolar": 0.003061359346361367, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 470, "T_max_units": "K", "Ttriple": 142.72, @@ -234,21 +260,7 @@ "molar_mass_units": "kg/mol", "p_max": 60000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 3.632651717, - "ptriple_units": "Pa", - "reducing_state": { - "T": 410.26, - "T_units": "K", - "p": 4055000, - "p_units": "Pa", - "rhomolar": 4438, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 14438.99364774879, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 0.003061859597935982, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "R142b", diff --git a/dev/fluids/R143a.json b/dev/fluids/R143a.json index 21c8f366..c0e52c8f 100644 --- a/dev/fluids/R143a.json +++ b/dev/fluids/R143a.json @@ -135,6 +135,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "LemmonJacobsen-JPCRD-2000", + "STATES": { + "reducing": { + "T": 345.857, + "T_units": "K", + "p": 3761000, + "p_units": "Pa", + "rhomolar": 5128.45, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 161.34, + "T_units": "K", + "p": 1.074945443137482, + "p_units": "Pa", + "rhomolar": 15832.104698511099, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 161.34, + "T_units": "K", + "p": 1.074945443137482, + "p_units": "Pa", + "rhomolar": 0.803616507488138, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 450, "T_max_units": "K", "Ttriple": 161.34, @@ -267,21 +293,7 @@ "molar_mass_units": "kg/mol", "p_max": 150000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 1074.945443, - "ptriple_units": "Pa", - "reducing_state": { - "T": 345.857, - "T_units": "K", - "p": 3761000, - "p_units": "Pa", - "rhomolar": 5128.45, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 15832.07605236137, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 0.8036952601578995, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "R143a", diff --git a/dev/fluids/R152A.json b/dev/fluids/R152A.json index 736f6b41..4cdab488 100644 --- a/dev/fluids/R152A.json +++ b/dev/fluids/R152A.json @@ -135,6 +135,32 @@ { "BibTeX_CP0": "TillnerRoth-IJT-1995", "BibTeX_EOS": "Span-IJT-2003C", + "STATES": { + "reducing": { + "T": 386.411, + "T_units": "K", + "p": 4520000, + "p_units": "Pa", + "rhomolar": 5571.452362568319, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 154.56, + "T_units": "K", + "p": 0.06408986801291847, + "p_units": "Pa", + "rhomolar": 18031.095642133463, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 154.56, + "T_units": "K", + "p": 0.06408986801291847, + "p_units": "Pa", + "rhomolar": 0.04989056799859409, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 471, "T_max_units": "K", "Ttriple": 154.56, @@ -238,21 +264,7 @@ "molar_mass_units": "kg/mol", "p_max": 58000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 64.08986801, - "ptriple_units": "Pa", - "reducing_state": { - "T": 386.411, - "T_units": "K", - "p": 4520000, - "p_units": "Pa", - "rhomolar": 5571.452362568319, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 18031.06754931742, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 0.04989696663288685, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "R152A", diff --git a/dev/fluids/R161.json b/dev/fluids/R161.json index 34ac7f44..f7bd2252 100644 --- a/dev/fluids/R161.json +++ b/dev/fluids/R161.json @@ -136,6 +136,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Wu-IJT-2012", + "STATES": { + "reducing": { + "T": 375.25, + "T_units": "K", + "p": 5010000, + "p_units": "Pa", + "rhomolar": 6280, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 130.0, + "T_units": "K", + "p": 0.00551226945206069, + "p_units": "Pa", + "rhomolar": 19913.25305828297, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 130.0, + "T_units": "K", + "p": 0.00551226945206069, + "p_units": "Pa", + "rhomolar": 0.005099837512332045, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 450, "T_max_units": "K", "Ttriple": 130, @@ -283,21 +309,7 @@ "molar_mass_units": "kg/mol", "p_max": 5000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 5.512269452, - "ptriple_units": "Pa", - "reducing_state": { - "T": 375.25, - "T_units": "K", - "p": 5010000, - "p_units": "Pa", - "rhomolar": 6280, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 19913.22529395975, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 0.005100738577476638, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "R161", diff --git a/dev/fluids/R21.json b/dev/fluids/R21.json index 75f3de07..d71d651e 100644 --- a/dev/fluids/R21.json +++ b/dev/fluids/R21.json @@ -133,6 +133,32 @@ { "BibTeX_CP0": "Platzer-BOOK-1990", "BibTeX_EOS": "Platzer-BOOK-1990", + "STATES": { + "reducing": { + "T": 451.48, + "T_units": "K", + "p": 5181200, + "p_units": "Pa", + "rhomolar": 5110.765599999999, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 200.0, + "T_units": "K", + "p": 0.8728349799124349, + "p_units": "Pa", + "rhomolar": 15359.760861872839, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 200.0, + "T_units": "K", + "p": 0.8728349799124349, + "p_units": "Pa", + "rhomolar": 0.5254904978375974, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 473, "T_max_units": "K", "Ttriple": 142.8, @@ -301,21 +327,7 @@ "molar_mass_units": "kg/mol", "p_max": 138000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 872.8349799, - "ptriple_units": "Pa", - "reducing_state": { - "T": 451.48, - "T_units": "K", - "p": 5181200, - "p_units": "Pa", - "rhomolar": 5110.765599999999, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 9.716029602798992e+99, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 9.716029602798992e+99, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "R21", diff --git a/dev/fluids/R218.json b/dev/fluids/R218.json index ea5ebbf4..c28ff010 100644 --- a/dev/fluids/R218.json +++ b/dev/fluids/R218.json @@ -133,6 +133,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Lemmon-JCED-2006", + "STATES": { + "reducing": { + "T": 345.02, + "T_units": "K", + "p": 2640000, + "p_units": "Pa", + "rhomolar": 3340.000000000001, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 125.45, + "T_units": "K", + "p": 0.0020185735581448633, + "p_units": "Pa", + "rhomolar": 10687.00507449543, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 125.45, + "T_units": "K", + "p": 0.0020185735581448633, + "p_units": "Pa", + "rhomolar": 0.0019353026559895711, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 440, "T_max_units": "K", "Ttriple": 125.45, @@ -230,21 +256,7 @@ "molar_mass_units": "kg/mol", "p_max": 20000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 2.018573558, - "ptriple_units": "Pa", - "reducing_state": { - "T": 345.02, - "T_units": "K", - "p": 2640000, - "p_units": "Pa", - "rhomolar": 3340.000000000001, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 10686.98548996255, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 0.001935680262154043, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "R218", diff --git a/dev/fluids/R22.json b/dev/fluids/R22.json index 917c1f13..6c28dd0d 100644 --- a/dev/fluids/R22.json +++ b/dev/fluids/R22.json @@ -135,6 +135,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Kamei-IJT-1995", + "STATES": { + "reducing": { + "T": 369.295, + "T_units": "K", + "p": 4990000, + "p_units": "Pa", + "rhomolar": 6058.220000000001, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 115.73, + "T_units": "K", + "p": 0.0003794696733352661, + "p_units": "Pa", + "rhomolar": 19906.5340608497, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 115.73, + "T_units": "K", + "p": 0.0003794696733352661, + "p_units": "Pa", + "rhomolar": 0.0003943621124878414, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 550, "T_max_units": "K", "Ttriple": 115.73, @@ -359,21 +385,7 @@ "molar_mass_units": "kg/mol", "p_max": 60000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 0.3794696733, - "ptriple_units": "Pa", - "reducing_state": { - "T": 369.295, - "T_units": "K", - "p": 4990000, - "p_units": "Pa", - "rhomolar": 6058.220000000001, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 19906.50360279436, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 0.0003944515301070936, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "R22", diff --git a/dev/fluids/R227EA.json b/dev/fluids/R227EA.json index a36fcc94..9ece7a38 100644 --- a/dev/fluids/R227EA.json +++ b/dev/fluids/R227EA.json @@ -139,6 +139,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "McLinden-PREPRINT-2013", + "STATES": { + "reducing": { + "T": 374.9, + "T_units": "K", + "p": 2925000, + "p_units": "Pa", + "rhomolar": 3495, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 146.35, + "T_units": "K", + "p": 0.0073315671532078065, + "p_units": "Pa", + "rhomolar": 11046.705899800072, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 146.35, + "T_units": "K", + "p": 0.0073315671532078065, + "p_units": "Pa", + "rhomolar": 0.006025348183498564, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 475, "T_max_units": "K", "Ttriple": 146.35, @@ -302,21 +328,7 @@ "molar_mass_units": "kg/mol", "p_max": 60000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 7.331567153, - "ptriple_units": "Pa", - "reducing_state": { - "T": 374.9, - "T_units": "K", - "p": 2925000, - "p_units": "Pa", - "rhomolar": 3495, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 11046.68969808219, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 0.006026313356105609, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "R227EA", diff --git a/dev/fluids/R23.json b/dev/fluids/R23.json index c43bf723..181ff589 100644 --- a/dev/fluids/R23.json +++ b/dev/fluids/R23.json @@ -135,6 +135,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Penoncello-JPCRD-2003", + "STATES": { + "reducing": { + "T": 299.293, + "T_units": "K", + "p": 4832000, + "p_units": "Pa", + "rhomolar": 7519.999999999999, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 118.02, + "T_units": "K", + "p": 0.05804099433470835, + "p_units": "Pa", + "rhomolar": 24307.711593514352, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 118.02, + "T_units": "K", + "p": 0.05804099433470835, + "p_units": "Pa", + "rhomolar": 0.059176475268810494, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 425, "T_max_units": "K", "Ttriple": 118.02, @@ -254,21 +280,7 @@ "molar_mass_units": "kg/mol", "p_max": 120000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 58.04099433, - "ptriple_units": "Pa", - "reducing_state": { - "T": 299.293, - "T_units": "K", - "p": 4832000, - "p_units": "Pa", - "rhomolar": 7519.999999999999, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 24307.66608253263, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 0.0591864606267919, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "R23", diff --git a/dev/fluids/R236EA.json b/dev/fluids/R236EA.json index c37fd232..8b4a666e 100644 --- a/dev/fluids/R236EA.json +++ b/dev/fluids/R236EA.json @@ -137,6 +137,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Rui-FPE-2013", + "STATES": { + "reducing": { + "T": 412.44, + "T_units": "K", + "p": 3420000, + "p_units": "Pa", + "rhomolar": 3716, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 243.0, + "T_units": "K", + "p": 17.498188402372996, + "p_units": "Pa", + "rhomolar": 10446.414258722269, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 243.0, + "T_units": "K", + "p": 17.498188402372996, + "p_units": "Pa", + "rhomolar": 8.76850319773379, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 412, "T_max_units": "K", "Ttriple": 170, @@ -280,21 +306,7 @@ "molar_mass_units": "kg/mol", "p_max": 6000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 17498.1884, - "ptriple_units": "Pa", - "reducing_state": { - "T": 412.44, - "T_units": "K", - "p": 3420000, - "p_units": "Pa", - "rhomolar": 3716, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 6.577285738339787e+99, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 6.577285738339787e+99, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "R236EA", diff --git a/dev/fluids/R236FA.json b/dev/fluids/R236FA.json index c0a41730..0ff754a3 100644 --- a/dev/fluids/R236FA.json +++ b/dev/fluids/R236FA.json @@ -135,6 +135,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Pan-FPE-2012", + "STATES": { + "reducing": { + "T": 398.07, + "T_units": "K", + "p": 3200000, + "p_units": "Pa", + "rhomolar": 3626, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 179.6, + "T_units": "K", + "p": 0.16032677876015008, + "p_units": "Pa", + "rhomolar": 11234.50556190224, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 179.6, + "T_units": "K", + "p": 0.16032677876015008, + "p_units": "Pa", + "rhomolar": 0.1073988072445306, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 400, "T_max_units": "K", "Ttriple": 179.6, @@ -276,21 +302,7 @@ "molar_mass_units": "kg/mol", "p_max": 70000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 160.3267788, - "ptriple_units": "Pa", - "reducing_state": { - "T": 398.07, - "T_units": "K", - "p": 3200000, - "p_units": "Pa", - "rhomolar": 3626, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 11234.48790273794, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 0.1074107170975478, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "R236FA", diff --git a/dev/fluids/R245fa.json b/dev/fluids/R245fa.json index 9e78723a..9466b1ae 100644 --- a/dev/fluids/R245fa.json +++ b/dev/fluids/R245fa.json @@ -139,6 +139,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Lemmon-JCED-2006", + "STATES": { + "reducing": { + "T": 427.16, + "T_units": "K", + "p": 3651000, + "p_units": "Pa", + "rhomolar": 3850, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 171.05, + "T_units": "K", + "p": 0.012514805987099153, + "p_units": "Pa", + "rhomolar": 12292.489206924556, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 171.05, + "T_units": "K", + "p": 0.012514805987099153, + "p_units": "Pa", + "rhomolar": 0.008800777185860847, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 440, "T_max_units": "K", "Ttriple": 171.05, @@ -236,21 +262,7 @@ "molar_mass_units": "kg/mol", "p_max": 200000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 12.51480599, - "ptriple_units": "Pa", - "reducing_state": { - "T": 427.16, - "T_units": "K", - "p": 3651000, - "p_units": "Pa", - "rhomolar": 3850, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 12292.47138861426, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 0.008801981575100712, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "R245fa", diff --git a/dev/fluids/R32.json b/dev/fluids/R32.json index 393d3132..7dbca3d1 100644 --- a/dev/fluids/R32.json +++ b/dev/fluids/R32.json @@ -133,6 +133,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "TillnerRoth-JPCRD-1997", + "STATES": { + "reducing": { + "T": 351.255, + "T_units": "K", + "p": 5782000, + "p_units": "Pa", + "rhomolar": 8150.084599999999, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 136.34, + "T_units": "K", + "p": 0.04799989366493727, + "p_units": "Pa", + "rhomolar": 27473.344990002275, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 136.34, + "T_units": "K", + "p": 0.04799989366493727, + "p_units": "Pa", + "rhomolar": 0.04235254435590307, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 435, "T_max_units": "K", "Ttriple": 136.34, @@ -260,21 +286,7 @@ "molar_mass_units": "kg/mol", "p_max": 70000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 47.99989366, - "ptriple_units": "Pa", - "reducing_state": { - "T": 351.255, - "T_units": "K", - "p": 5782000, - "p_units": "Pa", - "rhomolar": 8150.084599999999, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 27473.2983250474, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 0.04235884267931883, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "R32", diff --git a/dev/fluids/R365MFC.json b/dev/fluids/R365MFC.json index 63229d74..0014b5b5 100644 --- a/dev/fluids/R365MFC.json +++ b/dev/fluids/R365MFC.json @@ -135,6 +135,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "McLinden-PREPRINT-2013", + "STATES": { + "reducing": { + "T": 460, + "T_units": "K", + "p": 3266000, + "p_units": "Pa", + "rhomolar": 3200, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 239.0, + "T_units": "K", + "p": 2.478418202176464, + "p_units": "Pa", + "rhomolar": 9298.157101466448, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 239.0, + "T_units": "K", + "p": 2.478418202176464, + "p_units": "Pa", + "rhomolar": 1.2511727163730078, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 500, "T_max_units": "K", "Ttriple": 239, @@ -277,21 +303,7 @@ "molar_mass_units": "kg/mol", "p_max": 35000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 2478.418202, - "ptriple_units": "Pa", - "reducing_state": { - "T": 460, - "T_units": "K", - "p": 3266000, - "p_units": "Pa", - "rhomolar": 3200, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 9298.14395424287, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 1.251254102751831, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "R365MFC", diff --git a/dev/fluids/R404A.json b/dev/fluids/R404A.json index a99b174c..00ad8cd5 100644 --- a/dev/fluids/R404A.json +++ b/dev/fluids/R404A.json @@ -124,6 +124,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Lemmon-IJT-2003", + "STATES": { + "reducing": { + "T": 345.27, + "T_units": "K", + "p": 3734800, + "p_units": "Pa", + "rhomolar": 4939.999999999999, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 200.0, + "T_units": "K", + "p": 22.64918747516521, + "p_units": "Pa", + "rhomolar": 14209.140749102651, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 200.0, + "T_units": "K", + "p": 21.264273816834987, + "p_units": "Pa", + "rhomolar": 13.009612612697538, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 450, "T_max_units": "K", "Ttriple": 200, @@ -270,21 +296,7 @@ "molar_mass_units": "kg/mol", "p_max": 50000000, "p_max_units": "Pa", - "pseudo_pure": true, - "ptriple": 21264.27382, - "ptriple_units": "Pa", - "reducing_state": { - "T": 345.27, - "T_units": "K", - "p": 3734800, - "p_units": "Pa", - "rhomolar": 4939.999999999999, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 14209.11070707527, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 13.01041553482517, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": true } ], "NAME": "R404A", diff --git a/dev/fluids/R407C.json b/dev/fluids/R407C.json index 35028f30..2f1f651a 100644 --- a/dev/fluids/R407C.json +++ b/dev/fluids/R407C.json @@ -124,6 +124,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Lemmon-IJT-2003", + "STATES": { + "reducing": { + "T": 359.345, + "T_units": "K", + "p": 4631700, + "p_units": "Pa", + "rhomolar": 5260.000046401775, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 200.0, + "T_units": "K", + "p": 19.15805451544979, + "p_units": "Pa", + "rhomolar": 17036.35645139292, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 200.0, + "T_units": "K", + "p": 11.311511234771459, + "p_units": "Pa", + "rhomolar": 6.864256457230267, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 450, "T_max_units": "K", "Ttriple": 200, @@ -266,21 +292,7 @@ "molar_mass_units": "kg/mol", "p_max": 50000000, "p_max_units": "Pa", - "pseudo_pure": true, - "ptriple": 11311.51123, - "ptriple_units": "Pa", - "reducing_state": { - "T": 359.345, - "T_units": "K", - "p": 4631700, - "p_units": "Pa", - "rhomolar": 5260.000046401775, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 17036.32270806373, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 6.864730526475812, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": true } ], "NAME": "R407C", diff --git a/dev/fluids/R407F.json b/dev/fluids/R407F.json index 2db79658..48a0555e 100644 --- a/dev/fluids/R407F.json +++ b/dev/fluids/R407F.json @@ -111,6 +111,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "", + "STATES": { + "reducing": { + "T": 355.804, + "T_units": "K", + "p": 4754610, + "p_units": "Pa", + "rhomolar": 5816.413452386901, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 200.0, + "T_units": "K", + "p": 21.85074400548867, + "p_units": "Pa", + "rhomolar": 17707.28915058032, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 200.0, + "T_units": "K", + "p": 13.568238570898698, + "p_units": "Pa", + "rhomolar": 8.242011270809071, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 450, "T_max_units": "K", "Ttriple": 200, @@ -225,21 +251,7 @@ "molar_mass_units": "kg/mol", "p_max": 50000000, "p_max_units": "Pa", - "pseudo_pure": true, - "ptriple": 13568.23857, - "ptriple_units": "Pa", - "reducing_state": { - "T": 355.804, - "T_units": "K", - "p": 4754610, - "p_units": "Pa", - "rhomolar": 5816.413452386901, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 17707.25386371137, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 8.242572413460806, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": true } ], "NAME": "R407F", diff --git a/dev/fluids/R41.json b/dev/fluids/R41.json index 92299571..75e6d2dc 100644 --- a/dev/fluids/R41.json +++ b/dev/fluids/R41.json @@ -133,6 +133,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Lemmon-JCED-2006", + "STATES": { + "reducing": { + "T": 317.28, + "T_units": "K", + "p": 5897000, + "p_units": "Pa", + "rhomolar": 9300, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 129.82, + "T_units": "K", + "p": 0.34419906454658705, + "p_units": "Pa", + "rhomolar": 29560.843595523063, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 129.82, + "T_units": "K", + "p": 0.34419906454658705, + "p_units": "Pa", + "rhomolar": 0.31927855600765737, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 425, "T_max_units": "K", "Ttriple": 129.82, @@ -243,21 +269,7 @@ "molar_mass_units": "kg/mol", "p_max": 70000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 344.1990645, - "ptriple_units": "Pa", - "reducing_state": { - "T": 317.28, - "T_units": "K", - "p": 5897000, - "p_units": "Pa", - "rhomolar": 9300, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 29560.79016087918, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 0.3193201649680486, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "R41", diff --git a/dev/fluids/R410A.json b/dev/fluids/R410A.json index d034ee24..a321d8c2 100644 --- a/dev/fluids/R410A.json +++ b/dev/fluids/R410A.json @@ -124,6 +124,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Lemmon-IJT-2003", + "STATES": { + "reducing": { + "T": 344.494, + "T_units": "K", + "p": 4901200, + "p_units": "Pa", + "rhomolar": 6323.999999999999, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 200.0, + "T_units": "K", + "p": 29.160335374760287, + "p_units": "Pa", + "rhomolar": 19509.728512139023, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 200.0, + "T_units": "K", + "p": 29.009781591566753, + "p_units": "Pa", + "rhomolar": 17.796769503206775, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 450, "T_max_units": "K", "Ttriple": 200, @@ -266,21 +292,7 @@ "molar_mass_units": "kg/mol", "p_max": 50000000, "p_max_units": "Pa", - "pseudo_pure": true, - "ptriple": 29009.78159, - "ptriple_units": "Pa", - "reducing_state": { - "T": 344.494, - "T_units": "K", - "p": 4901200, - "p_units": "Pa", - "rhomolar": 6323.999999999999, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 19509.68726442668, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 17.79784917798893, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": true } ], "NAME": "R410A", diff --git a/dev/fluids/R507A.json b/dev/fluids/R507A.json index 5f2801c4..f7e81ffc 100644 --- a/dev/fluids/R507A.json +++ b/dev/fluids/R507A.json @@ -124,6 +124,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Lemmon-IJT-2003", + "STATES": { + "reducing": { + "T": 343.765, + "T_units": "K", + "p": 3704900, + "p_units": "Pa", + "rhomolar": 4964.029650250053, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 200.0, + "T_units": "K", + "p": 23.232992819809652, + "p_units": "Pa", + "rhomolar": 14129.88676815666, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 200.0, + "T_units": "K", + "p": 23.22194234304102, + "p_units": "Pa", + "rhomolar": 14.225518221449525, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 450, "T_max_units": "K", "Ttriple": 200, @@ -276,21 +302,7 @@ "molar_mass_units": "kg/mol", "p_max": 50000000, "p_max_units": "Pa", - "pseudo_pure": true, - "ptriple": 23221.94234, - "ptriple_units": "Pa", - "reducing_state": { - "T": 343.765, - "T_units": "K", - "p": 3704900, - "p_units": "Pa", - "rhomolar": 4964.029650250053, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 14129.85672581585, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 14.22637763151535, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": true } ], "NAME": "R507A", diff --git a/dev/fluids/RC318.json b/dev/fluids/RC318.json index 73aa54c9..7c49aba9 100644 --- a/dev/fluids/RC318.json +++ b/dev/fluids/RC318.json @@ -133,6 +133,32 @@ { "BibTeX_CP0": "Platzer-BOOK-1990", "BibTeX_EOS": "Platzer-BOOK-1990", + "STATES": { + "reducing": { + "T": 388.38, + "T_units": "K", + "p": 2777500, + "p_units": "Pa", + "rhomolar": 3099.38, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 233.35, + "T_units": "K", + "p": 19.46105608072302, + "p_units": "Pa", + "rhomolar": 8645.183286519046, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 233.35, + "T_units": "K", + "p": 19.46105608072302, + "p_units": "Pa", + "rhomolar": 10.156903370547868, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 623, "T_max_units": "K", "Ttriple": 233.35, @@ -299,21 +325,7 @@ "molar_mass_units": "kg/mol", "p_max": 60000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 19461.05608, - "ptriple_units": "Pa", - "reducing_state": { - "T": 388.38, - "T_units": "K", - "p": 2777500, - "p_units": "Pa", - "rhomolar": 3099.38, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 8645.167219803367, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 10.1574489163613, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "RC318", diff --git a/dev/fluids/SES36.json b/dev/fluids/SES36.json index 065c95ac..e9d6610d 100644 --- a/dev/fluids/SES36.json +++ b/dev/fluids/SES36.json @@ -111,6 +111,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Thol-2012", + "STATES": { + "reducing": { + "T": 450.7, + "T_units": "K", + "p": 2849000, + "p_units": "Pa", + "rhomolar": 2800, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 200.0, + "T_units": "K", + "p": 0.5732898712226775, + "p_units": "Pa", + "rhomolar": 8604.642607036254, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 200.0, + "T_units": "K", + "p": 0.5732898712226775, + "p_units": "Pa", + "rhomolar": 0.3451560286454884, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 725, "T_max_units": "K", "Ttriple": 200, @@ -247,21 +273,7 @@ "molar_mass_units": "kg/mol", "p_max": 500000000, "p_max_units": "Pa", - "pseudo_pure": true, - "ptriple": 573.2898712, - "ptriple_units": "Pa", - "reducing_state": { - "T": 450.7, - "T_units": "K", - "p": 2849000, - "p_units": "Pa", - "rhomolar": 2800, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 5.409791723018664e+99, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 5.409791723018664e+99, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": true } ], "NAME": "SES36", diff --git a/dev/fluids/SulfurDioxide.json b/dev/fluids/SulfurDioxide.json index 3983e623..eddbdf88 100644 --- a/dev/fluids/SulfurDioxide.json +++ b/dev/fluids/SulfurDioxide.json @@ -140,6 +140,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Lemmon-JCED-2006", + "STATES": { + "reducing": { + "T": 430.64, + "T_units": "K", + "p": 7884000, + "p_units": "Pa", + "rhomolar": 8195, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 197.7, + "T_units": "K", + "p": 1.6602201925894202, + "p_units": "Pa", + "rhomolar": 25290.03160667636, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 197.7, + "T_units": "K", + "p": 1.6602201925894202, + "p_units": "Pa", + "rhomolar": 1.0119785850101077, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 525, "T_max_units": "K", "Ttriple": 197.7, @@ -244,21 +270,7 @@ "molar_mass_units": "kg/mol", "p_max": 35000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 1660.220193, - "ptriple_units": "Pa", - "reducing_state": { - "T": 430.64, - "T_units": "K", - "p": 7884000, - "p_units": "Pa", - "rhomolar": 8195, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 25289.99470236515, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 1.012062400446851, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "SulfurDioxide", diff --git a/dev/fluids/SulfurHexafluoride.json b/dev/fluids/SulfurHexafluoride.json index d86ec784..d67d8281 100644 --- a/dev/fluids/SulfurHexafluoride.json +++ b/dev/fluids/SulfurHexafluoride.json @@ -138,6 +138,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Guder-JPCRD-2009", + "STATES": { + "reducing": { + "T": 318.7232, + "T_units": "K", + "p": 3754983, + "p_units": "Pa", + "rhomolar": 5082.317411198119, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 223.555, + "T_units": "K", + "p": 231.42447394939663, + "p_units": "Pa", + "rhomolar": 12632.389958220476, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 223.555, + "T_units": "K", + "p": 231.42447394939663, + "p_units": "Pa", + "rhomolar": 133.9236131741382, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 650, "T_max_units": "K", "Ttriple": 223.555, @@ -396,21 +422,7 @@ "molar_mass_units": "kg/mol", "p_max": 150000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 231424.4739, - "ptriple_units": "Pa", - "reducing_state": { - "T": 318.7232, - "T_units": "K", - "p": 3754983, - "p_units": "Pa", - "rhomolar": 5082.317411198119, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 12632.35639762951, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 133.9289768359154, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "SulfurHexafluoride", diff --git a/dev/fluids/Toluene.json b/dev/fluids/Toluene.json index 459a0c16..4e6b998f 100644 --- a/dev/fluids/Toluene.json +++ b/dev/fluids/Toluene.json @@ -136,6 +136,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Lemmon-JCED-2006", + "STATES": { + "reducing": { + "T": 591.75, + "T_units": "K", + "p": 4126000, + "p_units": "Pa", + "rhomolar": 3169, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 178.0, + "T_units": "K", + "p": 3.9393478817276356e-05, + "p_units": "Pa", + "rhomolar": 10580.06048163071, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 178.0, + "T_units": "K", + "p": 3.9393478817276356e-05, + "p_units": "Pa", + "rhomolar": 2.661765525110245e-05, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 700, "T_max_units": "K", "Ttriple": 178, @@ -237,21 +263,7 @@ "molar_mass_units": "kg/mol", "p_max": 500000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 0.03939347882, - "ptriple_units": "Pa", - "reducing_state": { - "T": 591.75, - "T_units": "K", - "p": 4126000, - "p_units": "Pa", - "rhomolar": 3169, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 10580.04981301902, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 2.662208671588402e-05, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "Toluene", diff --git a/dev/fluids/Water.json b/dev/fluids/Water.json index c9d3e81e..2e9fcfc1 100644 --- a/dev/fluids/Water.json +++ b/dev/fluids/Water.json @@ -140,6 +140,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Wagner-JPCRD-2002", + "STATES": { + "reducing": { + "T": 647.096, + "T_units": "K", + "p": 22064000, + "p_units": "Pa", + "rhomolar": 17873.72799560906, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 273.16, + "T_units": "K", + "p": 0.6116547710080396, + "p_units": "Pa", + "rhomolar": 55496.95514003037, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 273.16, + "T_units": "K", + "p": 0.6116547710080396, + "p_units": "Pa", + "rhomolar": 0.26947008086577756, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 1273, "T_max_units": "K", "Ttriple": 273.16, @@ -470,21 +496,7 @@ "molar_mass_units": "kg/mol", "p_max": 1000000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 611.654771, - "ptriple_units": "Pa", - "reducing_state": { - "T": 647.096, - "T_units": "K", - "p": 22064000, - "p_units": "Pa", - "rhomolar": 17873.72799560906, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 55496.95891263704, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 0.2694886833193984, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "Water", diff --git a/dev/fluids/Xenon.json b/dev/fluids/Xenon.json index 2a570f42..3fd803f4 100644 --- a/dev/fluids/Xenon.json +++ b/dev/fluids/Xenon.json @@ -139,6 +139,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Lemmon-JCED-2006", + "STATES": { + "reducing": { + "T": 289.733, + "T_units": "K", + "p": 5842000, + "p_units": "Pa", + "rhomolar": 8400, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 161.4, + "T_units": "K", + "p": 81.74779907319369, + "p_units": "Pa", + "rhomolar": 22592.342443412075, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 161.4, + "T_units": "K", + "p": 81.74779907319369, + "p_units": "Pa", + "rhomolar": 62.61266658271794, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 750, "T_max_units": "K", "Ttriple": 161.4, @@ -223,21 +249,7 @@ "molar_mass_units": "kg/mol", "p_max": 700000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 81747.79907, - "ptriple_units": "Pa", - "reducing_state": { - "T": 289.733, - "T_units": "K", - "p": 5842000, - "p_units": "Pa", - "rhomolar": 8400, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 22592.29218261004, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 62.61612339419351, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "Xenon", diff --git a/dev/fluids/cis-2-Butene.json b/dev/fluids/cis-2-Butene.json index 6601a0e7..a0316ee6 100644 --- a/dev/fluids/cis-2-Butene.json +++ b/dev/fluids/cis-2-Butene.json @@ -125,6 +125,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Lemmon-FPE-2005", + "STATES": { + "reducing": { + "T": 435.75, + "T_units": "K", + "p": 4225500, + "p_units": "Pa", + "rhomolar": 4244, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 134.3, + "T_units": "K", + "p": 0.00026364966495250915, + "p_units": "Pa", + "rhomolar": 14084.011372882016, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 134.3, + "T_units": "K", + "p": 0.00026364966495250915, + "p_units": "Pa", + "rhomolar": 0.0002361117808314181, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 525, "T_max_units": "K", "Ttriple": 134.3, @@ -224,21 +250,7 @@ "molar_mass_units": "kg/mol", "p_max": 50000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 0.263649665, - "ptriple_units": "Pa", - "reducing_state": { - "T": 435.75, - "T_units": "K", - "p": 4225500, - "p_units": "Pa", - "rhomolar": 4244, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 14083.99244573583, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 0.0002361583020722408, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "cis-2-Butene", diff --git a/dev/fluids/m-Xylene.json b/dev/fluids/m-Xylene.json index d413f79b..5eb34036 100644 --- a/dev/fluids/m-Xylene.json +++ b/dev/fluids/m-Xylene.json @@ -115,6 +115,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Zhou-JPCRD-2012", + "STATES": { + "reducing": { + "T": 616.89, + "T_units": "K", + "p": 3534600, + "p_units": "Pa", + "rhomolar": 2665, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 225.3, + "T_units": "K", + "p": 0.0031232674928265464, + "p_units": "Pa", + "rhomolar": 8676.64949512722, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 225.3, + "T_units": "K", + "p": 0.0031232674928265464, + "p_units": "Pa", + "rhomolar": 0.0016673173990112478, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 700, "T_max_units": "K", "Ttriple": 225.3, @@ -261,21 +287,7 @@ "molar_mass_units": "kg/mol", "p_max": 200000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 3.123267493, - "ptriple_units": "Pa", - "reducing_state": { - "T": 616.89, - "T_units": "K", - "p": 3534600, - "p_units": "Pa", - "rhomolar": 2665, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 8676.641643114928, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 0.001667496167675007, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "m-Xylene", diff --git a/dev/fluids/n-Butane.json b/dev/fluids/n-Butane.json index eb7aa8a4..a4329db9 100644 --- a/dev/fluids/n-Butane.json +++ b/dev/fluids/n-Butane.json @@ -138,6 +138,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Buecker-JPCRD-2006B", + "STATES": { + "reducing": { + "T": 425.125, + "T_units": "K", + "p": 3796000, + "p_units": "Pa", + "rhomolar": 3922.769612987809, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 134.895, + "T_units": "K", + "p": 0.0006656588871710992, + "p_units": "Pa", + "rhomolar": 12645.062133275154, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 134.895, + "T_units": "K", + "p": 0.0006656588871710992, + "p_units": "Pa", + "rhomolar": 0.0005935026998216425, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 340, "T_max_units": "K", "Ttriple": 134.895, @@ -318,21 +344,7 @@ "molar_mass_units": "kg/mol", "p_max": 12000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 0.6656588872, - "ptriple_units": "Pa", - "reducing_state": { - "T": 425.125, - "T_units": "K", - "p": 3796000, - "p_units": "Pa", - "rhomolar": 3922.769612987809, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 12645.04606150976, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 0.0005936113826349512, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "n-Butane", diff --git a/dev/fluids/n-Decane.json b/dev/fluids/n-Decane.json index 519819ac..0a559462 100644 --- a/dev/fluids/n-Decane.json +++ b/dev/fluids/n-Decane.json @@ -138,6 +138,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Lemmon-JCED-2006", + "STATES": { + "reducing": { + "T": 617.7, + "T_units": "K", + "p": 2103000, + "p_units": "Pa", + "rhomolar": 1640, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 243.5, + "T_units": "K", + "p": 0.0014041836415494265, + "p_units": "Pa", + "rhomolar": 5406.416906179153, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 243.5, + "T_units": "K", + "p": 0.0014041836415494265, + "p_units": "Pa", + "rhomolar": 0.0006935770572152337, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 675, "T_max_units": "K", "Ttriple": 243.5, @@ -237,21 +263,7 @@ "molar_mass_units": "kg/mol", "p_max": 800000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 1.404183642, - "ptriple_units": "Pa", - "reducing_state": { - "T": 617.7, - "T_units": "K", - "p": 2103000, - "p_units": "Pa", - "rhomolar": 1640, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 5406.411318574519, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 0.0006936528125986273, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "n-Decane", diff --git a/dev/fluids/n-Dodecane.json b/dev/fluids/n-Dodecane.json index bfadc7e6..1e7b881e 100644 --- a/dev/fluids/n-Dodecane.json +++ b/dev/fluids/n-Dodecane.json @@ -140,6 +140,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Lemmon-EF-2004", + "STATES": { + "reducing": { + "T": 658.1, + "T_units": "K", + "p": 1817000, + "p_units": "Pa", + "rhomolar": 1330, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 263.6, + "T_units": "K", + "p": 0.0006262109235467472, + "p_units": "Pa", + "rhomolar": 4529.1463736398255, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 263.6, + "T_units": "K", + "p": 0.0006262109235467472, + "p_units": "Pa", + "rhomolar": 0.00028572146420915024, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 800, "T_max_units": "K", "Ttriple": 263.6, @@ -245,21 +271,7 @@ "molar_mass_units": "kg/mol", "p_max": 200000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 0.6262109235, - "ptriple_units": "Pa", - "reducing_state": { - "T": 658.1, - "T_units": "K", - "p": 1817000, - "p_units": "Pa", - "rhomolar": 1330, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 4529.141934352717, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 0.0002857525844969409, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "n-Dodecane", diff --git a/dev/fluids/n-Heptane.json b/dev/fluids/n-Heptane.json index 663780ad..b5b06ed2 100644 --- a/dev/fluids/n-Heptane.json +++ b/dev/fluids/n-Heptane.json @@ -140,6 +140,32 @@ { "BibTeX_CP0": "Jaeschke-IJT-1995", "BibTeX_EOS": "Span-IJT-2003B", + "STATES": { + "reducing": { + "T": 540.13, + "T_units": "K", + "p": 2736000, + "p_units": "Pa", + "rhomolar": 2315.323047444163, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 182.55, + "T_units": "K", + "p": 0.00017549039806495355, + "p_units": "Pa", + "rhomolar": 7745.685209191345, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 182.55, + "T_units": "K", + "p": 0.00017549039806495355, + "p_units": "Pa", + "rhomolar": 0.00011562068460706438, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 310, "T_max_units": "K", "Ttriple": 182.55, @@ -254,21 +280,7 @@ "molar_mass_units": "kg/mol", "p_max": 100000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 0.1754903981, - "ptriple_units": "Pa", - "reducing_state": { - "T": 540.13, - "T_units": "K", - "p": 2736000, - "p_units": "Pa", - "rhomolar": 2315.323047444163, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 7745.676592920418, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 0.0001156384998550007, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "n-Heptane", diff --git a/dev/fluids/n-Hexane.json b/dev/fluids/n-Hexane.json index 45aa3307..6e36c3b1 100644 --- a/dev/fluids/n-Hexane.json +++ b/dev/fluids/n-Hexane.json @@ -140,6 +140,32 @@ { "BibTeX_CP0": "Jaeschke-IJT-1995", "BibTeX_EOS": "Span-IJT-2003B", + "STATES": { + "reducing": { + "T": 507.82, + "T_units": "K", + "p": 3034000, + "p_units": "Pa", + "rhomolar": 2705.877875067769, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 177.83, + "T_units": "K", + "p": 0.001277140421339977, + "p_units": "Pa", + "rhomolar": 8839.379285343, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 177.83, + "T_units": "K", + "p": 0.001277140421339977, + "p_units": "Pa", + "rhomolar": 0.0008637746216777618, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 548, "T_max_units": "K", "Ttriple": 177.83, @@ -254,21 +280,7 @@ "molar_mass_units": "kg/mol", "p_max": 92000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 1.277140421, - "ptriple_units": "Pa", - "reducing_state": { - "T": 507.82, - "T_units": "K", - "p": 3034000, - "p_units": "Pa", - "rhomolar": 2705.877875067769, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 8839.368780630628, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 0.0008638949474676791, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "n-Hexane", diff --git a/dev/fluids/n-Nonane.json b/dev/fluids/n-Nonane.json index 38f25ba0..b25b780f 100644 --- a/dev/fluids/n-Nonane.json +++ b/dev/fluids/n-Nonane.json @@ -137,6 +137,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Lemmon-JCED-2006", + "STATES": { + "reducing": { + "T": 594.55, + "T_units": "K", + "p": 2281000, + "p_units": "Pa", + "rhomolar": 1810, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 219.7, + "T_units": "K", + "p": 0.0004444854177429873, + "p_units": "Pa", + "rhomolar": 6051.9562481855255, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 219.7, + "T_units": "K", + "p": 0.0004444854177429873, + "p_units": "Pa", + "rhomolar": 0.00024332923985968528, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 600, "T_max_units": "K", "Ttriple": 219.7, @@ -236,21 +262,7 @@ "molar_mass_units": "kg/mol", "p_max": 800000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 0.4444854177, - "ptriple_units": "Pa", - "reducing_state": { - "T": 594.55, - "T_units": "K", - "p": 2281000, - "p_units": "Pa", - "rhomolar": 1810, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 6051.949931805821, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 0.0002433600391426276, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "n-Nonane", diff --git a/dev/fluids/n-Octane.json b/dev/fluids/n-Octane.json index d26f3c5c..ac763f8a 100644 --- a/dev/fluids/n-Octane.json +++ b/dev/fluids/n-Octane.json @@ -142,6 +142,32 @@ { "BibTeX_CP0": "Jaeschke-IJT-1995", "BibTeX_EOS": "Span-IJT-2003B", + "STATES": { + "reducing": { + "T": 569.32, + "T_units": "K", + "p": 2497000, + "p_units": "Pa", + "rhomolar": 2056.4, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 216.37, + "T_units": "K", + "p": 0.0019889161884656943, + "p_units": "Pa", + "rhomolar": 6686.398950048654, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 216.37, + "T_units": "K", + "p": 0.0019889161884656943, + "p_units": "Pa", + "rhomolar": 0.001105574732115143, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 548, "T_max_units": "K", "Ttriple": 216.37, @@ -256,21 +282,7 @@ "molar_mass_units": "kg/mol", "p_max": 96000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 1.988916188, - "ptriple_units": "Pa", - "reducing_state": { - "T": 569.32, - "T_units": "K", - "p": 2497000, - "p_units": "Pa", - "rhomolar": 2056.4, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 6686.391815025597, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 0.001105704645608448, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "n-Octane", diff --git a/dev/fluids/n-Pentane.json b/dev/fluids/n-Pentane.json index 8a3b0f35..dc063920 100644 --- a/dev/fluids/n-Pentane.json +++ b/dev/fluids/n-Pentane.json @@ -143,6 +143,32 @@ { "BibTeX_CP0": "Jaeschke-IJT-1995", "BibTeX_EOS": "Span-IJT-2003B", + "STATES": { + "reducing": { + "T": 469.7, + "T_units": "K", + "p": 3370000, + "p_units": "Pa", + "rhomolar": 3215.577588422147, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 143.47, + "T_units": "K", + "p": 7.632218395084951e-05, + "p_units": "Pa", + "rhomolar": 10566.403034046354, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 143.47, + "T_units": "K", + "p": 7.632218395084951e-05, + "p_units": "Pa", + "rhomolar": 6.398133659997455e-05, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 573, "T_max_units": "K", "Ttriple": 143.47, @@ -257,21 +283,7 @@ "molar_mass_units": "kg/mol", "p_max": 69000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 0.07632218395, - "ptriple_units": "Pa", - "reducing_state": { - "T": 469.7, - "T_units": "K", - "p": 3370000, - "p_units": "Pa", - "rhomolar": 3215.577588422147, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 10566.39007740751, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 6.399383717983962e-05, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "n-Pentane", diff --git a/dev/fluids/n-Propane.json b/dev/fluids/n-Propane.json index f0038515..5de9dced 100644 --- a/dev/fluids/n-Propane.json +++ b/dev/fluids/n-Propane.json @@ -142,6 +142,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Lemmon-JCED-2009", + "STATES": { + "reducing": { + "T": 369.89, + "T_units": "K", + "p": 4251200, + "p_units": "Pa", + "rhomolar": 5000.000000000001, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 85.525, + "T_units": "K", + "p": 1.7204618151212885e-07, + "p_units": "Pa", + "rhomolar": 16625.805559650216, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 85.525, + "T_units": "K", + "p": 1.7204618151212885e-07, + "p_units": "Pa", + "rhomolar": 2.4194535056958734e-07, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 650, "T_max_units": "K", "Ttriple": 85.525, @@ -303,21 +329,7 @@ "molar_mass_units": "kg/mol", "p_max": 1000000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 0.0001720461815, - "ptriple_units": "Pa", - "reducing_state": { - "T": 369.89, - "T_units": "K", - "p": 4251200, - "p_units": "Pa", - "rhomolar": 5000.000000000001, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 16625.78187096635, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 2.420412863780354e-07, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "n-Propane", diff --git a/dev/fluids/n-Undecane.json b/dev/fluids/n-Undecane.json index 811ae6ec..9f395533 100644 --- a/dev/fluids/n-Undecane.json +++ b/dev/fluids/n-Undecane.json @@ -116,6 +116,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Aleksandrov-TE-2011", + "STATES": { + "reducing": { + "T": 638.8, + "T_units": "K", + "p": 1990400, + "p_units": "Pa", + "rhomolar": 1514.916863638556, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 247.541, + "T_units": "K", + "p": 0.00044605591855216597, + "p_units": "Pa", + "rhomolar": 4962.066427665783, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 247.541, + "T_units": "K", + "p": 0.00044605591855216597, + "p_units": "Pa", + "rhomolar": 0.00021672611484766812, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 700, "T_max_units": "K", "Ttriple": 247.541, @@ -235,21 +261,7 @@ "molar_mass_units": "kg/mol", "p_max": 500000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 0.4460559186, - "ptriple_units": "Pa", - "reducing_state": { - "T": 638.8, - "T_units": "K", - "p": 1990400, - "p_units": "Pa", - "rhomolar": 1514.916863638556, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 4962.061358602959, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 0.0002167513070507905, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "n-Undecane", diff --git a/dev/fluids/o-Xylene.json b/dev/fluids/o-Xylene.json index 0aa63b95..e1c21a9d 100644 --- a/dev/fluids/o-Xylene.json +++ b/dev/fluids/o-Xylene.json @@ -115,6 +115,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Zhou-JPCRD-2012", + "STATES": { + "reducing": { + "T": 630.259, + "T_units": "K", + "p": 3737500, + "p_units": "Pa", + "rhomolar": 2684.500000000001, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 247.985, + "T_units": "K", + "p": 0.02280577638859245, + "p_units": "Pa", + "rhomolar": 8647.220325712748, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 247.985, + "T_units": "K", + "p": 0.02280577638859245, + "p_units": "Pa", + "rhomolar": 0.011061576929647127, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 700, "T_max_units": "K", "Ttriple": 247.985, @@ -259,21 +285,7 @@ "molar_mass_units": "kg/mol", "p_max": 70000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 22.80577639, - "ptriple_units": "Pa", - "reducing_state": { - "T": 630.259, - "T_units": "K", - "p": 3737500, - "p_units": "Pa", - "rhomolar": 2684.500000000001, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 8647.212407085435, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 0.0110625353483808, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "o-Xylene", diff --git a/dev/fluids/p-Xylene.json b/dev/fluids/p-Xylene.json index 5664a644..4aefbd68 100644 --- a/dev/fluids/p-Xylene.json +++ b/dev/fluids/p-Xylene.json @@ -115,6 +115,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Zhou-JPCRD-2012", + "STATES": { + "reducing": { + "T": 616.168, + "T_units": "K", + "p": 3531500, + "p_units": "Pa", + "rhomolar": 2693.92, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 286.4, + "T_units": "K", + "p": 0.5800850024867812, + "p_units": "Pa", + "rhomolar": 8165.004739624582, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 286.4, + "T_units": "K", + "p": 0.5800850024867812, + "p_units": "Pa", + "rhomolar": 0.24384664074124282, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 700, "T_max_units": "K", "Ttriple": 286.4, @@ -259,21 +285,7 @@ "molar_mass_units": "kg/mol", "p_max": 200000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 580.0850025, - "ptriple_units": "Pa", - "reducing_state": { - "T": 616.168, - "T_units": "K", - "p": 3531500, - "p_units": "Pa", - "rhomolar": 2693.92, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 8164.996595154399, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 0.2438612134796824, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "p-Xylene", diff --git a/dev/fluids/trans-2-Butene.json b/dev/fluids/trans-2-Butene.json index bc3630f1..78136ecf 100644 --- a/dev/fluids/trans-2-Butene.json +++ b/dev/fluids/trans-2-Butene.json @@ -125,6 +125,32 @@ { "BibTeX_CP0": "", "BibTeX_EOS": "Lemmon-FPE-2005", + "STATES": { + "reducing": { + "T": 428.61, + "T_units": "K", + "p": 4027300, + "p_units": "Pa", + "rhomolar": 4213, + "rhomolar_units": "mol/m^3" + }, + "sat_min_liquid": { + "T": 167.6, + "T_units": "K", + "p": 0.07481669079819876, + "p_units": "Pa", + "rhomolar": 13140.755821358482, + "rhomolar_units": "mol/m^3" + }, + "sat_min_vapor": { + "T": 167.6, + "T_units": "K", + "p": 0.07481669079819876, + "p_units": "Pa", + "rhomolar": 0.05370261847351349, + "rhomolar_units": "mol/m^3" + } + }, "T_max": 525, "T_max_units": "K", "Ttriple": 167.6, @@ -224,21 +250,7 @@ "molar_mass_units": "kg/mol", "p_max": 50000000, "p_max_units": "Pa", - "pseudo_pure": false, - "ptriple": 74.8166908, - "ptriple_units": "Pa", - "reducing_state": { - "T": 428.61, - "T_units": "K", - "p": 4027300, - "p_units": "Pa", - "rhomolar": 4213, - "rhomolar_units": "mol/m^3" - }, - "rhoLtriple": 13140.73776925106, - "rhoLtriple_units": "mol/m^3", - "rhoVtriple": 0.05370865474193402, - "rhoVtriple_units": "mol/m^3" + "pseudo_pure": false } ], "NAME": "trans-2-Butene", From 6e287e9454e8cca16b5e555cd880fb03d5ef5e91 Mon Sep 17 00:00:00 2001 From: Ian Bell Date: Fri, 6 Jun 2014 12:05:55 +0200 Subject: [PATCH 04/26] Update parsing of the fluid JSON files for the new state architecture Signed-off-by: Ian Bell --- include/CoolPropFluid.h | 73 ++++--- src/Backends/Helmholtz/FlashRoutines.cpp | 42 ++-- src/Backends/Helmholtz/Fluids/FluidLibrary.h | 194 ++++++++++-------- .../Helmholtz/HelmholtzEOSMixtureBackend.cpp | 6 +- src/Backends/Helmholtz/TransportRoutines.cpp | 70 +++---- 5 files changed, 196 insertions(+), 189 deletions(-) diff --git a/include/CoolPropFluid.h b/include/CoolPropFluid.h index e81c1ada..58ce678b 100644 --- a/include/CoolPropFluid.h +++ b/include/CoolPropFluid.h @@ -60,11 +60,11 @@ struct ConductivityDiluteRatioPolynomialsData{ }; struct ConductivityDiluteVariables { - enum ConductivityDiluteEnum {CONDUCTIVITY_DILUTE_RATIO_POLYNOMIALS, - CONDUCTIVITY_DILUTE_ETA0_AND_POLY, - CONDUCTIVITY_DILUTE_CO2, - CONDUCTIVITY_DILUTE_ETHANE, - CONDUCTIVITY_DILUTE_NONE, + enum ConductivityDiluteEnum {CONDUCTIVITY_DILUTE_RATIO_POLYNOMIALS, + CONDUCTIVITY_DILUTE_ETA0_AND_POLY, + CONDUCTIVITY_DILUTE_CO2, + CONDUCTIVITY_DILUTE_ETHANE, + CONDUCTIVITY_DILUTE_NONE, CONDUCTIVITY_DILUTE_NOT_SET }; int type; @@ -117,10 +117,10 @@ struct ConductivityCriticalSimplifiedOlchowySengersData{ }; struct ConductivityCriticalVariables { - enum ConductivityResidualEnum {CONDUCTIVITY_CRITICAL_SIMPLIFIED_OLCHOWY_SENGERS, - CONDUCTIVITY_CRITICAL_R123, - CONDUCTIVITY_CRITICAL_AMMONIA, - CONDUCTIVITY_CRITICAL_NONE, + enum ConductivityResidualEnum {CONDUCTIVITY_CRITICAL_SIMPLIFIED_OLCHOWY_SENGERS, + CONDUCTIVITY_CRITICAL_R123, + CONDUCTIVITY_CRITICAL_AMMONIA, + CONDUCTIVITY_CRITICAL_NONE, CONDUCTIVITY_CRITICAL_CARBONDIOXIDE_SCALABRIN_JPCRD_2006, CONDUCTIVITY_CRITICAL_NOT_SET }; @@ -130,7 +130,7 @@ struct ConductivityCriticalVariables ConductivityCriticalVariables(){type = CONDUCTIVITY_CRITICAL_NOT_SET; } }; -/// Variables for the dilute gas part +/// Variables for the dilute gas part struct ViscosityDiluteGasCollisionIntegralData { long double molar_mass, C; @@ -147,9 +147,9 @@ struct ViscosityDiluteGasPowersOfT }; struct ViscosityDiluteVariables { - enum ViscosityDiluteEnum {VISCOSITY_DILUTE_COLLISION_INTEGRAL, - VISCOSITY_DILUTE_COLLISION_INTEGRAL_POWERS_OF_TSTAR, - VISCOSITY_DILUTE_KINETIC_THEORY, + enum ViscosityDiluteEnum {VISCOSITY_DILUTE_COLLISION_INTEGRAL, + VISCOSITY_DILUTE_COLLISION_INTEGRAL_POWERS_OF_TSTAR, + VISCOSITY_DILUTE_KINETIC_THEORY, VISCOSITY_DILUTE_ETHANE, VISCOSITY_DILUTE_POWERS_OF_T, VISCOSITY_DILUTE_NOT_SET @@ -184,7 +184,7 @@ struct ViscosityFrictionTheoryData }; struct ViscosityHigherOrderVariables { - enum ViscosityDiluteEnum {VISCOSITY_HIGHER_ORDER_BATSCHINKI_HILDEBRAND, + enum ViscosityDiluteEnum {VISCOSITY_HIGHER_ORDER_BATSCHINKI_HILDEBRAND, VISCOSITY_HIGHER_ORDER_HYDROGEN, VISCOSITY_HIGHER_ORDER_HEXANE, VISCOSITY_HIGHER_ORDER_ETHANE, @@ -206,7 +206,7 @@ struct ViscosityECSVariables{ class TransportPropertyData { public: - enum ViscosityDiluteEnum {VISCOSITY_HARDCODED_WATER, + enum ViscosityDiluteEnum {VISCOSITY_HARDCODED_WATER, VISCOSITY_HARDCODED_HELIUM, VISCOSITY_HARDCODED_R23, VISCOSITY_NOT_HARDCODED @@ -231,7 +231,7 @@ public: bool conductivity_using_ECS; ///< A flag for whether to use extended corresponding states for conductivity. False for no long double sigma_eta, epsilon_over_k; int hardcoded_viscosity, hardcoded_conductivity; - TransportPropertyData(){hardcoded_viscosity = VISCOSITY_NOT_HARDCODED; + TransportPropertyData(){hardcoded_viscosity = VISCOSITY_NOT_HARDCODED; hardcoded_conductivity = CONDUCTIVITY_NOT_HARDCODED; viscosity_using_ECS = false; conductivity_using_ECS = false; @@ -246,8 +246,8 @@ of the form \sigma = \sum_{i=0}^{k-1}a_i\left(1-\frac{T}{\tilde T_c}\right)^{n_i} \f] -where \f$ \tilde T_c \f$ is the critical temperature used for the correlation which is -almost always equal to the critical temperature of the equation of state. Result for +where \f$ \tilde T_c \f$ is the critical temperature used for the correlation which is +almost always equal to the critical temperature of the equation of state. Result for surface tension is in N/m */ class SurfaceTensionCorrelation @@ -255,7 +255,7 @@ class SurfaceTensionCorrelation public: std::vector a, n, s; long double Tc; - + std::size_t N; std::string BibTeX; @@ -264,10 +264,10 @@ public: { a = cpjson::get_long_double_array(json_code["a"]); n = cpjson::get_long_double_array(json_code["n"]); - + Tc = cpjson::get_double(json_code,"Tc"); BibTeX = cpjson::get_string(json_code,"BibTeX"); - + this->N = n.size(); s = n; }; @@ -294,7 +294,7 @@ private: enum ancillaryfunctiontypes{TYPE_NOT_EXPONENTIAL = 0, TYPE_EXPONENTIAL = 1}; std::size_t N; public: - + SaturationAncillaryFunction(){}; SaturationAncillaryFunction(rapidjson::Value &json_code) { @@ -323,9 +323,9 @@ public: s[i] = n[i]*pow(THETA, t[i]); } double summer = std::accumulate(s.begin(), s.end(), 0.0); - + if (type == TYPE_NOT_EXPONENTIAL) - { + { return reducing_value*(1+summer); } else @@ -350,8 +350,8 @@ public: long double T, value, r, current_value; solver_resid(SaturationAncillaryFunction *anc, long double value) : anc(anc), value(value){}; - - double call(double T){ + + double call(double T){ this->T = T; current_value = anc->evaluate(T); r = current_value - value; @@ -365,7 +365,6 @@ public: } }; - class MeltingLine { }; @@ -378,8 +377,8 @@ struct Ancillaries }; /// The core class for an equation of state -/** - This class holds the absolute minimum information to evaluate the equation +/** + This class holds the absolute minimum information to evaluate the equation of state. This includes the reducing state, limits on the equation of state, the coefficients for the Helmholtz derivative terms. @@ -389,15 +388,15 @@ class EquationOfState{ public: EquationOfState(){}; ~EquationOfState(){}; - SimpleState reduce; ///< Reducing state used for the EOS (usually, but not always, the critical point) + SimpleState reduce, ///< Reducing state used for the EOS (usually, but not always, the critical point) + sat_min_liquid, ///< The saturated liquid state at the minimum saturation temperature + sat_min_vapor; ///< The saturated vapor state at the minimum saturation temperature EOSLimits limits; ///< Limits on the EOS double R_u, ///< The universal gas constant used for this EOS (usually, but not always, 8.314472 J/mol/K) molar_mass, ///< The molar mass in kg/mol (note NOT kg/kmol) accentric, ///< The accentric factor \f$ \omega = -log_{10}\left(\frac{p_s(T/T_c=0.7)}{p_c}\right)-1\f$ Ttriple, ///< Triple point temperature (K) - ptriple, ///< Triple point pressure (Pa) - rhoLtriple, ///< Density of liquid at triple point pressure (mol/m^3) - rhoVtriple; ///< Density of vapor at triple point pressure (mol/m^3) + ptriple; ///< Triple point pressure (Pa) bool pseudo_pure; ///< Is a pseudo-pure fluid (true) or pure fluid (false) ResidualHelmholtzContainer alphar; ///< The residual Helmholtz energy IdealHelmholtzContainer alpha0; ///< The ideal Helmholtz energy @@ -520,15 +519,13 @@ class CoolPropFluid { std::string CAS; ///< The CAS number of the fluid std::vector aliases; ///< A vector of aliases of names for the fluid - /*std::vector viscosity_vector; ///< The viscosity correlations that could be used for this fluid - std::vector thermal_conductivity_vector; ///< The thermal conductivity correlations that could be used for this fluid - std::vector surface_tension_vector; ///< The surface tension correlations that could be used for this fluid*/ - BibTeXKeysStruct BibTeXKeys; EnvironmentalFactorsStruct environment; Ancillaries ancillaries; TransportPropertyData transport; - SimpleState crit; + SimpleState crit, ///< The state at the critical point + triple_liquid, ///< The saturated liquid state at the triple point temperature + triple_vapor; ///< The saturated vapor state at the triple point temperature double gas_constant(){ return pEOS->R_u; }; double molar_mass(){ return pEOS->molar_mass; }; diff --git a/src/Backends/Helmholtz/FlashRoutines.cpp b/src/Backends/Helmholtz/FlashRoutines.cpp index 8f1368b3..c651e5d4 100644 --- a/src/Backends/Helmholtz/FlashRoutines.cpp +++ b/src/Backends/Helmholtz/FlashRoutines.cpp @@ -52,7 +52,7 @@ void FlashRoutines::QT_flash(HelmholtzEOSMixtureBackend &HEOS) rhoLsat = HEOS.solver_rho_Tp(HEOS._T, psatLanc, rhoLanc); rhoVsat = HEOS.solver_rho_Tp(HEOS._T, psatVanc, rhoLanc); - if (!ValidNumber(rhoLsat) || !ValidNumber(rhoVsat) || + if (!ValidNumber(rhoLsat) || !ValidNumber(rhoVsat) || fabs(rhoLsat/rhoLanc-1) > 0.1 || fabs(rhoVanc/rhoVsat-1) > 0.1) { throw ValueError("pseudo-pure failed"); @@ -79,7 +79,7 @@ void FlashRoutines::QT_flash(HelmholtzEOSMixtureBackend &HEOS) // Use Wilson iteration to obtain updated guess for pressure pguess = SaturationSolvers::saturation_Wilson(&HEOS, HEOS._Q, HEOS._T, SaturationSolvers::imposed_T, HEOS.mole_fractions, pguess); - + // Actually call the successive substitution solver SaturationSolvers::successive_substitution(&HEOS, HEOS._Q, HEOS._T, pguess, HEOS.mole_fractions, HEOS.K, options); } @@ -109,7 +109,7 @@ void FlashRoutines::PQ_flash(HelmholtzEOSMixtureBackend &HEOS) options.use_logdelta = false; // Actually call the solver SaturationSolvers::saturation_PHSU_pure(&HEOS, HEOS._p, options); - + // Load the outputs HEOS._p = HEOS._Q*HEOS.SatV->p() + (1 - HEOS._Q)*HEOS.SatL->p(); HEOS._rhomolar = 1/(HEOS._Q/HEOS.SatV->rhomolar() + (1 - HEOS._Q)/HEOS.SatL->rhomolar()); @@ -128,10 +128,10 @@ void FlashRoutines::PQ_flash(HelmholtzEOSMixtureBackend &HEOS) // Use Wilson iteration to obtain updated guess for temperature Tguess = SaturationSolvers::saturation_Wilson(&HEOS, HEOS._Q, HEOS._p, SaturationSolvers::imposed_p, HEOS.mole_fractions, Tguess); - + // Actually call the successive substitution solver SaturationSolvers::successive_substitution(&HEOS, HEOS._Q, Tguess, HEOS._p, HEOS.mole_fractions, HEOS.K, io); - + PhaseEnvelope::PhaseEnvelope_GV ENV_GV; ENV_GV.build(&HEOS, HEOS.mole_fractions, HEOS.K, io); } @@ -143,7 +143,7 @@ void FlashRoutines::PHSU_D_flash(HelmholtzEOSMixtureBackend &HEOS, int other) class solver_resid : public FuncWrapper1D { public: - + HelmholtzEOSMixtureBackend *HEOS; long double r, eos, rhomolar, value, T; int other; @@ -164,15 +164,15 @@ void FlashRoutines::PHSU_D_flash(HelmholtzEOSMixtureBackend &HEOS, int other) default: throw ValueError(format("Input not supported")); } - + r = eos - value; return r; }; }; - + std::string errstring; - if (HEOS.imposed_phase_index > -1) + if (HEOS.imposed_phase_index > -1) { // Use the phase defined by the imposed phase HEOS._phase = HEOS.imposed_phase_index; @@ -182,17 +182,17 @@ void FlashRoutines::PHSU_D_flash(HelmholtzEOSMixtureBackend &HEOS, int other) if (HEOS.is_pure_or_pseudopure) { CoolPropFluid * component = HEOS.components[0]; - + shared_ptr Sat; - long double rhoLtriple = component->pEOS->rhoLtriple; - long double rhoVtriple = component->pEOS->rhoVtriple; + long double rhoLtriple = component->triple_liquid.rhomolar; + long double rhoVtriple = component->triple_vapor.rhomolar; // Check if in the "normal" region if (HEOS._rhomolar >= rhoVtriple && HEOS._rhomolar <= rhoLtriple) { long double yL, yV, value, y_solid; - long double TLtriple = component->pEOS->Ttriple; //TODO: separate TL and TV for ppure - long double TVtriple = component->pEOS->Ttriple; //TODO: separate TL and TV for ppure - + long double TLtriple = component->triple_liquid.T; ///TODO: separate TL and TV for ppure + long double TVtriple = component->triple_vapor.T; + // First check if solid (below the line connecting the triple point values) - this is an error for now switch (other) { @@ -246,7 +246,7 @@ void FlashRoutines::PHSU_D_flash(HelmholtzEOSMixtureBackend &HEOS, int other) } // Check if vapor/solid region below triple point vapor density - else if (HEOS._rhomolar < component->pEOS->rhoVtriple) + else if (HEOS._rhomolar < component->triple_vapor.rhomolar) { long double y, value; long double TVtriple = component->pEOS->Ttriple; //TODO: separate TL and TV for ppure @@ -280,7 +280,7 @@ void FlashRoutines::PHSU_D_flash(HelmholtzEOSMixtureBackend &HEOS, int other) } // Check in the liquid/solid region above the triple point density - else + else { long double y, value; long double TLtriple = component->pEOS->Ttriple; //TODO: separate TL and TV for ppure @@ -313,7 +313,7 @@ void FlashRoutines::PHSU_D_flash(HelmholtzEOSMixtureBackend &HEOS, int other) } } } - else + else throw NotImplementedError("PHSU_D_flash not ready for mixtures"); } } @@ -323,7 +323,7 @@ void FlashRoutines::HSU_P_flash(HelmholtzEOSMixtureBackend &HEOS, int other) } void FlashRoutines::DHSU_T_flash(HelmholtzEOSMixtureBackend &HEOS, int other) { - if (HEOS.imposed_phase_index > -1) + if (HEOS.imposed_phase_index > -1) { // Use the phase defined by the imposed phase HEOS._phase = HEOS.imposed_phase_index; @@ -370,9 +370,9 @@ void FlashRoutines::DHSU_T_flash(HelmholtzEOSMixtureBackend &HEOS, int other) default: break; } - HEOS.calc_pressure(); + HEOS.calc_pressure(); HEOS._Q = -1; } } -} /* namespace CoolProp */ \ No newline at end of file +} /* namespace CoolProp */ diff --git a/src/Backends/Helmholtz/Fluids/FluidLibrary.h b/src/Backends/Helmholtz/Fluids/FluidLibrary.h index 36d9463e..de27e35e 100644 --- a/src/Backends/Helmholtz/Fluids/FluidLibrary.h +++ b/src/Backends/Helmholtz/Fluids/FluidLibrary.h @@ -16,8 +16,8 @@ extern int get_debug_level(); /// A container for the fluid parameters for the CoolProp fluids /** -This container holds copies of all of the fluid instances for the fluids that are loaded in CoolProp. -New fluids can be added by passing in a rapidjson::Value instance to the add_one function, or +This container holds copies of all of the fluid instances for the fluids that are loaded in CoolProp. +New fluids can be added by passing in a rapidjson::Value instance to the add_one function, or a rapidjson array of fluids to the add_many function. */ class JSONFluidLibrary @@ -31,9 +31,9 @@ protected: /// Parse the contributions to the residual Helmholtz energy void parse_alphar(rapidjson::Value &alphar, EquationOfState &EOS) - { + { for (rapidjson::Value::ValueIterator itr = alphar.Begin(); itr != alphar.End(); ++itr) - { + { // A reference for code cleanness rapidjson::Value &contribution = *itr; @@ -140,7 +140,7 @@ protected: { if (!alpha0.IsArray()){throw ValueError();} for (rapidjson::Value::ValueIterator itr = alpha0.Begin(); itr != alpha0.End(); ++itr) - { + { // A reference for code cleanness rapidjson::Value &contribution = *itr; @@ -172,7 +172,7 @@ protected: // Retrieve the values std::vector n = cpjson::get_long_double_array(contribution["n"]); std::vector t = cpjson::get_long_double_array(contribution["t"]); - + std::vector c = cpjson::get_long_double_array(contribution["c"]); std::vector d = cpjson::get_long_double_array(contribution["d"]); if (EOS.alpha0.PlanckEinstein.is_enabled() == true){ @@ -217,7 +217,7 @@ protected: } else if (!type.compare("IdealGasHelmholtzCP0AlyLee")) { - + std::vector constants = cpjson::get_long_double_array(contribution["c"]); long double Tc = cpjson::get_double(contribution, "Tc"); long double T0 = cpjson::get_double(contribution, "T0"); @@ -249,7 +249,7 @@ protected: c.push_back(1); d.push_back(1); } - + if (EOS.alpha0.PlanckEinstein.is_enabled() == true){ EOS.alpha0.PlanckEinstein.extend(n, t, c, d); } @@ -297,38 +297,41 @@ protected: EOS.R_u = cpjson::get_double(EOS_json,"gas_constant"); EOS.molar_mass = cpjson::get_double(EOS_json,"molar_mass"); EOS.accentric = cpjson::get_double(EOS_json,"accentric"); - EOS.Ttriple = cpjson::get_double(EOS_json, "Ttriple"); - EOS.ptriple = cpjson::get_double(EOS_json, "ptriple"); - EOS.rhoLtriple = cpjson::get_double(EOS_json, "rhoLtriple"); - EOS.rhoVtriple = cpjson::get_double(EOS_json, "rhoVtriple"); + EOS.pseudo_pure = cpjson::get_bool(EOS_json, "pseudo_pure"); EOS.limits.Tmax = cpjson::get_double(EOS_json, "T_max"); EOS.limits.pmax = cpjson::get_double(EOS_json, "p_max"); - rapidjson::Value &reducing_state = EOS_json["reducing_state"]; - + rapidjson::Value &reducing_state = EOS_json["STATES"]["reducing"]; + rapidjson::Value &satminL_state = EOS_json["STATES"]["sat_min_liquid"]; + rapidjson::Value &satminV_state = EOS_json["STATES"]["sat_min_vapor"]; + // Reducing state EOS.reduce.T = cpjson::get_double(reducing_state,"T"); EOS.reduce.rhomolar = cpjson::get_double(reducing_state,"rhomolar"); EOS.reduce.p = cpjson::get_double(reducing_state,"p"); + /// todo: define limits of EOS better + EOS.limits.Tmin = cpjson::get_double(satminL_state, "T"); + EOS.Ttriple = EOS.limits.Tmin; + // BibTex keys EOS.BibTeX_EOS = cpjson::get_string(EOS_json,"BibTeX_EOS"); EOS.BibTeX_CP0 = cpjson::get_string(EOS_json,"BibTeX_CP0"); - + parse_alphar(EOS_json["alphar"], EOS); parse_alpha0(EOS_json["alpha0"], EOS); - + // Validate the equation of state that was just created EOS.validate(); - + } /// Parse the list of possible equations of state void parse_EOS_listing(rapidjson::Value &EOS_array, CoolPropFluid & fluid) { for (rapidjson::Value::ValueIterator itr = EOS_array.Begin(); itr != EOS_array.End(); ++itr) - { + { parse_EOS(*itr,fluid); } @@ -436,7 +439,7 @@ protected: if (!type.compare("modified_Batschinski_Hildebrand")){ // Get a reference to the entry in the fluid instance to simplify the code that follows CoolProp::ViscosityModifiedBatschinskiHildebrandData &BH = fluid.transport.viscosity_higher_order.modified_Batschinski_Hildebrand; - + // Set the flag for the type of this model fluid.transport.viscosity_higher_order.type = CoolProp::ViscosityHigherOrderVariables::VISCOSITY_HIGHER_ORDER_BATSCHINKI_HILDEBRAND; @@ -467,7 +470,7 @@ protected: else if (!type.compare("friction_theory")){ // Get a reference to the entry in the fluid instance to simplify the code that follows CoolProp::ViscosityFrictionTheoryData &F = fluid.transport.viscosity_higher_order.friction_theory; - + // Set the flag for the type of this model fluid.transport.viscosity_higher_order.type = CoolProp::ViscosityHigherOrderVariables::VISCOSITY_HIGHER_ORDER_FRICTION_THEORY; @@ -476,7 +479,7 @@ protected: F.Aa = cpjson::get_long_double_array(higher["Aa"]); F.Aaa = cpjson::get_long_double_array(higher["Aaa"]); F.Ar = cpjson::get_long_double_array(higher["Ar"]); - + F.Na = cpjson::get_integer(higher,"Na"); F.Naa = cpjson::get_integer(higher,"Naa"); @@ -487,7 +490,7 @@ protected: assert(F.Aa.size() == 3); assert(F.Aaa.size() == 3); assert(F.Ar.size() == 3); - + F.T_reduce = cpjson::get_double(higher,"T_reduce"); if (higher.HasMember("Arr") && !higher.HasMember("Adrdr")){ @@ -581,7 +584,7 @@ protected: } } - + // Load dilute viscosity term if (viscosity.HasMember("dilute")){ @@ -596,7 +599,7 @@ protected: parse_higher_order_viscosity(viscosity["higher_order"], fluid); } }; - + /// Parse the transport properties void parse_dilute_conductivity(rapidjson::Value &dilute, CoolPropFluid & fluid) { @@ -639,7 +642,7 @@ protected: // Load up the values data.A = cpjson::get_long_double_array(dilute["A"]); - data.t = cpjson::get_long_double_array(dilute["t"]); + data.t = cpjson::get_long_double_array(dilute["t"]); } else{ throw ValueError(format("type [%s] is not understood for fluid %s",type.c_str(),fluid.name.c_str())); @@ -732,7 +735,7 @@ protected: throw ValueError(format("type [%s] is not understood for fluid %s",type.c_str(),fluid.name.c_str())); } }; - + /// Parse the thermal conductivity data void parse_thermal_conductivity(rapidjson::Value &conductivity, CoolPropFluid & fluid) { @@ -784,7 +787,7 @@ protected: parse_viscosity(transport["viscosity"],fluid); } - // Parse thermal conductivity + // Parse thermal conductivity if (transport.HasMember("conductivity")){ parse_thermal_conductivity(transport["conductivity"],fluid); } @@ -794,7 +797,7 @@ protected: { // Use the method of Chung to approximate the values for epsilon_over_k and sigma_eta // Chung, T.-H.; Ajlan, M.; Lee, L. L.; Starling, K. E. Generalized Multiparameter Correlation for Nonpolar and Polar Fluid Transport Properties. Ind. Eng. Chem. Res. 1988, 27, 671-679. - // rhoc needs to be in mol/L to yield a sigma in nm, + // rhoc needs to be in mol/L to yield a sigma in nm, long double rho_crit_molar = fluid.pEOS->reduce.rhomolar/1000.0;// [mol/m3 to mol/L] long double Tc = fluid.pEOS->reduce.T; fluid.transport.sigma_eta = 0.809/pow(rho_crit_molar, static_cast(1.0/3.0))/1e9; // 1e9 is to convert from nm to m @@ -833,7 +836,7 @@ protected: assert(fluid.name.length() > 0); } public: - + // Default constructor; JSONFluidLibrary(){ _is_empty = true; @@ -844,14 +847,14 @@ public: void add_many(rapidjson::Value &listing) { for (rapidjson::Value::ValueIterator itr = listing.Begin(); itr != listing.End(); ++itr) - { + { add_one(*itr); } }; void add_one(rapidjson::Value &fluid_json) { _is_empty = false; - + // Get the next index for this fluid std::size_t index = fluid_map.size(); @@ -863,73 +866,84 @@ public: // Fluid name fluid.name = fluid_json["NAME"].GetString(); name_vector.push_back(fluid.name); - // CAS number - fluid.CAS = fluid_json["CAS"].GetString(); - // REFPROP alias - fluid.REFPROPname = fluid_json["REFPROP_NAME"].GetString(); - // Critical state - parse_crit_state(fluid_json["CRITICAL"], fluid); - if (get_debug_level() > 5){ - std::cout << format("Loading fluid %s with CAS %s; %d fluids loaded\n", fluid.name.c_str(), fluid.CAS.c_str(), index); - } + try{ + // CAS number + if (!fluid_json.HasMember("CAS")){ throw ValueError(format("fluid [%s] does not have \"CAS\" member",fluid.name.c_str())); } + fluid.CAS = fluid_json["CAS"].GetString(); + // REFPROP alias + if (!fluid_json.HasMember("REFPROP_NAME")){ throw ValueError(format("fluid [%s] does not have \"REFPROP_NAME\" member",fluid.name.c_str())); } + fluid.REFPROPname = fluid_json["REFPROP_NAME"].GetString(); + // Critical state + if (!fluid_json.HasMember("STATES")){ throw ValueError(format("fluid [%s] does not have \"STATES\" member",fluid.name.c_str())); } + if (!fluid_json["STATES"].HasMember("critical")){ throw ValueError(format("fluid[\"STATES\"] [%s] does not have \"critical\" member",fluid.name.c_str())); } + parse_crit_state(fluid_json["STATES"]["critical"], fluid); - // Aliases - fluid.aliases = cpjson::get_string_array(fluid_json["ALIASES"]); - - // EOS - parse_EOS_listing(fluid_json["EOS"], fluid); - - // Validate the fluid - validate(fluid); - - // Ancillaries for saturation - if (!fluid_json.HasMember("ANCILLARIES")){throw ValueError(format("Ancillary curves are missing for fluid [%s]",fluid.name.c_str()));}; - parse_ancillaries(fluid_json["ANCILLARIES"],fluid); - - // Surface tension - if (!(fluid_json["ANCILLARIES"].HasMember("surface_tension"))){ - if (get_debug_level() > 0){ - std::cout << format("Surface tension curves are missing for fluid [%s]\n", fluid.name.c_str()) ; + if (get_debug_level() > 5){ + std::cout << format("Loading fluid %s with CAS %s; %d fluids loaded\n", fluid.name.c_str(), fluid.CAS.c_str(), index); } - } - else{ - parse_surface_tension(fluid_json["ANCILLARIES"]["surface_tension"], fluid); - } - // Parse the environmental parameters - if (!(fluid_json.HasMember("ENVIRONMENTAL"))){ - if (get_debug_level() > 0){ - std::cout << format("Environmental data are missing for fluid [%s]\n", fluid.name.c_str()) ; + // Aliases + fluid.aliases = cpjson::get_string_array(fluid_json["ALIASES"]); + + // EOS + parse_EOS_listing(fluid_json["EOS"], fluid); + + // Validate the fluid + validate(fluid); + + // Ancillaries for saturation + if (!fluid_json.HasMember("ANCILLARIES")){throw ValueError(format("Ancillary curves are missing for fluid [%s]",fluid.name.c_str()));}; + parse_ancillaries(fluid_json["ANCILLARIES"],fluid); + + // Surface tension + if (!(fluid_json["ANCILLARIES"].HasMember("surface_tension"))){ + if (get_debug_level() > 0){ + std::cout << format("Surface tension curves are missing for fluid [%s]\n", fluid.name.c_str()) ; + } + } + else{ + parse_surface_tension(fluid_json["ANCILLARIES"]["surface_tension"], fluid); } - } - else{ - parse_environmental(fluid_json["ENVIRONMENTAL"], fluid); - } - // Parse the environmental parameters - if (!(fluid_json.HasMember("TRANSPORT"))){ - default_transport(fluid); - } - else{ - parse_transport(fluid_json["TRANSPORT"], fluid); - } - - // If the fluid is ok... + // Parse the environmental parameters + if (!(fluid_json.HasMember("ENVIRONMENTAL"))){ + if (get_debug_level() > 0){ + std::cout << format("Environmental data are missing for fluid [%s]\n", fluid.name.c_str()) ; + } + } + else{ + parse_environmental(fluid_json["ENVIRONMENTAL"], fluid); + } - // Add CAS->index mapping - string_to_index_map[fluid.CAS] = index; + // Parse the environmental parameters + if (!(fluid_json.HasMember("TRANSPORT"))){ + default_transport(fluid); + } + else{ + parse_transport(fluid_json["TRANSPORT"], fluid); + } + + // If the fluid is ok... + + // Add CAS->index mapping + string_to_index_map[fluid.CAS] = index; + + // Add name->index mapping + string_to_index_map[fluid.name] = index; + + // Add the aliases + for (std::size_t i = 0; i < fluid.aliases.size(); ++i) + { + string_to_index_map[fluid.aliases[i]] = index; + } + + if (get_debug_level() > 5){ std::cout << format("Loaded.\n"); } - // Add name->index mapping - string_to_index_map[fluid.name] = index; - - // Add the aliases - for (std::size_t i = 0; i < fluid.aliases.size(); ++i) - { - string_to_index_map[fluid.aliases[i]] = index; } - - if (get_debug_level() > 5){ std::cout << format("Loaded.\n"); } + catch (const std::exception &e){ + throw ValueError(format("Unable to load fluid [%s] due to error: %s",fluid.name.c_str(),e.what())); + } }; /// Get a CoolPropFluid instance stored in this library /** @@ -982,4 +996,4 @@ std::string get_fluid_list(void); CoolPropFluid& get_fluid(std::string fluid_string); } /* namespace CoolProp */ -#endif \ No newline at end of file +#endif diff --git a/src/Backends/Helmholtz/HelmholtzEOSMixtureBackend.cpp b/src/Backends/Helmholtz/HelmholtzEOSMixtureBackend.cpp index fb25262c..b2aa77d3 100644 --- a/src/Backends/Helmholtz/HelmholtzEOSMixtureBackend.cpp +++ b/src/Backends/Helmholtz/HelmholtzEOSMixtureBackend.cpp @@ -1174,8 +1174,8 @@ long double HelmholtzEOSMixtureBackend::solver_for_rho_given_T_oneof_HSU(long do // Supercritical temperature if (_T > _crit.T) { - long double rhomelt = components[0]->pEOS->rhoLtriple; - long double rhoc = components[0]->pEOS->reduce.rhomolar; + long double rhomelt = components[0]->triple_liquid.rhomolar; + long double rhoc = components[0]->crit.rhomolar; long double rhomin = 1e-10; switch(other) @@ -1228,7 +1228,7 @@ long double HelmholtzEOSMixtureBackend::solver_for_rho_given_T_oneof_HSU(long do else if (_phase == iphase_liquid) { long double ymelt, yL, y; - long double rhomelt = components[0]->pEOS->rhoLtriple; + long double rhomelt = components[0]->triple_liquid.rhomolar; long double rhoL = static_cast(_rhoLanc); switch(other) diff --git a/src/Backends/Helmholtz/TransportRoutines.cpp b/src/Backends/Helmholtz/TransportRoutines.cpp index ecf30110..828772e3 100644 --- a/src/Backends/Helmholtz/TransportRoutines.cpp +++ b/src/Backends/Helmholtz/TransportRoutines.cpp @@ -11,13 +11,13 @@ long double TransportRoutines::viscosity_dilute_kinetic_theory(HelmholtzEOSMixtu long double Tstar = HEOS.T()/HEOS.components[0]->transport.epsilon_over_k; long double sigma_nm = HEOS.components[0]->transport.sigma_eta*1e9; // 1e9 to convert from m to nm long double molar_mass_kgkmol = HEOS.molar_mass()*1000; // 1000 to convert from kg/mol to kg/kmol - - // The nondimensional empirical collision integral from Neufeld - // Neufeld, P. D.; Janzen, A. R.; Aziz, R. A. Empirical Equations to Calculate 16 of the Transport Collision Integrals (l,s)* + + // The nondimensional empirical collision integral from Neufeld + // Neufeld, P. D.; Janzen, A. R.; Aziz, R. A. Empirical Equations to Calculate 16 of the Transport Collision Integrals (l,s)* // for the Lennard-Jones (12-6) Potential. J. Chem. Phys. 1972, 57, 1100-1102 long double OMEGA22 = 1.16145*pow(Tstar, static_cast(-0.14874))+0.52487*exp(-0.77320*Tstar)+2.16178*exp(-2.43787*Tstar); - // The dilute gas component - + // The dilute gas component - return 26.692e-9*sqrt(molar_mass_kgkmol*HEOS.T())/(pow(sigma_nm, 2)*OMEGA22); // Pa-s } else{ @@ -40,8 +40,8 @@ long double TransportRoutines::viscosity_dilute_collision_integral(HelmholtzEOSM const long double sigma_nm = HEOS.components[0]->transport.sigma_eta*1e9; // 1e9 to convert from m to nm const long double molar_mass_kgkmol = molar_mass*1000; // 1000 to convert from kg/mol to kg/kmol - /// Both the collision integral \f$\mathfrak{S}^*\f$ and effective cross section \f$\Omega^{(2,2)}\f$ have the same form, - /// in general we don't care which is used. The are related through \f$\Omega^{(2,2)} = (5/4)\mathfrak{S}^*\f$ + /// Both the collision integral \f$\mathfrak{S}^*\f$ and effective cross section \f$\Omega^{(2,2)}\f$ have the same form, + /// in general we don't care which is used. The are related through \f$\Omega^{(2,2)} = (5/4)\mathfrak{S}^*\f$ /// see Vesovic(JPCRD, 1990) for CO\f$_2\f$ for further information long double summer = 0, lnTstar = log(Tstar); for (std::size_t i = 0; i < a.size(); ++i) @@ -49,7 +49,7 @@ long double TransportRoutines::viscosity_dilute_collision_integral(HelmholtzEOSM summer += a[i]*pow(lnTstar,t[i]); } S = exp(summer); - + // The dilute gas component return C*sqrt(molar_mass_kgkmol*HEOS.T())/(pow(sigma_nm, 2)*S); // Pa-s } @@ -148,7 +148,7 @@ long double TransportRoutines::viscosity_initial_density_dependence_Rainwater_Fr long double B_eta, B_eta_star; long double Tstar = HEOS.T()/HEOS.components[0]->transport.epsilon_over_k; // [no units] long double sigma = HEOS.components[0]->transport.sigma_eta; // [m] - + long double summer = 0; for (unsigned int i = 0; i < b.size(); ++i){ summer += b[i]*pow(Tstar, t[i]); @@ -225,7 +225,7 @@ long double TransportRoutines::viscosity_water_hardcoded(HelmholtzEOSMixtureBack double x_mu=0.068,qc=1/1.9,qd=1/1.1,nu=0.630,gamma=1.239,zeta_0=0.13,LAMBDA_0=0.06,Tbar_R=1.5, pstar, Tstar, rhostar; double delta,tau,mubar_0,mubar_1,mubar_2,drhodp,drhodp_R,DeltaChibar,zeta,w,L,Y,psi_D,Tbar,rhobar; double drhobar_dpbar,drhobar_dpbar_R,R_Water; - + pstar = 22.064e6; // [Pa] Tstar = 647.096; // [K] rhostar = 322; // [kg/m^3] @@ -246,7 +246,7 @@ long double TransportRoutines::viscosity_water_hardcoded(HelmholtzEOSMixtureBack tau=1/Tbar_R; drhodp_R=1/(R_Water*Tbar_R*Tstar*(1+2*rhobar*HEOS.calc_alphar_deriv_nocache(0,1,HEOS.mole_fractions,tau,delta)+delta*delta*HEOS.calc_alphar_deriv_nocache(0,2,HEOS.mole_fractions,tau, delta))); drhobar_dpbar_R = pstar/rhostar*drhodp_R; - + DeltaChibar=rhobar*(drhobar_dpbar-drhobar_dpbar_R*Tbar_R/Tbar); if (DeltaChibar<0) DeltaChibar=0; @@ -330,7 +330,7 @@ long double TransportRoutines::viscosity_higher_order_friction_theory(HelmholtzE double deltapr = pr - pid; double eta_f = ka*pa + kr*deltapr + ki*pid + kaa*pa*pa + kdrdr*deltapr*deltapr + krr*pr*pr + kii*pid*pid + krrr*pr*pr*pr + kaaa*pa*pa*pa; - + return eta_f; //[Pa-s] } else{ @@ -345,10 +345,10 @@ long double TransportRoutines::viscosity_helium_hardcoded(HelmholtzEOSMixtureBac double eta_0,eta_0_slash, eta_E_slash, B,C,D,ln_eta,x; // // Arp, V.D., McCarty, R.D., and Friend, D.G., - // "Thermophysical Properties of Helium-4 from 0.8 to 1500 K with Pressures to 2000 MPa", + // "Thermophysical Properties of Helium-4 from 0.8 to 1500 K with Pressures to 2000 MPa", // NIST Technical Note 1334 (revised), 1998. - // - // Using Arp NIST report + // + // Using Arp NIST report // Report is not clear on viscosity, referring to REFPROP source code for clarity // Correlation wants density in g/cm^3; kg/m^3 --> g/cm^3, divide by 1000 @@ -391,9 +391,6 @@ long double TransportRoutines::viscosity_R23_hardcoded(HelmholtzEOSMixtureBacken rhocbar = 7.5114, Tc = 299.2793, DELTAeta_max = 3.967, - k = 1.380658e-23, - N_A = 6.022137e23, // 1/mol - pi = 3.141592654, // Ru = 8.31451, molar_mass = 70.014; @@ -418,7 +415,7 @@ long double TransportRoutines::viscosity_R23_hardcoded(HelmholtzEOSMixtureBacken long double TransportRoutines::viscosity_dilute_ethane(HelmholtzEOSMixtureBackend &HEOS) { double C[] = {0, -3.0328138281, 16.918880086, -37.189364917, 41.288861858, -24.615921140, 8.9488430959, -1.8739245042, 0.20966101390, -9.6570437074e-3}; - double OMEGA_2_2 = 0, e_k = 245, sigma = 0.43682, Tstar; + double OMEGA_2_2 = 0, e_k = 245, Tstar; Tstar = HEOS.T()/e_k; for (int i = 1; i<= 9; i++) @@ -572,7 +569,7 @@ long double TransportRoutines::conductivity_critical_hardcoded_R123(HelmholtzEOS long double TransportRoutines::conductivity_critical_hardcoded_CO2_ScalabrinJPCRD2006(HelmholtzEOSMixtureBackend &HEOS){ long double nc = 0.775547504e-3*4.81384, Tr = HEOS.T()/304.1282, alpha, rhor = HEOS.keyed_output(iDmass)/467.6; static long double a[] = {0.0, 3.0, 6.70697, 0.94604, 0.30, 0.30, 0.39751, 0.33791, 0.77963, 0.79857, 0.90, 0.02, 0.20}; - + // Equation 6 from Scalabrin alpha = 1-a[10]*acosh(1+a[11]*pow(pow(1-Tr,2),a[12])); @@ -598,8 +595,8 @@ long double TransportRoutines::conductivity_dilute_hardcoded_CO2(HelmholtzEOSMix //Vesovic Eq. 12 [no units] double r = sqrt(2.0/5.0*cint_k); - // According to REFPROP, 1+r^2 = cp-2.5R. This is unclear to me but seems to suggest that cint/k is the difference - // between the ideal gas specific heat and a monatomic specific heat of 5/2*R. Using the form of cint/k from Vesovic + // According to REFPROP, 1+r^2 = cp-2.5R. This is unclear to me but seems to suggest that cint/k is the difference + // between the ideal gas specific heat and a monatomic specific heat of 5/2*R. Using the form of cint/k from Vesovic // does not yield exactly the correct values Tstar = HEOS.T()/e_k; @@ -670,15 +667,14 @@ long double TransportRoutines::conductivity_hardcoded_water(HelmholtzEOSMixtureB // Finite density contribution lambdabar_1=exp(rhobar*sum); - double nu=0.630,GAMMA =177.8514,gamma=1.239,xi_0=0.13,Lambda_0=0.06,Tr_bar=1.5,tau_ref = Tr_bar*Tstar/HEOS.T(), + double nu=0.630,GAMMA =177.8514,gamma=1.239,xi_0=0.13,Lambda_0=0.06,Tr_bar=1.5, qd_bar=1/0.4,pi=3.141592654, delta = HEOS.delta(), R=461.51805;//J/kg/K tau=1/Tbar; - + double drhodp = 1/(R*HEOS.T()*(1+2*rhobar*HEOS.dalphar_dDelta()+rhobar*rhobar*HEOS.d2alphar_dDelta2())); double drhobar_dpbar = pstar/rhostar*drhodp; double drhodp_Trbar = 1/(R*Tr_bar*Tstar*(1+2*rhobar*HEOS.calc_alphar_deriv_nocache(0,1,HEOS.mole_fractions,1/Tr_bar,delta)+delta*delta*HEOS.calc_alphar_deriv_nocache(0,2,HEOS.mole_fractions,1/Tr_bar,delta))); double drhobar_dpbar_Trbar = pstar/rhostar*drhodp_Trbar; - double cpmol = HEOS.cpmolar(); // [J/mol/K] double cp = HEOS.cpmass(); // [J/kg/K] double cv = HEOS.cvmass(); // [J/kg/K] double cpbar = cp/R; //[-] @@ -731,17 +727,17 @@ long double TransportRoutines::conductivity_hardcoded_R23(HelmholtzEOSMixtureBac long double TransportRoutines::conductivity_critical_hardcoded_ammonia(HelmholtzEOSMixtureBackend &HEOS){ - /* - From "Thermal Conductivity of Ammonia in a Large + /* + From "Thermal Conductivity of Ammonia in a Large Temperature and Pressure Range Including the Critical Region" - by R. Tufeu, D.Y. Ivanov, Y. Garrabos, B. Le Neindre, + by R. Tufeu, D.Y. Ivanov, Y. Garrabos, B. Le Neindre, Bereicht der Bunsengesellschaft Phys. Chem. 88 (1984) 422-427 */ double T = HEOS.T(), Tc = 405.4, rhoc = 235, rho; double LAMBDA=1.2, nu=0.63, gamma =1.24, DELTA=0.50,t,zeta_0_plus=1.34e-10,a_zeta=1,GAMMA_0_plus=0.423e-8; double pi=3.141592654,a_chi,k_B=1.3806504e-23,X_T,DELTA_lambda,dPdT,eta_B,DELTA_lambda_id,DELTA_lambda_i; - + rho = HEOS.keyed_output(CoolProp::iDmass); t = fabs((T-Tc)/Tc); a_chi = a_zeta/0.7; @@ -785,14 +781,14 @@ long double TransportRoutines::conductivity_hardcoded_helium(HelmholtzEOSMixture lambda_e = (c[0]+c[1]*T+c[2]*pow(T,1/3.0)+c[3]*pow(T,2.0/3.0))*rho +(c[4]+c[5]*pow(T,1.0/3.0)+c[6]*pow(T,2.0/3.0))*rho*rho*rho +(c[7]+c[8]*pow(T,1.0/3.0)+c[9]*pow(T,2.0/3.0)+c[10]/T)*rho*rho*log(rho/rhoc); - + // Critical component lambda_c = 0.0; - + if (3.5 < T && T < 12) { - double x0 = 0.392, E1 = 2.8461, E2 = 0.27156, beta = 0.3554, gamma = 1.1743, delta = 4.304, rhoc_crit = 69.158, - Tc = 5.18992, pc = 2.2746e5, R = 4.633e-10, m = 6.6455255e-27, k = 1.38066e-23, pi = M_PI; + double x0 = 0.392, E1 = 2.8461, E2 = 0.27156, beta = 0.3554, gamma = 1.1743, delta = 4.304, rhoc_crit = 69.158, + Tc = 5.18992, pc = 2.2746e5; double DeltaT = fabs(1-T/Tc), DeltaRho = fabs(1-rho/rhoc_crit); double eta = HEOS.viscosity(); // [Pa-s] @@ -810,7 +806,7 @@ long double TransportRoutines::conductivity_hardcoded_helium(HelmholtzEOSMixture double x = pow(DeltaT/DeltaRho,1/beta); double h = E1*(1 + x/x0)*pow(1 + E2*pow(1 + x/x0, 2/beta), (gamma-1)/(2*beta)); - /** + /** dh/dx derived using sympy: E1,x,x0,E2,beta,gamma = symbols('E1,x,x0,E2,beta,gamma') @@ -824,7 +820,7 @@ long double TransportRoutines::conductivity_hardcoded_helium(HelmholtzEOSMixture K_Tbar = W*K_T + (1-W)*K_Tprime; } - // 3.4685233d-17 and 3.726229668d0 are "magical" coefficients that are present in the REFPROP source to yield the right values. Not clear why these values are needed. + // 3.4685233d-17 and 3.726229668d0 are "magical" coefficients that are present in the REFPROP source to yield the right values. Not clear why these values are needed. // Also, the form of the critical term in REFPROP does not agree with Hands paper. EL and MH from NIST are not sure where these coefficients come from. lambda_c = 3.4685233e-17*3.726229668*sqrt(K_Tbar)*pow(T,2)/rho/eta*pow(dpdT,2)*exp(-18.66*pow(DeltaT,2)-4.25*pow(DeltaRho,4)); } @@ -843,7 +839,7 @@ long double TransportRoutines::viscosity_ECS(HelmholtzEOSMixtureBackend &HEOS, H // Get a reference to the ECS data CoolProp::ViscosityECSVariables &ECS = HEOS.components[0]->transport.viscosity_ecs; - + // The correction polynomial psi_eta double psi = 0; for (std::size_t i=0; i < ECS.psi_a.size(); i++){ @@ -897,7 +893,7 @@ long double TransportRoutines::conductivity_ECS(HelmholtzEOSMixtureBackend &HEOS // Get a reference to the ECS data CoolProp::ConductivityECSVariables &ECS = HEOS.components[0]->transport.conductivity_ecs; - + // The correction polynomial psi_eta in rho/rho_red double psi = 0; for (std::size_t i=0; i < ECS.psi_a.size(); ++i){ @@ -954,4 +950,4 @@ long double TransportRoutines::conductivity_ECS(HelmholtzEOSMixtureBackend &HEOS } -}; /* namespace CoolProp */ \ No newline at end of file +}; /* namespace CoolProp */ From 37549787af8ab7cce8f3740708bba2a42c723588 Mon Sep 17 00:00:00 2001 From: Ian Bell Date: Fri, 6 Jun 2014 14:13:08 +0200 Subject: [PATCH 05/26] Fixed loading bugs of new JSON files Signed-off-by: Ian Bell --- include/rapidjson/rapidjson/document.h | 33 ++++++++------- src/Backends/Helmholtz/FlashRoutines.cpp | 8 ++-- src/Backends/Helmholtz/Fluids/FluidLibrary.h | 42 +++++++++++++++++--- 3 files changed, 58 insertions(+), 25 deletions(-) diff --git a/include/rapidjson/rapidjson/document.h b/include/rapidjson/rapidjson/document.h index 83d95a33..3c79f5e8 100644 --- a/include/rapidjson/rapidjson/document.h +++ b/include/rapidjson/rapidjson/document.h @@ -26,11 +26,11 @@ namespace rapidjson { \tparam Allocator Allocator type for allocating memory of object, array and string. */ #pragma pack (push, 4) -template > +template > class GenericValue { public: //! Name-value pair in an object. - struct Member { + struct Member { GenericValue name; //!< name of member (must be a string) GenericValue value; //!< value of member. }; @@ -74,7 +74,7 @@ public: GenericValue(bool b) : flags_(b ? kTrueFlag : kFalseFlag) {} //! Constructor for int value. - GenericValue(int i) : flags_(kNumberIntFlag) { + GenericValue(int i) : flags_(kNumberIntFlag) { data_.n.i64 = i; if (i >= 0) flags_ |= kUintFlag | kUint64Flag; @@ -82,7 +82,7 @@ public: //! Constructor for unsigned value. GenericValue(unsigned u) : flags_(kNumberUintFlag) { - data_.n.u64 = u; + data_.n.u64 = u; if (!(u & 0x80000000)) flags_ |= kIntFlag | kInt64Flag; } @@ -116,7 +116,7 @@ public: GenericValue(double d) : flags_(kNumberDoubleFlag) { data_.n.d = d; } //! Constructor for constant string (i.e. do not make a copy of string) - GenericValue(const Ch* s, SizeType length) { + GenericValue(const Ch* s, SizeType length) { RAPIDJSON_ASSERT(s != NULL); flags_ = kConstStringFlag; data_.s.str = s; @@ -338,11 +338,14 @@ public: //! Check whether the array is empty. bool Empty() const { RAPIDJSON_ASSERT(IsArray()); return data_.a.size == 0; } + //! Check whether the array is empty. + bool ObjectEmpty() const { RAPIDJSON_ASSERT(IsObject()); return data_.o.size == 0; } + //! Remove all elements in the array. /*! This function do not deallocate memory in the array, i.e. the capacity is unchanged. */ void Clear() { - RAPIDJSON_ASSERT(IsArray()); + RAPIDJSON_ASSERT(IsArray()); for (SizeType i = 0; i < data_.a.size; ++i) data_.a.elements[i].~GenericValue(); data_.a.size = 0; @@ -453,21 +456,21 @@ int z = a[0u].GetInt(); // This works too. //! Set this value as a string without copying source string. /*! This version has better performance with supplied length, and also support string containing null character. - \param s source string pointer. + \param s source string pointer. \param length The length of source string, excluding the trailing null terminator. \return The value itself for fluent API. */ GenericValue& SetString(const Ch* s, SizeType length) { this->~GenericValue(); SetStringRaw(s, length); return *this; } //! Set this value as a string without copying source string. - /*! \param s source string pointer. + /*! \param s source string pointer. \return The value itself for fluent API. */ GenericValue& SetString(const Ch* s) { return SetString(s, internal::StrLen(s)); } //! Set this value as a string by copying from source string. /*! This version has better performance with supplied length, and also support string containing null character. - \param s source string. + \param s source string. \param length The length of source string, excluding the trailing null terminator. \param allocator Allocator for allocating copied buffer. Commonly use document.GetAllocator(). \return The value itself for fluent API. @@ -475,7 +478,7 @@ int z = a[0u].GetInt(); // This works too. GenericValue& SetString(const Ch* s, SizeType length, Allocator& allocator) { this->~GenericValue(); SetStringRaw(s, length, allocator); return *this; } //! Set this value as a string by copying from source string. - /*! \param s source string. + /*! \param s source string. \param allocator Allocator for allocating copied buffer. Commonly use document.GetAllocator(). \return The value itself for fluent API. */ @@ -679,7 +682,7 @@ private: typedef GenericValue > Value; /////////////////////////////////////////////////////////////////////////////// -// GenericDocument +// GenericDocument //! A document for parsing JSON text as DOM. /*! @@ -775,22 +778,22 @@ private: void Uint64(uint64_t i) { new (stack_.template Push()) ValueType(i); } void Double(double d) { new (stack_.template Push()) ValueType(d); } - void String(const Ch* str, SizeType length, bool copy) { - if (copy) + void String(const Ch* str, SizeType length, bool copy) { + if (copy) new (stack_.template Push()) ValueType(str, length, GetAllocator()); else new (stack_.template Push()) ValueType(str, length); } void StartObject() { new (stack_.template Push()) ValueType(kObjectType); } - + void EndObject(SizeType memberCount) { typename ValueType::Member* members = stack_.template Pop(memberCount); stack_.template Top()->SetObjectRaw(members, (SizeType)memberCount, GetAllocator()); } void StartArray() { new (stack_.template Push()) ValueType(kArrayType); } - + void EndArray(SizeType elementCount) { ValueType* elements = stack_.template Pop(elementCount); stack_.template Top()->SetArrayRaw(elements, elementCount, GetAllocator()); diff --git a/src/Backends/Helmholtz/FlashRoutines.cpp b/src/Backends/Helmholtz/FlashRoutines.cpp index c651e5d4..486bea07 100644 --- a/src/Backends/Helmholtz/FlashRoutines.cpp +++ b/src/Backends/Helmholtz/FlashRoutines.cpp @@ -249,7 +249,7 @@ void FlashRoutines::PHSU_D_flash(HelmholtzEOSMixtureBackend &HEOS, int other) else if (HEOS._rhomolar < component->triple_vapor.rhomolar) { long double y, value; - long double TVtriple = component->pEOS->Ttriple; //TODO: separate TL and TV for ppure + long double TVtriple = component->triple_vapor.T; //TODO: separate TL and TV for ppure // If value is above the value calculated from X(Ttriple, _rhomolar), it is vapor switch (other) @@ -275,7 +275,7 @@ void FlashRoutines::PHSU_D_flash(HelmholtzEOSMixtureBackend &HEOS, int other) } else { - throw ValueError(format("D < DLtriple")); + throw ValueError(format("D < DLtriple %g %g", value, y)); } } @@ -283,7 +283,7 @@ void FlashRoutines::PHSU_D_flash(HelmholtzEOSMixtureBackend &HEOS, int other) else { long double y, value; - long double TLtriple = component->pEOS->Ttriple; //TODO: separate TL and TV for ppure + long double TLtriple = component->pEOS->Ttriple; // If value is above the value calculated from X(Ttriple, _rhomolar), it is vapor switch (other) @@ -309,7 +309,7 @@ void FlashRoutines::PHSU_D_flash(HelmholtzEOSMixtureBackend &HEOS, int other) } else { - throw ValueError(format("D < DLtriple")); + throw ValueError(format("D < DLtriple %g %g", value, y)); } } } diff --git a/src/Backends/Helmholtz/Fluids/FluidLibrary.h b/src/Backends/Helmholtz/Fluids/FluidLibrary.h index de27e35e..6f5520c8 100644 --- a/src/Backends/Helmholtz/Fluids/FluidLibrary.h +++ b/src/Backends/Helmholtz/Fluids/FluidLibrary.h @@ -805,11 +805,42 @@ protected: } /// Parse the critical state for the given EOS - void parse_crit_state(rapidjson::Value &crit, CoolPropFluid & fluid) + void parse_states(rapidjson::Value &states, CoolPropFluid & fluid) { - fluid.crit.T = cpjson::get_double(crit,"T"); - fluid.crit.p = cpjson::get_double(crit,"p"); - fluid.crit.rhomolar = cpjson::get_double(crit,"rhomolar"); + if (!states.HasMember("critical")){ throw ValueError(format("fluid[\"STATES\"] [%s] does not have \"critical\" member",fluid.name.c_str())); } + rapidjson::Value &crit = states["critical"]; + fluid.crit.T = cpjson::get_double(crit, "T"); + fluid.crit.p = cpjson::get_double(crit, "p"); + fluid.crit.rhomolar = cpjson::get_double(crit, "rhomolar"); + + if (!states.HasMember("triple_liquid")){ throw ValueError(format("fluid[\"STATES\"] [%s] does not have \"triple_liquid\" member",fluid.name.c_str())); } + rapidjson::Value &triple_liquid = states["triple_liquid"]; + if (triple_liquid.ObjectEmpty()){ + // State is empty - probably because the triple point temperature is below the minimum saturation temperature + fluid.triple_liquid.T = -1; + fluid.triple_liquid.p = -1; + fluid.triple_liquid.rhomolar = -1; + } + else{ + fluid.triple_liquid.T = cpjson::get_double(triple_liquid, "T"); + fluid.triple_liquid.p = cpjson::get_double(triple_liquid, "p"); + fluid.triple_liquid.rhomolar = cpjson::get_double(triple_liquid, "rhomolar"); + } + + if (!states.HasMember("triple_vapor")){ throw ValueError(format("fluid[\"STATES\"] [%s] does not have \"triple_vapor\" member",fluid.name.c_str())); } + rapidjson::Value &triple_vapor = states["triple_vapor"]; + if (triple_vapor.ObjectEmpty()){ + // State is empty - probably because the triple point temperature is below the minimum saturation temperature + fluid.triple_vapor.T = -1; + fluid.triple_vapor.p = -1; + fluid.triple_vapor.rhomolar = -1; + } + else{ + fluid.triple_vapor.T = cpjson::get_double(triple_vapor, "T"); + fluid.triple_vapor.p = cpjson::get_double(triple_vapor, "p"); + fluid.triple_vapor.rhomolar = cpjson::get_double(triple_vapor, "rhomolar"); + } + }; /// Parse the critical state for the given EOS @@ -876,8 +907,7 @@ public: fluid.REFPROPname = fluid_json["REFPROP_NAME"].GetString(); // Critical state if (!fluid_json.HasMember("STATES")){ throw ValueError(format("fluid [%s] does not have \"STATES\" member",fluid.name.c_str())); } - if (!fluid_json["STATES"].HasMember("critical")){ throw ValueError(format("fluid[\"STATES\"] [%s] does not have \"critical\" member",fluid.name.c_str())); } - parse_crit_state(fluid_json["STATES"]["critical"], fluid); + parse_states(fluid_json["STATES"], fluid); if (get_debug_level() > 5){ std::cout << format("Loading fluid %s with CAS %s; %d fluids loaded\n", fluid.name.c_str(), fluid.CAS.c_str(), index); From 9ed1fdadb732f8d979d6a71979571efc99e67abc Mon Sep 17 00:00:00 2001 From: Ian Bell Date: Fri, 6 Jun 2014 14:22:39 +0200 Subject: [PATCH 06/26] Updated web files Signed-off-by: Ian Bell --- Web/_static/PVTCP.png | Bin 0 -> 29947 bytes Web/index.rst | 70 ++++++++++++++++++++++++++++++++++++++++++ Web/make_logo.py | 38 +++++++++++++++++++++++ 3 files changed, 108 insertions(+) create mode 100644 Web/_static/PVTCP.png create mode 100644 Web/index.rst create mode 100644 Web/make_logo.py diff --git a/Web/_static/PVTCP.png b/Web/_static/PVTCP.png new file mode 100644 index 0000000000000000000000000000000000000000..a9a8722c36157dfb0b341355f2300e5a2bfb0e79 GIT binary patch literal 29947 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 literal 0 HcmV?d00001 diff --git a/Web/index.rst b/Web/index.rst new file mode 100644 index 00000000..55ac2536 --- /dev/null +++ b/Web/index.rst @@ -0,0 +1,70 @@ + +================= +What is CoolProp? +================= + +CoolProp is a C++ library that implements: + +- Pure and pseudo-pure fluid equations of state and transport properties for 114 components +- Mixture properties using high-accuracy Helmholtz energy formulations (or cubic EOS) +- Correlations of properties of incompressible fluids and brines +- Highest accuracy psychrometric routines + +====================== +Environments Supported +====================== + +Programming Languages: + +- Fully-featured wrappers: :sfdownloads:`Python (2.x, 3.x) ` , :sfdownloads:`Modelica `, :sfdownloads:`Octave `, :sfdownloads:`C# `, :sfdownloads:`MathCAD `, :sfdownloads:`Java ` +- High-level interface only: :sfdownloads:`Labview `, :sfdownloads:`EES `, :sfdownloads:`Microsoft Excel `, :sfdownloads:`Javascript `, :sfdownloads:`MATLAB ` +- Rudimentary wrappers exist for FORTRAN, :sfdownloads:`Maple `, :sfdownloads:`Mathematica `, :sfdownloads:`Scilab `, VB.net + +Architectures: + +- 32-bit/64-bit +- Windows, Linux, OSX, Raspberry PI, VxWorks Compact Rio, etc. + +============================ +High-Level Interface Example +============================ +In most languages, the code to calculate density ``D`` of Nitrogen at a temperature ``T`` of 298 K and a pressure ``P`` of 101325 Pa is something like:: + + rho = PropsSI('D', 'T', 298.15, 'P', 101325, 'Nitrogen') + +See more examples at `examples/examples `_ + +=============== +Main Developers +=============== + +The primary developers are: + +- `Ian Bell `_, `Sylvain Quoilin `_, `Vincent Lemort `_, University of Liege, Liege, Belgium +- `Jorrit Wronski `_, Technical University of Denmark, Kgs. Lyngby, Denmark + +========== +Supporters +========== + +.. image:: _static/labothap.png + :height: 100px + :alt: labothap + :target: http://www.labothap.ulg.ac.be/ + +.. image:: _static/logo_ORCNext.jpg + :height: 100px + :alt: ORCNext + :target: http://www.orcnext.be/ + +\ + +.. image:: _static/herrick.png + :height: 100px + :alt: Herrick + :target: https://engineering.purdue.edu/Herrick/index.html + +.. image:: _static/maplesoft_logo.png + :height: 100px + :alt: Maple + :target: http://maplesoft.com/index.aspx \ No newline at end of file diff --git a/Web/make_logo.py b/Web/make_logo.py new file mode 100644 index 00000000..37f6f165 --- /dev/null +++ b/Web/make_logo.py @@ -0,0 +1,38 @@ +import matplotlib +matplotlib.use('WXAgg') +from matplotlib import cm +import matplotlib.pyplot as plt + +import numpy as np +import CoolProp +from mpl_toolkits.mplot3d import Axes3D +fig = plt.figure(figsize = (2,2)) +ax = fig.add_subplot(111, projection='3d') + +NT = 1000 +NR = 1000 +rho,t = np.logspace(np.log10(2e-3), np.log10(1100), NR),np.linspace(275.15,700,NT) +RHO,T = np.meshgrid(rho,t) + +P = CoolProp.CoolProp.PropsSI('P','D',RHO.reshape((NR*NT,1)),'T',T.reshape((NR*NT,1)),'REFPROP-Water').reshape(NT,NR) + +Tsat = np.linspace(273.17,647.0,100) +psat = CoolProp.CoolProp.PropsSI('P','Q',0,'T',Tsat,'Water') +rhoL = CoolProp.CoolProp.PropsSI('D','Q',0,'T',Tsat,'Water') +rhoV = CoolProp.CoolProp.PropsSI('D','Q',1,'T',Tsat,'Water') + +ax.plot_surface(np.log(RHO),T,np.log(P), cmap=cm.jet, edgecolor = 'none') +ax.plot(np.log(rhoL),Tsat,np.log(psat),color='k',lw=2) +ax.plot(np.log(rhoV),Tsat,np.log(psat),color='k',lw=2) + +ax.text(0.3,800,22, "CoolProp", size = 12) +ax.set_frame_on(False) +ax.set_axis_off() +ax.view_init(22, -136) +ax.set_xlabel(r'$\ln\rho$ ') +ax.set_ylabel('$T$') +ax.set_zlabel('$p$') +plt.tight_layout() +plt.savefig('_static/PVTCP.png',transparent = True) +plt.savefig('_static/PVTCP.pdf',transparent = True) +plt.close() \ No newline at end of file From 69c21800bb4ceaf06f916fe1bb050481fa6e4460 Mon Sep 17 00:00:00 2001 From: Ian Bell Date: Fri, 6 Jun 2014 18:51:39 +0200 Subject: [PATCH 07/26] Fixed derivatives for Lemmon2005 Signed-off-by: Ian Bell --- src/Helmholtz.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Helmholtz.cpp b/src/Helmholtz.cpp index 96014c97..dded59d6 100644 --- a/src/Helmholtz.cpp +++ b/src/Helmholtz.cpp @@ -725,7 +725,7 @@ long double ResidualHelmholtzLemmon2005::dTau(const long double &tau, const long int li = el.l, mi = el.m; if (li != 0 && mi != 0){ long double pow_tau_mi = pow(tau, md); - s[i] = ni*(ti-mi*pow_tau_mi)*exp((ti-1)*log_tau+di*log_delta-pow(delta,li)-pow_tau_mi); + s[i] = ni*(ti-md*pow_tau_mi)*exp((ti-1)*log_tau+di*log_delta-pow(delta,li)-pow_tau_mi); } else if (li != 0 && mi == 0) s[i] = ni*ti*exp((ti-1)*log_tau+di*log_delta-pow(delta,li)); @@ -769,7 +769,7 @@ long double ResidualHelmholtzLemmon2005::dDelta_dTau(const long double &tau, con if (li != 0 && mi != 0){ long double pow_delta_li = pow(delta, li); long double pow_tau_mi = pow(tau, md); - s[i] = ni*(di-li*pow_delta_li)*(ti-mi*pow_tau_mi)*exp((ti-1)*log_tau+(di-1)*log_delta-pow_delta_li-pow_tau_mi); + s[i] = ni*(di-li*pow_delta_li)*(ti-md*pow_tau_mi)*exp((ti-1)*log_tau+(di-1)*log_delta-pow_delta_li-pow_tau_mi); } else if (li != 0 && mi == 0){ long double pow_delta_li = pow(delta, li); @@ -791,7 +791,7 @@ long double ResidualHelmholtzLemmon2005::dTau2(const long double &tau, const lon int li = el.l, mi = el.m; if (li != 0 && mi != 0){ long double pow_tau_mi = pow(tau, md); - long double bracket = (ti-mi*pow_tau_mi)*(ti-1-mi*pow_tau_mi)-mi*mi*pow_tau_mi; + long double bracket = (ti-md*pow_tau_mi)*(ti-1.0-md*pow_tau_mi)-md*md*pow_tau_mi; s[i] = ni*bracket*exp((ti-2)*log_tau+di*log_delta-pow(delta,li)-pow_tau_mi); } else if (li != 0 && mi == 0) @@ -839,7 +839,7 @@ long double ResidualHelmholtzLemmon2005::dDelta2_dTau(const long double &tau, co if (li != 0 && mi != 0){ long double pow_delta_li = pow(delta,li); long double pow_tau_mi = pow(tau,md); - long double bracket = (ti-mi*pow_tau_mi)*(((di-li*pow_delta_li))*(di-1-li*pow_delta_li)-li*li*pow_delta_li); + long double bracket = (ti-md*pow_tau_mi)*(((di-li*pow_delta_li))*(di-1-li*pow_delta_li)-li*li*pow_delta_li); s[i] = ni*bracket*exp((ti-1)*log_tau+(di-2)*log_delta-pow_delta_li-pow_tau_mi); } else if (li != 0 && mi == 0){ @@ -865,7 +865,7 @@ long double ResidualHelmholtzLemmon2005::dDelta_dTau2(const long double &tau, co long double pow_delta_li = pow(delta,li); long double pow_tau_mi = pow(tau,md); // delta derivative of second tau derivative - long double bracket = ((ti-mi*pow_tau_mi)*(ti-1-mi*pow_tau_mi)-mi*mi*pow_tau_mi)*(di-li*pow_delta_li); + long double bracket = ((ti-md*pow_tau_mi)*(ti-1-md*pow_tau_mi)-md*md*pow_tau_mi)*(di-li*pow_delta_li); s[i] = ni*bracket*exp((ti-2)*log_tau+(di-1)*log_delta-pow_delta_li-pow_tau_mi); } else if (li != 0 && mi == 0){ @@ -912,13 +912,13 @@ long double ResidualHelmholtzLemmon2005::dTau3(const long double &tau, const lon for (std::size_t i=0; i Date: Fri, 6 Jun 2014 18:54:35 +0200 Subject: [PATCH 08/26] docs for dTau3 derivation from Lemmon2005 Signed-off-by: Ian Bell --- src/Helmholtz.cpp | 33 ++++++++------------------------- 1 file changed, 8 insertions(+), 25 deletions(-) diff --git a/src/Helmholtz.cpp b/src/Helmholtz.cpp index dded59d6..3faef07c 100644 --- a/src/Helmholtz.cpp +++ b/src/Helmholtz.cpp @@ -879,31 +879,14 @@ long double ResidualHelmholtzLemmon2005::dDelta_dTau2(const long double &tau, co } /** -\f[ -\frac{{{\partial ^2}{\alpha ^r}}}{{\partial {\tau ^2}}} = {N_k}{\delta ^{{d_k}}}{\tau ^{{t_k} - 2}}\exp \left( { - {\delta ^{{l_k}}}} \right)\exp \left( { - {\tau ^{{m_k}}}} \right)\left[ {\left( {{t_k} - {m_k}{\tau ^{{m_k}}}} \right)\left( {{t_k} - 1 - {m_k}{\tau ^{{m_k}}}} \right) - m_k^2{\tau ^{{m_k}}}} \right]\\ -\f] -\f[ -\frac{{{\partial ^2}{\alpha ^r}}}{{\partial {\tau ^2}}} = {N_k}{\delta ^{{d_k}}}\exp \left( { - {\delta ^{{l_k}}}} \right){\tau ^{{t_k} - 2}}\exp \left( { - {\tau ^{{m_k}}}} \right)\left[ {\left( {{t_k} - {m_k}{\tau ^{{m_k}}}} \right)\left( {{t_k} - 1 - {m_k}{\tau ^{{m_k}}}} \right) - m_k^2{\tau ^{{m_k}}}} \right]\\ -\f] -Group all the terms that don't depend on \f$ \tau \f$ -\f[ -\frac{{{\partial ^2}{\alpha ^r}}}{{\partial {\tau ^2}}} = A{\tau ^{{t_k} - 2}}\exp \left( { - {\tau ^{{m_k}}}} \right)\left[ {\left( {{t_k} - {m_k}{\tau ^{{m_k}}}} \right)\left( {{t_k} - 1 - {m_k}{\tau ^{{m_k}}}} \right) - m_k^2{\tau ^{{m_k}}}} \right]\\ -\f] -\f[ -\frac{1}{A}\frac{{{\partial ^3}{\alpha ^r}}}{{\partial {\tau ^3}}} = {\tau ^{{t_k} - 2}}\exp \left( { - {\tau ^{{m_k}}}} \right)\frac{\partial }{{\partial \tau }}\left[ {\left( {{t_k} - {m_k}{\tau ^{{m_k}}}} \right)\left( {{t_k} - 1 - {m_k}{\tau ^{{m_k}}}} \right) - m_k^2{\tau ^{{m_k}}}} \right] + \frac{\partial }{{\partial \tau }}\left[ {{\tau ^{{t_k} - 2}}\exp \left( { - {\tau ^{{m_k}}}} \right)} \right]\left[ {\left( {{t_k} - {m_k}{\tau ^{{m_k}}}} \right)\left( {{t_k} - 1 - {m_k}{\tau ^{{m_k}}}} \right) - m_k^2{\tau ^{{m_k}}}} \right]\\ -\f] -\f[ -\frac{\partial }{{\partial \tau }}\left[ {{\tau ^{{t_k} - 2}}\exp \left( { - {\tau ^{{m_k}}}} \right)} \right] = ({t_k} - 2){\tau ^{{t_k} - 3}}\exp \left( { - {\tau ^{{m_k}}}} \right) + {\tau ^{{t_k} - 2}}\exp \left( { - {\tau ^{{m_k}}}} \right)( - {m_k}{\tau ^{{m_k} - 1}}) = \exp \left( { - {\tau ^{{m_k}}}} \right)\left( {({t_k} - 2){\tau ^{{t_k} - 3}} - {\tau ^{{t_k} - 2}}{m_k}{\tau ^{{m_k} - 1}}} \right)\\ -\f] -\f[ -\frac{\partial }{{\partial \tau }}\left[ {\left( {{t_k} - {m_k}{\tau ^{{m_k}}}} \right)\left( {{t_k} - 1 - {m_k}{\tau ^{{m_k}}}} \right) - m_k^2{\tau ^{{m_k}}}} \right] = \left( {{t_k} - {m_k}{\tau ^{{m_k}}}} \right)\left( { - m_k^2{\tau ^{{m_k} - 1}}} \right) + \left( { - m_k^2{\tau ^{{m_k} - 1}}} \right)\left( {{t_k} - 1 - {m_k}{\tau ^{{m_k}}}} \right) - m_k^3{\tau ^{{m_k} - 1}} = - m_k^2{\tau ^{{m_k} - 1}}\left[ {{t_k} - {m_k}{\tau ^{{m_k}}} + {t_k} - 1 - {m_k}{\tau ^{{m_k}}} + {m_k}} \right] = - m_k^2{\tau ^{{m_k} - 1}}\left[ {2{t_k} - 2{m_k}{\tau ^{{m_k}}} - 1 + {m_k}} \right]\\ -\f] -\f[ -\frac{1}{A}\frac{{{\partial ^3}{\alpha ^r}}}{{\partial {\tau ^3}}} = {\tau ^{{t_k} - 2}}\exp \left( { - {\tau ^{{m_k}}}} \right)\left( { - m_k^2{\tau ^{{m_k} - 1}}\left[ {2{t_k} - 2{m_k}{\tau ^{{m_k}}} - 1 + {m_k}} \right]} \right) + \exp \left( { - {\tau ^{{m_k}}}} \right)\left( {({t_k} - 2){\tau ^{{t_k} - 3}} - {\tau ^{{t_k} - 2}}{m_k}{\tau ^{{m_k} - 1}}} \right)\left[ {\left( {{t_k} - {m_k}{\tau ^{{m_k}}}} \right)\left( {{t_k} - 1 - {m_k}{\tau ^{{m_k}}}} \right) - m_k^2{\tau ^{{m_k}}}} \right]\\ -\f] -\f[ -\frac{1}{A}\frac{{{\partial ^3}{\alpha ^r}}}{{\partial {\tau ^3}}} = \exp \left( { - {\tau ^{{m_k}}}} \right)\left[ { - {\tau ^{{t_k} - 2}}m_k^2{\tau ^{{m_k} - 1}}\left[ {2{t_k} - 2{m_k}{\tau ^{{m_k}}} - 1 + {m_k}} \right] + \left( {({t_k} - 2){\tau ^{{t_k} - 3}} - {\tau ^{{t_k} - 2}}{m_k}{\tau ^{{m_k} - 1}}} \right)\left[ {\left( {{t_k} - {m_k}{\tau ^{{m_k}}}} \right)\left( {{t_k} - 1 - {m_k}{\tau ^{{m_k}}}} \right) - m_k^2{\tau ^{{m_k}}}} \right]} \right] -\f] +Derived using sympy: + + from sympy import * + init_printing() + n_i, d_i, t_i, m_i, l_i, tau, delta, eta, gamma, beta, epsilon = symbols('n_i, d_i, t_i, m_i, l_i, tau, delta, eta, gamma, beta, epsilon') + I = n_i*delta**d_i*tau**t_i*exp(-delta**l_i)*exp(-tau**m_i) + ccode(simplify(diff(I,tau,3))) + */ long double ResidualHelmholtzLemmon2005::dTau3(const long double &tau, const long double &delta) throw() { From 514e406eea0dd37adf7dd9c4334cfba45680c7a4 Mon Sep 17 00:00:00 2001 From: Ian Bell Date: Fri, 6 Jun 2014 19:05:13 +0200 Subject: [PATCH 09/26] Fixed dDelta3 for Gaussian Helmholtz term (70 tests fail) Signed-off-by: Ian Bell --- src/Helmholtz.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Helmholtz.cpp b/src/Helmholtz.cpp index 3faef07c..a7051394 100644 --- a/src/Helmholtz.cpp +++ b/src/Helmholtz.cpp @@ -468,8 +468,8 @@ long double ResidualHelmholtzGaussian::dDelta3(const long double &tau, const lon for (std::size_t i=0; i Date: Fri, 6 Jun 2014 21:19:42 +0200 Subject: [PATCH 10/26] Decreased step size in numerical derivative for Helmholtz tester Signed-off-by: Ian Bell --- src/Helmholtz.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Helmholtz.cpp b/src/Helmholtz.cpp index a7051394..3c481e78 100644 --- a/src/Helmholtz.cpp +++ b/src/Helmholtz.cpp @@ -1949,7 +1949,7 @@ TEST_CASE_METHOD(HelmholtzConsistencyFixture, "Helmholtz energy derivatives", "[ term = get(terms[i]); for (std::size_t j = 0; j < sizeof(derivs)/sizeof(derivs[0]); ++j) { - call(derivs[j], term, 1.3, 0.7, 1e-8); + call(derivs[j], term, 1.3, 0.7, 1e-7); CAPTURE(derivs[j]); CAPTURE(numerical); CAPTURE(analytic); From 9093f636b1428c2ee61ae1e4f177ec57209d884f Mon Sep 17 00:00:00 2001 From: Ian Bell Date: Fri, 6 Jun 2014 21:21:12 +0200 Subject: [PATCH 11/26] speed of sound added back to high level wrapper Signed-off-by: Ian Bell --- src/AbstractState.cpp | 8 +++++--- src/DataStructures.cpp | 7 ++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/AbstractState.cpp b/src/AbstractState.cpp index 1ad2cbf4..d00d64d2 100644 --- a/src/AbstractState.cpp +++ b/src/AbstractState.cpp @@ -19,7 +19,7 @@ AbstractState * AbstractState::factory(const std::string &backend, const std::st static std::string HEOS_string = "HEOS"; if (!backend.compare("HEOS")) { - if (fluid_string.find('&') == -1){ + if (fluid_string.find('&') == std::string::npos){ return new HelmholtzEOSBackend(&get_fluid(fluid_string)); } else{ @@ -31,7 +31,7 @@ AbstractState * AbstractState::factory(const std::string &backend, const std::st } else if (!backend.compare("REFPROP")) { - if (fluid_string.find('&') == -1){ + if (fluid_string.find('&') == std::string::npos){ return new REFPROPBackend(fluid_string); } else{ @@ -57,7 +57,7 @@ AbstractState * AbstractState::factory(const std::string &backend, const std::st { std::size_t idel = fluid_string.find("::"); // Backend has not been specified, and we have to figure out what the backend is by parsing the string - if (idel == -1) // No '::' found, no backend specified, try HEOS, otherwise a failure + if (idel == std::string::npos) // No '::' found, no backend specified, try HEOS, otherwise a failure { // Figure out what backend to use return factory(HEOS_string, fluid_string); @@ -196,6 +196,8 @@ double AbstractState::keyed_output(int key) return get_reducing().T; case irhomolar_reducing: return get_reducing().rhomolar; + case ispeed_sound: + return speed_sound(); //case iT_critical: // return get_critical().T; //case irhomolar_critical: diff --git a/src/DataStructures.cpp b/src/DataStructures.cpp index 15b7364d..ebac1958 100644 --- a/src/DataStructures.cpp +++ b/src/DataStructures.cpp @@ -50,7 +50,8 @@ parameter_info parameter_info_list[] = { parameter_info(irhomolar_critical, "rhomolar_critical","O","mol/m^3","Molar density at critical point"), parameter_info(iT_reducing, "T_reducing","O","K","Temperature at the reducing point"), parameter_info(iT_critical, "T_critical","O","K","Temperature at the critical point"), - parameter_info(iisothermal_compressibility, "isothermal_compressibility","O","1/Pa","Isothermal compressibility") + parameter_info(iisothermal_compressibility, "isothermal_compressibility","O","1/Pa","Isothermal compressibility"), + parameter_info(ispeed_sound, "speed_of_sound","O","m/s","Speed of sound") }; class ParameterInformation @@ -157,7 +158,7 @@ input_pair_info input_pair_list[] = { input_pair_info(SmolarT_INPUTS, "SmolarT_INPUTS", "Entropy in J/mol/K, Temperature in K"), input_pair_info(TUmass_INPUTS, "TUmass_INPUTS", "Temperature in K, Internal energy in J/kg"), input_pair_info(TUmolar_INPUTS, "TUmolar_INPUTS", "Temperature in K, Internal energy in J/mol"), - + input_pair_info(DmassP_INPUTS, "DmassP_INPUTS", "Mass density in kg/m^3, Pressure in Pa"), input_pair_info(DmolarP_INPUTS, "DmolarP_INPUTS", "Molar density in mol/m^3, Pressure in Pa"), input_pair_info(HmassP_INPUTS, "HmassP_INPUTS", "Enthalpy in J/kg, Pressure in Pa"), @@ -206,4 +207,4 @@ std::string get_input_pair_long_desc(int pair) return input_pair_information.long_desc_map[pair]; } -} /* namespace CoolProp */ \ No newline at end of file +} /* namespace CoolProp */ From b9582a45e1766bf0c5009d592cbad2002ecc0728 Mon Sep 17 00:00:00 2001 From: Ian Bell Date: Fri, 6 Jun 2014 21:22:48 +0200 Subject: [PATCH 12/26] Added structure of incompressible library and backend - the core is there, implementation is empty. Signed-off-by: Ian Bell --- .gitignore | 4 + .../Incompressible/IncompressibleBackend.cpp | 10 +- .../Incompressible/IncompressibleBackend.h | 12 +- .../Incompressible/IncompressibleLibrary.cpp | 35 +++ .../Incompressible/IncompressibleLibrary.h | 203 ++++++++++++++++++ 5 files changed, 253 insertions(+), 11 deletions(-) create mode 100644 src/Backends/Incompressible/IncompressibleLibrary.cpp create mode 100644 src/Backends/Incompressible/IncompressibleLibrary.h diff --git a/.gitignore b/.gitignore index eb139051..181667e4 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,7 @@ /build/ /dev/hashes.json /include/cpversion.h +/dev/all_incompressibles.json +/dev/all_incompressibles_verbose.json +/include/IncompressibleFluid.h +/include/all_incompressibles_JSON.h diff --git a/src/Backends/Incompressible/IncompressibleBackend.cpp b/src/Backends/Incompressible/IncompressibleBackend.cpp index 5f46abea..fee4d67d 100644 --- a/src/Backends/Incompressible/IncompressibleBackend.cpp +++ b/src/Backends/Incompressible/IncompressibleBackend.cpp @@ -11,23 +11,21 @@ //#include "CoolProp.h" #include "IncompressibleBackend.h" -#include "../Helmholtz/Fluids/FluidLibrary.h" +#include "IncompressibleFluid.h" +#include "IncompressibleLibrary.h" #include "Solvers.h" #include "MatrixMath.h" namespace CoolProp { IncompressibleBackend::IncompressibleBackend(const std::string &fluid_name) { - throw CoolProp::NotImplementedError("Mixture-style constructor is not implemented yet for incompressible fluids"); + fluid = &get_incompressible_fluid(fluid_name); } IncompressibleBackend::IncompressibleBackend(const std::vector &component_names) { - throw CoolProp::NotImplementedError("Mixture-style constructor is not implemented yet for incompressible fluids"); + throw NotImplementedError("Mixture-style constructor is not implemented yet for incompressible fluids"); } -bool IncompressibleBackend::using_mole_fractions(){return false;} - - void IncompressibleBackend::update(long input_pair, double value1, double value2) { switch (input_pair) { case PT_INPUTS: { diff --git a/src/Backends/Incompressible/IncompressibleBackend.h b/src/Backends/Incompressible/IncompressibleBackend.h index c4f788fa..f0db90f8 100644 --- a/src/Backends/Incompressible/IncompressibleBackend.h +++ b/src/Backends/Incompressible/IncompressibleBackend.h @@ -2,6 +2,7 @@ #ifndef INCOMPRESSIBLEBACKEND_H_ #define INCOMPRESSIBLEBACKEND_H_ +#include "IncompressibleFluid.h" #include "AbstractState.h" #include "Exceptions.h" @@ -15,6 +16,7 @@ protected: bool _mole_fractions_set; static bool _REFPROP_supported; std::vector mass_fractions; + IncompressibleFluid *fluid; public: IncompressibleBackend(){}; virtual ~IncompressibleBackend(){}; @@ -27,10 +29,10 @@ public: IncompressibleBackend(const std::vector &component_names); // Incompressible backend uses mole fractions - bool using_mole_fractions(); + bool using_mole_fractions(){return false;}; /// Updating function for incompressible fluid - /** + /** In this function we take a pair of thermodynamic states, those defined in the input_pairs enumeration and update all the internal variables that we can. @@ -41,13 +43,13 @@ public: void update(long input_pair, double value1, double value2); /// Set the mole fractions - /** + /** @param mole_fractions The vector of mole fractions of the components */ void set_mole_fractions(const std::vector &mole_fractions); - + /// Set the mass fractions - /** + /** @param mass_fractions The vector of mass fractions of the components */ void set_mass_fractions(const std::vector &mass_fractions); diff --git a/src/Backends/Incompressible/IncompressibleLibrary.cpp b/src/Backends/Incompressible/IncompressibleLibrary.cpp new file mode 100644 index 00000000..70343e37 --- /dev/null +++ b/src/Backends/Incompressible/IncompressibleLibrary.cpp @@ -0,0 +1,35 @@ +#include "IncompressibleLibrary.h" +#include "all_incompressibles_JSON.h" // Makes a std::string variable called all_fluids_JSON + +namespace CoolProp{ + +static JSONIncompressibleLibrary library; + +void load_incompressible_library() +{ + rapidjson::Document dd; + // This json formatted string comes from the all_fluids_JSON.h header which is a C++-escaped version of the JSON file + dd.Parse<0>(all_incompressibles_JSON.c_str()); + if (dd.HasParseError()){ + throw ValueError("Unable to load all_fluids.json"); + } else{ + try{library.add_many(dd);}catch(std::exception &e){std::cout << e.what() << std::endl;} + } +} + +JSONIncompressibleLibrary & get_incompressible_library(void){ + if (library.is_empty()){ load_incompressible_library(); } + return library; +} + +IncompressibleFluid& get_incompressible_fluid(std::string fluid_string){ + if (library.is_empty()){ load_incompressible_library(); } + return library.get(fluid_string); +} + +std::string get_incompressible_list(void){ + if (library.is_empty()){ load_incompressible_library(); } + return library.get_fluid_list(); +}; + +} /* namespace CoolProp */ diff --git a/src/Backends/Incompressible/IncompressibleLibrary.h b/src/Backends/Incompressible/IncompressibleLibrary.h new file mode 100644 index 00000000..fe3fa41f --- /dev/null +++ b/src/Backends/Incompressible/IncompressibleLibrary.h @@ -0,0 +1,203 @@ + +#ifndef INCOMPRESSIBLELIBRARY_H +#define INCOMPRESSIBLELIBRARY_H + +#include "IncompressibleFluid.h" + +#include "rapidjson/rapidjson_include.h" + +#include +#include + +namespace CoolProp{ + +// Forward declaration of the necessary debug function to avoid including the whole header +extern int get_debug_level(); + +/// A container for the fluid parameters for the incompressible fluids +/** +This container holds copies of all of the fluid instances for the fluids that are loaded in incompressible. +New fluids can be added by passing in a rapidjson::Value instance to the add_one function, or +a rapidjson array of fluids to the add_many function. +*/ +class JSONIncompressibleLibrary +{ + /// Map from CAS code to JSON instance. For pseudo-pure fluids, use name in place of CAS code since no CASE number is defined for mixtures + std::map fluid_map; + std::vector name_vector; + std::map string_to_index_map; + bool _is_empty; +protected: + + /// Parse the viscosity + void parse_viscosity(rapidjson::Value &viscosity, IncompressibleFluid & fluid) + { + if (viscosity.HasMember("type")){ + std::string type = cpjson::get_string(viscosity, "type"); + if (!type.compare("polynomial")){ + fluid.viscosity.type = CoolProp::IncompressibleViscosityVariables::INCOMPRESSIBLE_VISCOSITY_POLYNOMIAL; + fluid.viscosity.poly.coeffs = cpjson::get_double_array(viscosity["coeffs"]); + return; + } + else{ + throw ValueError(format("viscosity type [%s] is not understood for fluid %s", type.c_str(), fluid.name.c_str())); + } + } + else{ + throw ValueError(format("viscosity does not have \"type\" for fluid %s", fluid.name.c_str())); + } + }; + + /// Parse the conductivity + void parse_conductivity(rapidjson::Value &conductivity, IncompressibleFluid & fluid) + { + if (conductivity.HasMember("type")){ + std::string type = cpjson::get_string(conductivity, "type"); + if (!type.compare("polynomial")){ + fluid.conductivity.type = CoolProp::IncompressibleConductivityVariables::INCOMPRESSIBLE_CONDUCTIVITY_POLYNOMIAL; + fluid.conductivity.poly.coeffs = cpjson::get_double_array(conductivity["coeffs"]); + return; + } + else{ + throw ValueError(format("conductivity type [%s] is not understood for fluid %s", type.c_str(), fluid.name.c_str())); + } + } + else{ + throw ValueError(format("conductivity does not have \"type\" for fluid %s", fluid.name.c_str())); + } + }; + + /// Parse the specific_heat + void parse_specific_heat(rapidjson::Value &specific_heat, IncompressibleFluid & fluid) + { + if (specific_heat.HasMember("type")){ + std::string type = cpjson::get_string(specific_heat, "type"); + if (!type.compare("polynomial")){ + fluid.specific_heat.type = CoolProp::IncompressibleSpecificHeatVariables::INCOMPRESSIBLE_SPECIFIC_HEAT_POLYNOMIAL; return; + fluid.specific_heat.poly.coeffs = cpjson::get_double_array(specific_heat["coeffs"]); + } + else{ + throw ValueError(format("specific_heat type [%s] is not understood for fluid %s", type.c_str(), fluid.name.c_str())); + } + } + else{ + throw ValueError(format("specific_heat does not have \"type\" for fluid %s", fluid.name.c_str())); + } + }; + + /// Parse the density + void parse_density(rapidjson::Value &density, IncompressibleFluid & fluid) + { + if (density.HasMember("type")){ + std::string type = cpjson::get_string(density, "type"); + if (!type.compare("polynomial")){ + fluid.density.type = CoolProp::IncompressibleDensityVariables::INCOMPRESSIBLE_DENSITY_POLYNOMIAL; return; + fluid.density.poly.coeffs = cpjson::get_double_array(density["coeffs"]); + } + else{ + throw ValueError(format("density type [%s] is not understood for fluid %s", type.c_str(), fluid.name.c_str())); + } + } + else{ + throw ValueError(format("density does not have \"type\" for fluid %s", fluid.name.c_str())); + } + }; + + /// Validate the fluid file that was just constructed + void validate(IncompressibleFluid & fluid) + { + } +public: + + // Default constructor; + JSONIncompressibleLibrary(){ + _is_empty = true; + }; + bool is_empty(void){ return _is_empty;}; + + /// Add all the fluid entries in the rapidjson::Value instance passed in + void add_many(rapidjson::Value &listing) + { + for (rapidjson::Value::ValueIterator itr = listing.Begin(); itr != listing.End(); ++itr) + { + add_one(*itr); + } + }; + void add_one(rapidjson::Value &fluid_json) + { + _is_empty = false; + + // Get the next index for this fluid + std::size_t index = fluid_map.size(); + + // Add index->fluid mapping + fluid_map[index] = IncompressibleFluid(); + + // Create an instance of the fluid + IncompressibleFluid &fluid = fluid_map[index]; + + fluid.name = cpjson::get_string(fluid_json, "name"); + fluid.Tmin = cpjson::get_double(fluid_json, "Tmin"); + fluid.Tmax = cpjson::get_double(fluid_json, "Tmax"); + + parse_conductivity(fluid_json["conductivity"], fluid); + parse_density(fluid_json["density"], fluid); + parse_viscosity(fluid_json["viscosity"], fluid); + parse_specific_heat(fluid_json["specific_heat"], fluid); + + // Add name->index mapping + string_to_index_map[fluid.name] = index; + + }; + /// Get an IncompressibleFluid instance stored in this library + /** + @param name Name of the fluid + */ + IncompressibleFluid& get(std::string key) + { + std::map::iterator it; + // Try to find it + it = string_to_index_map.find(key); + // If it is found + if (it != string_to_index_map.end()){ + return get(it->second); + } + else{ + throw ValueError(format("key [%s] was not found in string_to_index_map in JSONIncompressibleLibrary",key.c_str())); + } + }; + /// Get a CoolPropFluid instance stored in this library + /** + @param key The index of the fluid in the map + */ + IncompressibleFluid& get(std::size_t key) + { + std::map::iterator it; + // Try to find it + it = fluid_map.find(key); + // If it is found + if (it != fluid_map.end()){ + return it->second; + } + else{ + throw ValueError(format("key [%d] was not found in JSONIncompressibleLibrary",key)); + } + }; + /// Return a comma-separated list of fluid names + std::string get_fluid_list(void) + { + return strjoin(name_vector, ","); + }; +}; + +/// Get a reference to the library instance +JSONIncompressibleLibrary & get_incompressible_library(void); + +/// Get a comma-separated-list of incompressible fluids that are included +std::string get_incompressible_list(void); + +/// Get the fluid structure returned as a reference +IncompressibleFluid& get_incompressible_fluid(std::string fluid_string); + +} /* namespace CoolProp */ +#endif From e45bee6267c139ae93dd533bcdf0e4b34cee2e8d Mon Sep 17 00:00:00 2001 From: Ian Bell Date: Fri, 6 Jun 2014 21:38:15 +0200 Subject: [PATCH 13/26] Updated code::blocks project Signed-off-by: Ian Bell --- dev/code_blocks/coolprop.cbp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dev/code_blocks/coolprop.cbp b/dev/code_blocks/coolprop.cbp index ea6adcfa..6745d220 100644 --- a/dev/code_blocks/coolprop.cbp +++ b/dev/code_blocks/coolprop.cbp @@ -10,7 +10,7 @@ - -

Help?

- - File github issue -
-Google group - -

Open-source projects using CoolProp

- ThermoCycle -
- PDSim -
- ACHP diff --git a/Web/_templates/layout.html b/Web/_templates/layout.html index 716b4910..55f90ef0 100644 --- a/Web/_templates/layout.html +++ b/Web/_templates/layout.html @@ -11,17 +11,3 @@
  • Documentation »
    • {% endblock %} - -{% block relbar1 %} - - -
    -matplotlib -
    -{{ super() }} -{% endblock %} - -{# put the sidebar before the body #} -{% block sidebar1 %}{{ sidebar() }}{% endblock %} -{% block sidebar2 %}{% endblock %} - diff --git a/Web/conf.py b/Web/conf.py index 0dc597a6..22945c7e 100644 --- a/Web/conf.py +++ b/Web/conf.py @@ -33,17 +33,29 @@ extensions = [#'matplotlib.sphinxext.only_directives', 'sphinx.ext.intersphinx', 'sphinx.ext.autodoc', 'sphinx.ext.mathjax', + 'sphinx.ext.extlinks', 'ipython_console_highlighting', 'sphinxcontrib.napoleon', - 'sphinxcontrib.doxylink' + 'sphinxcontrib.doxylink', + + # cloud's extensions + #'cloud_sptheme.ext.autodoc_sections', + #'cloud_sptheme.ext.index_styling', + 'cloud_sptheme.ext.relbar_toc', + #'cloud_sptheme.ext.escaped_samp_literals', + #'cloud_sptheme.ext.issue_tracker', + #'cloud_sptheme.ext.table_styling', + #'inheritance_diagram', #'numpydoc', #'breathe' ] + + plot_formats = [('png',80)] - +index_doc = "index" numpydoc_show_class_members = False @@ -74,6 +86,9 @@ version = ver.rsplit('.',1)[0] # The full version, including alpha/beta/rc tags. release = ver +extlinks = {'sfdownloads': ('http://sourceforge.net/projects/coolprop/files/CoolProp/'+release+'/%s', + 'issue ')} + # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. #language = None @@ -120,6 +135,26 @@ autoclass_content = 'both' # -- Options for HTML output --------------------------------------------------- +# import Cloud +import cloud_sptheme as csp + +# ... some contents omitted ... + +# set the html theme +html_theme = "cloud" + # NOTE: there is also a red-colored version named "redcloud" + +# ... some contents omitted ... + +# set the theme path to point to cloud's theme data +html_theme_path = [csp.get_theme_dir()] + +# [optional] set some of the options listed above... +html_theme_options = { "roottarget": "index", + "max_width" : "13in", + "logotarget": "index" + } + # The theme to use for HTML and HTML Help pages. Major themes that come with # Sphinx are currently 'default' and 'sphinxdoc'. ## html_theme = 'sphinxdoc' @@ -129,7 +164,7 @@ autoclass_content = 'both' # The style sheet to use for HTML and HTML Help pages. A file of that name # must exist either in Sphinx' static/ path, or in one of the custom paths # given in html_static_path. -html_style = 'Coolprop.css' +#html_style = 'Coolprop.css' # Theme options are theme-specific and customize the look and feel of a theme # further. For a list of options available for each theme, see the @@ -148,7 +183,7 @@ html_style = 'Coolprop.css' # The name of an image file (relative to this directory) to place at the top # of the sidebar. -#html_logo = None +html_logo = "_static/PVTCP.png" # The name of an image file (within the static path) to use as favicon of the # docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 @@ -169,15 +204,15 @@ html_static_path = ['_static'] #html_use_smartypants = True # Content template for the index page. -html_index = 'index.html' +#html_index = 'index.html' # Custom sidebar templates, maps page names to templates. -html_sidebars = {'index': 'indexsidebar.html', - } +# html_sidebars = {'index': 'indexsidebar.html', +# } # Additional templates that should be rendered to pages, maps page names to # template names. -html_additional_pages = {'index': 'index.html'} +# html_additional_pages = {'index': 'index.html'} # If false, no module index is generated. #html_use_modindex = True diff --git a/Web/index.rst b/Web/index.rst index 55ac2536..6eef6447 100644 --- a/Web/index.rst +++ b/Web/index.rst @@ -34,6 +34,23 @@ In most languages, the code to calculate density ``D`` of Nitrogen at a temperat See more examples at `examples/examples `_ +=================================== +Open-Source Projects Using CoolProp +=================================== + +- `Thermocycle `_ +- `PDSim `_ +- `ACHP `_ +- `DWSim `_ + +==== +Help +==== + +- File a `Github issue `_ +- Email the `Google group `_ + + =============== Main Developers =============== From a98041e5062b0ae18862ea3806f4608fc834aeb3 Mon Sep 17 00:00:00 2001 From: Ian Bell Date: Sun, 8 Jun 2014 20:37:16 +0200 Subject: [PATCH 15/26] Added README.rst for buildbot instructions --- dev/ci/README.rst | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 dev/ci/README.rst diff --git a/dev/ci/README.rst b/dev/ci/README.rst new file mode 100644 index 00000000..6d7fb7e5 --- /dev/null +++ b/dev/ci/README.rst @@ -0,0 +1,41 @@ +Set up linux slave +================== + +In some folder (probably the home folder), do + + sudo apt-get buildbot buildbot-slave + buildslave create-slave slave 10.0.2.2:9989 example-slave pass + buildslave start slave + +``slave`` is the folder that the configuration will go into, ``example-slave`` is the name of the slave, ``pass`` is the password, ``10.0.0.2`` is the IP address of the host that the VM uses (shouldn't need to change it, see OSX host instructions below) + +This should start the Twisted server, yielding output like: + + ian@ian-VirtualBox:~$ buildslave start slave/ + Following twistd.log until startup finished.. + 2014-06-08 20:17:50+0200 [-] Log opened. + 2014-06-08 20:17:50+0200 [-] twistd 14.0.0 (/usr/bin/python 2.7.5) starting up. + 2014-06-08 20:17:50+0200 [-] reactor class: twisted.internet.epollreactor.EPollReactor. + 2014-06-08 20:17:50+0200 [-] Starting BuildSlave -- version: 0.8.8 + 2014-06-08 20:17:50+0200 [-] recording hostname in twistd.hostname + 2014-06-08 20:17:50+0200 [-] Starting factory + 2014-06-08 20:17:50+0200 [-] Connecting to 10.0.2.2:9989 + 2014-06-08 20:17:50+0200 [Broker,client] message from master: attached + The buildslave appears to have (re)started correctly.` + +Configuration of OSX Virtualbox host +==================================== + +Thanks to http://stackoverflow.com/questions/1261975/addressing-localhost-from-a-virtualbox-virtual-machine and the comment of spsaucier you basically need to do the following, copied verbatim: + +To enable this on OSX I had to do the following: + +1. Shut your virtual machine down. +2. Go to ``VirtualBox Preferences -> Network -> Host-only Networks ->`` click the "+" icon. Click OK. +3.Select your box and click the "Settings" icon -> Network -> Adapter 2 -> On the "Attached to:" dropdown, select "Host-only Adapter" and your network (vboxnet0) should show up below by default. Click OK. +4. Once you start your box up again, you should be able to access localhost at http://10.0.2.2/ + +You can refer to it by localhost and access other localhosted sites by adding their references to the hosts file (C:\windows\system32\drivers\etc\hosts) like the following: + + 10.0.2.2 localhost + 10.0.2.2 subdomain.localhost From ec04f41ba4813c78a7ee4153e9b575ca21dbc6a3 Mon Sep 17 00:00:00 2001 From: Ian Bell Date: Sun, 8 Jun 2014 20:39:09 +0200 Subject: [PATCH 16/26] Update README.rst --- dev/ci/README.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev/ci/README.rst b/dev/ci/README.rst index 6d7fb7e5..07ab2341 100644 --- a/dev/ci/README.rst +++ b/dev/ci/README.rst @@ -1,7 +1,7 @@ Set up linux slave ================== -In some folder (probably the home folder), do +In some folder (probably the home folder), do:: sudo apt-get buildbot buildbot-slave buildslave create-slave slave 10.0.2.2:9989 example-slave pass @@ -9,7 +9,7 @@ In some folder (probably the home folder), do ``slave`` is the folder that the configuration will go into, ``example-slave`` is the name of the slave, ``pass`` is the password, ``10.0.0.2`` is the IP address of the host that the VM uses (shouldn't need to change it, see OSX host instructions below) -This should start the Twisted server, yielding output like: +This should start the Twisted server, yielding output like:: ian@ian-VirtualBox:~$ buildslave start slave/ Following twistd.log until startup finished.. @@ -35,7 +35,7 @@ To enable this on OSX I had to do the following: 3.Select your box and click the "Settings" icon -> Network -> Adapter 2 -> On the "Attached to:" dropdown, select "Host-only Adapter" and your network (vboxnet0) should show up below by default. Click OK. 4. Once you start your box up again, you should be able to access localhost at http://10.0.2.2/ -You can refer to it by localhost and access other localhosted sites by adding their references to the hosts file (C:\windows\system32\drivers\etc\hosts) like the following: +You can refer to it by localhost and access other localhosted sites by adding their references to the hosts file (C:\windows\system32\drivers\etc\hosts) like the following:: 10.0.2.2 localhost 10.0.2.2 subdomain.localhost From 6b27b5675ea41dc1399b94c39bd96532832bbc2a Mon Sep 17 00:00:00 2001 From: Ian Bell Date: Sun, 8 Jun 2014 21:15:16 +0200 Subject: [PATCH 17/26] Copy Catch header as part of build process Signed-off-by: Ian Bell --- dev/generate_headers.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dev/generate_headers.py b/dev/generate_headers.py index 97333f53..1def23d9 100644 --- a/dev/generate_headers.py +++ b/dev/generate_headers.py @@ -102,6 +102,9 @@ if __name__=='__main__': path = os.path.abspath(__file__) path = os.path.dirname(path) path = os.path.dirname(path) + + import shutil + shutil.copy2(os.path.join('..','externals','Catch','single_include','catch.hpp'),os.path.join('..','include','catch.hpp')) version_to_file(root_dir = path) gitrev_to_file(root_dir = path) From 8b43f59eae7d96ef7128ccea88fcb136d82788ec Mon Sep 17 00:00:00 2001 From: Ian Bell Date: Sun, 8 Jun 2014 21:22:54 +0200 Subject: [PATCH 18/26] Fixed relative paths for copying Catch header Signed-off-by: Ian Bell --- dev/generate_headers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/generate_headers.py b/dev/generate_headers.py index 1def23d9..1632a85e 100644 --- a/dev/generate_headers.py +++ b/dev/generate_headers.py @@ -104,7 +104,7 @@ if __name__=='__main__': path = os.path.dirname(path) import shutil - shutil.copy2(os.path.join('..','externals','Catch','single_include','catch.hpp'),os.path.join('..','include','catch.hpp')) + shutil.copy2(os.path.join(path, 'externals','Catch','single_include','catch.hpp'),os.path.join(path,'include','catch.hpp')) version_to_file(root_dir = path) gitrev_to_file(root_dir = path) From 3bfbecd6f8635820d262dbc12c9fddcdaf6cd986 Mon Sep 17 00:00:00 2001 From: Ian Bell Date: Sun, 8 Jun 2014 21:31:47 +0200 Subject: [PATCH 19/26] Added IncompressibleFluid.h Signed-off-by: Ian Bell --- include/IncompressibleFluid.h | 88 +++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 include/IncompressibleFluid.h diff --git a/include/IncompressibleFluid.h b/include/IncompressibleFluid.h new file mode 100644 index 00000000..a6e509a9 --- /dev/null +++ b/include/IncompressibleFluid.h @@ -0,0 +1,88 @@ +/* + * CoolPropFluid.h + * + * Created on: 20 Dec 2013 + * Author: jowr + */ + +#ifndef INCOMPRESSIBLEFLUID_H_ +#define INCOMPRESSIBLEFLUID_H_ + +#include "DataStructures.h" +#include "Helmholtz.h" +#include "Solvers.h" + +#include +#include +#include +#include +#include +#include + +namespace CoolProp { + +struct IncompressiblePolynomialData{ + std::vector coeffs; +}; + +struct IncompressibleViscosityVariables{ + enum IncompressibleViscosityEnum{ + INCOMPRESSIBLE_VISCOSITY_POLYNOMIAL, + INCOMPRESSIBLE_VISCOSITY_NOT_SET + }; + int type; + IncompressiblePolynomialData poly; + IncompressibleViscosityVariables(){type = INCOMPRESSIBLE_VISCOSITY_NOT_SET;}; +}; + +struct IncompressibleConductivityVariables{ + enum IncompressibleConductivityEnum{ + INCOMPRESSIBLE_CONDUCTIVITY_POLYNOMIAL, + INCOMPRESSIBLE_CONDUCTIVITY_NOT_SET + }; + int type; + IncompressiblePolynomialData poly; + IncompressibleConductivityVariables(){type = INCOMPRESSIBLE_CONDUCTIVITY_NOT_SET;}; +}; + +struct IncompressibleDensityVariables{ + enum IncompressibleDensityEnum{ + INCOMPRESSIBLE_DENSITY_POLYNOMIAL, + INCOMPRESSIBLE_DENSITY_NOT_SET + }; + int type; + IncompressiblePolynomialData poly; + IncompressibleDensityVariables(){type = INCOMPRESSIBLE_DENSITY_NOT_SET;}; +}; + +struct IncompressibleSpecificHeatVariables{ + enum IncompressibleSpecificHeatEnum{ + INCOMPRESSIBLE_SPECIFIC_HEAT_POLYNOMIAL, + INCOMPRESSIBLE_SPECIFIC_HEAT_NOT_SET + }; + int type; + IncompressiblePolynomialData poly; + IncompressibleSpecificHeatVariables(){type = INCOMPRESSIBLE_SPECIFIC_HEAT_NOT_SET;}; +}; + +/// A thermophysical property provider for critical and reducing values as well as derivatives of Helmholtz energy +/** +This fluid instance is populated using an entry from a JSON file +*/ +struct IncompressibleFluid { + + std::string name; + std::string reference; + + double Tmin, Tmax; + + IncompressibleViscosityVariables viscosity; + IncompressibleConductivityVariables conductivity; + IncompressibleSpecificHeatVariables specific_heat; + IncompressibleDensityVariables density; + +}; + + +} /* namespace CoolProp */ +#endif /* COOLPROPFLUID_H_ */ From 2b32a18e130b0a2196e5c52f12c1086cdab46f54 Mon Sep 17 00:00:00 2001 From: Ian Bell Date: Sun, 8 Jun 2014 22:40:17 +0200 Subject: [PATCH 20/26] Updated .gitignore Signed-off-by: Ian Bell --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 181667e4..ba7a4299 100644 --- a/.gitignore +++ b/.gitignore @@ -40,5 +40,4 @@ /include/cpversion.h /dev/all_incompressibles.json /dev/all_incompressibles_verbose.json -/include/IncompressibleFluid.h /include/all_incompressibles_JSON.h From 64946e6017348056a9536a4d8ee9c48c74cd86b3 Mon Sep 17 00:00:00 2001 From: Ian Bell Date: Mon, 9 Jun 2014 15:48:52 +0200 Subject: [PATCH 21/26] Added melting lines for many fluids - nearly all that are in REFPROP Signed-off-by: Ian Bell --- CoolPropBibTeXLibrary.bib | 12 + dev/fluids/Argon.json | 21 ++ dev/fluids/CarbonDioxide.json | 21 ++ dev/fluids/CarbonMonoxide.json | 15 ++ dev/fluids/CycloHexane.json | 15 ++ dev/fluids/Ethane.json | 21 ++ dev/fluids/Ethylene.json | 31 +++ dev/fluids/Fluorine.json | 19 ++ dev/fluids/IsoButane.json | 19 ++ dev/fluids/Isopentane.json | 15 ++ dev/fluids/Krypton.json | 15 ++ dev/fluids/Methane.json | 15 ++ dev/fluids/Methanol.json | 23 ++ dev/fluids/Nitrogen.json | 19 ++ dev/fluids/Oxygen.json | 15 ++ dev/fluids/ParaHydrogen.json | 23 ++ dev/fluids/Propylene.json | 23 ++ dev/fluids/Water.json | 59 +++++ dev/fluids/Xenon.json | 15 ++ dev/fluids/n-Butane.json | 19 ++ dev/fluids/n-Pentane.json | 15 ++ dev/fluids/n-Propane.json | 15 ++ dev/inject_melting_curves.py | 237 +++++++++++------- include/CoolPropFluid.h | 96 ++++++- include/rapidjson/rapidjson_include.h | 14 ++ src/Backends/Helmholtz/Fluids/FluidLibrary.h | 77 +++++- .../Helmholtz/HelmholtzEOSMixtureBackend.cpp | 15 +- .../Helmholtz/HelmholtzEOSMixtureBackend.h | 37 +-- 28 files changed, 809 insertions(+), 112 deletions(-) diff --git a/CoolPropBibTeXLibrary.bib b/CoolPropBibTeXLibrary.bib index b066d4f3..5804d740 100644 --- a/CoolPropBibTeXLibrary.bib +++ b/CoolPropBibTeXLibrary.bib @@ -1,6 +1,18 @@ % This file was created with JabRef 2.9.2. % Encoding: ASCII +@ARTICLE{Abramson-HPR-2011, + author = {Evan H. Abramson}, + title = {Melting curves of argon and methane}, + journal = {High Pressure Research}, + year = {2011}, + volume = {31}, + pages = {549-554}, + number = {4}, + owner = {Belli}, + timestamp = {2014.06.09} +} + @CONFERENCE{Akasaka-DELFT-2013, author = {Ryo Akasaka and Yukihiro Higashi and Shigeru Koyama}, title = {{A Fundamental Equation of State For Low-GWP Refrigerant HFO-1234ze(Z)}}, diff --git a/dev/fluids/Argon.json b/dev/fluids/Argon.json index 9e87182c..95878846 100644 --- a/dev/fluids/Argon.json +++ b/dev/fluids/Argon.json @@ -4,6 +4,27 @@ "ARGON" ], "ANCILLARIES": { + "melting_line": { + "BibTeX": "Tegeler-JPCRD-1999", + "T_m": 87.28, + "parts": [ + { + "T_0": 83.8058, + "T_max": 254.0, + "T_min": 83.806, + "a": [ + -7476.2665, + 9959.0613 + ], + "p_0": 68891, + "t": [ + 1.05, + 1.275 + ] + } + ], + "type": "polynomial_in_Tr" + }, "pL": { "T_r": 150.687, "Tmax": 150.68699999999976, diff --git a/dev/fluids/CarbonDioxide.json b/dev/fluids/CarbonDioxide.json index 8c72f078..769f5d59 100644 --- a/dev/fluids/CarbonDioxide.json +++ b/dev/fluids/CarbonDioxide.json @@ -7,6 +7,27 @@ "CARBONDIOXIDE" ], "ANCILLARIES": { + "melting_line": { + "BibTeX": "Span-JPCRD-1996", + "T_m": 216.58, + "parts": [ + { + "T_0": 216.592, + "T_max": 327.6, + "T_min": 216.592, + "a": [ + 1955.539, + 2055.4593 + ], + "p_0": 517950, + "t": [ + 1, + 2 + ] + } + ], + "type": "polynomial_in_Theta" + }, "pL": { "T_r": 304.1282, "Tmax": 304.1281999999994, diff --git a/dev/fluids/CarbonMonoxide.json b/dev/fluids/CarbonMonoxide.json index 0451de18..c4bfe4ff 100644 --- a/dev/fluids/CarbonMonoxide.json +++ b/dev/fluids/CarbonMonoxide.json @@ -4,6 +4,21 @@ "CARBONMONOXIDE" ], "ANCILLARIES": { + "melting_line": { + "BibTeX": "Barreiros-JCT-1982", + "T_m": 81.63, + "parts": [ + { + "T_0": 1, + "T_max": 87.5, + "T_min": 68.16, + "a": 19560.8, + "c": 2.10747, + "p_0": -142921439.2 + } + ], + "type": "Simon" + }, "pL": { "T_r": 132.86, "Tmax": 132.8599999999997, diff --git a/dev/fluids/CycloHexane.json b/dev/fluids/CycloHexane.json index ea133c5d..80e4bc41 100644 --- a/dev/fluids/CycloHexane.json +++ b/dev/fluids/CycloHexane.json @@ -4,6 +4,21 @@ "CYCLOHEXANE" ], "ANCILLARIES": { + "melting_line": { + "BibTeX": "Penoncello-IJT-1995", + "T_m": 279.96, + "parts": [ + { + "T_0": 279.7, + "T_max": 401.7, + "T_min": 279.47, + "a": 383400000.0, + "c": 1.41, + "p_0": 0 + } + ], + "type": "Simon" + }, "pL": { "T_r": 553.6, "Tmax": 553.5999999999988, diff --git a/dev/fluids/Ethane.json b/dev/fluids/Ethane.json index bda54dd3..2561ef0d 100644 --- a/dev/fluids/Ethane.json +++ b/dev/fluids/Ethane.json @@ -4,6 +4,27 @@ "ETHANE" ], "ANCILLARIES": { + "melting_line": { + "BibTeX": "Buecker-JCRD-2006", + "T_m": 184.6, + "parts": [ + { + "T_0": 90.368, + "T_max": 110.2, + "T_min": 90.368, + "a": [ + 223626315.0, + 105262374.0 + ], + "p_0": 1.14, + "t": [ + 1.0, + 2.55 + ] + } + ], + "type": "polynomial_in_Tr" + }, "pL": { "T_r": 305.322, "Tmax": 305.3219999999994, diff --git a/dev/fluids/Ethylene.json b/dev/fluids/Ethylene.json index cf5d5d21..5013278b 100644 --- a/dev/fluids/Ethylene.json +++ b/dev/fluids/Ethylene.json @@ -4,6 +4,37 @@ "ETHYLENE" ], "ANCILLARIES": { + "melting_line": { + "BibTeX": "Smukala-JPCRD-2000", + "T_m": 169, + "parts": [ + { + "T_0": 103.989, + "T_max": 110.369, + "T_min": 103.989, + "a": [ + 2947001.84 + ], + "p_0": 122.65, + "t": [ + 2.045 + ] + }, + { + "T_0": 110.369, + "T_max": 188, + "T_min": 110.369, + "a": [ + 6.82693421 + ], + "p_0": 46800000.0, + "t": [ + 1.089 + ] + } + ], + "type": "polynomial_in_Tr" + }, "pL": { "T_r": 282.35, "Tmax": 282.3499999999994, diff --git a/dev/fluids/Fluorine.json b/dev/fluids/Fluorine.json index 8a426e14..132769b5 100644 --- a/dev/fluids/Fluorine.json +++ b/dev/fluids/Fluorine.json @@ -4,6 +4,25 @@ "FLUORINE" ], "ANCILLARIES": { + "melting_line": { + "BibTeX": "deReuck-BOOK-1990", + "T_m": 85.2, + "parts": [ + { + "T_0": 53.4811, + "T_max": 55.4, + "T_min": 53.4811, + "a": [ + 988043.478261 + ], + "p_0": 252, + "t": [ + 2.1845 + ] + } + ], + "type": "polynomial_in_Tr" + }, "pL": { "T_r": 144.414, "Tmax": 144.41399999999967, diff --git a/dev/fluids/IsoButane.json b/dev/fluids/IsoButane.json index eebb5e5b..52d34a21 100644 --- a/dev/fluids/IsoButane.json +++ b/dev/fluids/IsoButane.json @@ -7,6 +7,25 @@ "R600a" ], "ANCILLARIES": { + "melting_line": { + "BibTeX": "Buecker-JPCRD-2006B", + "T_m": 262, + "parts": [ + { + "T_0": 113.73, + "T_max": 124.9, + "T_min": 113.73, + "a": [ + 1953637130.9 + ], + "p_0": 0.0219, + "t": [ + 6.12 + ] + } + ], + "type": "polynomial_in_Tr" + }, "pL": { "T_r": 407.817, "Tmax": 407.81699999999915, diff --git a/dev/fluids/Isopentane.json b/dev/fluids/Isopentane.json index b13fdcf3..1f40dc8d 100644 --- a/dev/fluids/Isopentane.json +++ b/dev/fluids/Isopentane.json @@ -5,6 +5,21 @@ "ISOPENTANE" ], "ANCILLARIES": { + "melting_line": { + "BibTeX": "Reeves-JCP-1964", + "T_m": 113.22999999999999, + "parts": [ + { + "T_0": 112.5, + "T_max": 212.16, + "T_min": 112.65, + "a": 591600000.0, + "c": 1.563, + "p_0": 0 + } + ], + "type": "Simon" + }, "pL": { "T_r": 460.35, "Tmax": 460.3499999999989, diff --git a/dev/fluids/Krypton.json b/dev/fluids/Krypton.json index 173120fa..5be99d9f 100644 --- a/dev/fluids/Krypton.json +++ b/dev/fluids/Krypton.json @@ -4,6 +4,21 @@ "KRYPTON" ], "ANCILLARIES": { + "melting_line": { + "BibTeX": "Michels-PHYSICA-1962", + "T_m": 115.95, + "parts": [ + { + "T_0": 1, + "T_max": 168.7, + "T_min": 115.77, + "a": 109479.2307, + "c": 1.6169841, + "p_0": -237497645.7 + } + ], + "type": "Simon" + }, "pL": { "T_r": 209.48, "Tmax": 209.4799999999995, diff --git a/dev/fluids/Methane.json b/dev/fluids/Methane.json index 0df4885b..84b6b847 100644 --- a/dev/fluids/Methane.json +++ b/dev/fluids/Methane.json @@ -5,6 +5,21 @@ "METHANE" ], "ANCILLARIES": { + "melting_line": { + "BibTeX": "Abramson-HPR-2011", + "T_m": 90.7, + "parts": [ + { + "T_0": 90.6941, + "T_max": 700, + "T_min": 90.6941, + "a": 208000000.0, + "c": 1.698, + "p_0": 11700.0 + } + ], + "type": "Simon" + }, "pL": { "T_r": 190.564, "Tmax": 190.56399999999954, diff --git a/dev/fluids/Methanol.json b/dev/fluids/Methanol.json index 0f35151a..6fef4410 100644 --- a/dev/fluids/Methanol.json +++ b/dev/fluids/Methanol.json @@ -4,6 +4,29 @@ "METHANOL" ], "ANCILLARIES": { + "melting_line": { + "BibTeX": "deReuck-BOOK-1993", + "T_m": 337.8, + "parts": [ + { + "T_0": 175.61, + "T_max": 245.9, + "T_min": 175.61, + "a": [ + 5330770000.0, + 4524780000.0, + 38888610000.0 + ], + "p_0": 0.187, + "t": [ + 1, + 1.5, + 4 + ] + } + ], + "type": "polynomial_in_Theta" + }, "pL": { "T_r": 512.5, "Tmax": 512.4999999999987, diff --git a/dev/fluids/Nitrogen.json b/dev/fluids/Nitrogen.json index 1d593b00..abf7c85c 100644 --- a/dev/fluids/Nitrogen.json +++ b/dev/fluids/Nitrogen.json @@ -5,6 +5,25 @@ "N2" ], "ANCILLARIES": { + "melting_line": { + "BibTeX": "Span-JPCRD-2000", + "T_m": 77.34, + "parts": [ + { + "T_0": 63.151, + "T_max": 283.8, + "T_min": 63.151, + "a": [ + 12798.61 + ], + "p_0": 12523, + "t": [ + 1.78963 + ] + } + ], + "type": "polynomial_in_Tr" + }, "pL": { "T_r": 126.192, "Tmax": 126.19199999999978, diff --git a/dev/fluids/Oxygen.json b/dev/fluids/Oxygen.json index d93b53dd..a8e3980c 100644 --- a/dev/fluids/Oxygen.json +++ b/dev/fluids/Oxygen.json @@ -5,6 +5,21 @@ "O2" ], "ANCILLARIES": { + "melting_line": { + "BibTeX": "Younglove-NIST-1982", + "T_m": 90.2, + "parts": [ + { + "T_0": 1, + "T_max": 63.1, + "T_min": 54.361, + "a": 227606.348, + "c": 1.769, + "p_0": -266999247.652 + } + ], + "type": "Simon" + }, "pL": { "T_r": 154.581, "Tmax": 154.58099999999973, diff --git a/dev/fluids/ParaHydrogen.json b/dev/fluids/ParaHydrogen.json index af3d97b3..885f7dca 100644 --- a/dev/fluids/ParaHydrogen.json +++ b/dev/fluids/ParaHydrogen.json @@ -5,6 +5,29 @@ "PARAHYDROGEN" ], "ANCILLARIES": { + "melting_line": { + "BibTeX": "Younglove-NIST-1982", + "T_m": 18.9, + "parts": [ + { + "T_0": 1, + "T_max": 22, + "T_min": 13.8033, + "a": 125746.643, + "c": 1.955, + "p_0": -21155737.752 + }, + { + "T_0": 1, + "T_max": 164.5, + "T_min": 22, + "a": 248578.596, + "c": 1.764739, + "p_0": -26280332.904 + } + ], + "type": "Simon" + }, "pL": { "T_r": 32.938, "Tmax": 32.93799999999992, diff --git a/dev/fluids/Propylene.json b/dev/fluids/Propylene.json index 5661d4bc..80fbc41f 100644 --- a/dev/fluids/Propylene.json +++ b/dev/fluids/Propylene.json @@ -4,6 +4,29 @@ "PROPYLENE" ], "ANCILLARIES": { + "melting_line": { + "BibTeX": "Reeves-JCP-1964", + "T_m": 88.05999999999997, + "parts": [ + { + "T_0": 86.0, + "T_max": 129, + "T_min": 86.0, + "a": 319600000.0, + "c": 2.821, + "p_0": 0 + }, + { + "T_0": 109.6, + "T_max": 145.3, + "T_min": 129, + "a": 306400000.0, + "c": 3.871, + "p_0": 445000000.0 + } + ], + "type": "Simon" + }, "pL": { "T_r": 364.211, "Tmax": 364.2109999999991, diff --git a/dev/fluids/Water.json b/dev/fluids/Water.json index 2e9fcfc1..97d76e8f 100644 --- a/dev/fluids/Water.json +++ b/dev/fluids/Water.json @@ -6,6 +6,65 @@ "h2o" ], "ANCILLARIES": { + "melting_line": { + "BibTeX": "IAPWS", + "T_m": -1, + "parts": [ + { + "T_0": 273.16, + "T_max": 251.165, + "T_min": 273.16, + "a": [ + -1195393.37, + -80818.3159, + -3338.2686 + ], + "p_0": 611.657, + "t": [ + 3.0, + 25.75, + 103.75 + ] + }, + { + "T_0": 251.165, + "T_max": 256.164, + "T_min": 251.165, + "a": [ + 0.299948 + ], + "p_0": 208566000.0, + "t": [ + 60 + ] + }, + { + "T_0": 256.164, + "T_max": 273.31, + "T_min": 256.164, + "a": [ + 1.18721 + ], + "p_0": 350100000.0, + "t": [ + 8 + ] + }, + { + "T_0": 273.31, + "T_max": 355, + "T_min": 273.31, + "a": [ + 1.07476 + ], + "p_0": 623400000.0, + "t": [ + 4.6 + ] + } + ], + "type": "polynomial_in_Tr" + }, "pL": { "T_r": 647.096, "Tmax": 647.0959999999985, diff --git a/dev/fluids/Xenon.json b/dev/fluids/Xenon.json index 3fd803f4..20503f28 100644 --- a/dev/fluids/Xenon.json +++ b/dev/fluids/Xenon.json @@ -5,6 +5,21 @@ "XENON" ], "ANCILLARIES": { + "melting_line": { + "BibTeX": "Michels-PHYSICA-1962", + "T_m": 165.02, + "parts": [ + { + "T_0": 1, + "T_max": 366.4, + "T_min": 161.4, + "a": 80890.5544859, + "c": 1.589165, + "p_0": -260932309.446 + } + ], + "type": "Simon" + }, "pL": { "T_r": 289.733, "Tmax": 289.7329999999995, diff --git a/dev/fluids/n-Butane.json b/dev/fluids/n-Butane.json index a4329db9..45e9fd7e 100644 --- a/dev/fluids/n-Butane.json +++ b/dev/fluids/n-Butane.json @@ -6,6 +6,25 @@ "N-BUTANE" ], "ANCILLARIES": { + "melting_line": { + "BibTeX": "Buecker-JPCRD-2006B", + "T_m": 135.23, + "parts": [ + { + "T_0": 134.895, + "T_max": 163.9, + "T_min": 134.895, + "a": [ + 558558236.4 + ], + "p_0": 0.653, + "t": [ + 2.206 + ] + } + ], + "type": "polynomial_in_Tr" + }, "pL": { "T_r": 425.125, "Tmax": 425.124999999999, diff --git a/dev/fluids/n-Pentane.json b/dev/fluids/n-Pentane.json index dc063920..8ebf7972 100644 --- a/dev/fluids/n-Pentane.json +++ b/dev/fluids/n-Pentane.json @@ -7,6 +7,21 @@ "R601" ], "ANCILLARIES": { + "melting_line": { + "BibTeX": "Reeves-JCP-1964", + "T_m": 143.26, + "parts": [ + { + "T_0": 143.5, + "T_max": 156.2, + "T_min": 143.47, + "a": 660000000.0, + "c": 1.649, + "p_0": 0.0 + } + ], + "type": "Simon" + }, "pL": { "T_r": 469.7, "Tmax": 469.69999999999914, diff --git a/dev/fluids/n-Propane.json b/dev/fluids/n-Propane.json index 5de9dced..10a04fed 100644 --- a/dev/fluids/n-Propane.json +++ b/dev/fluids/n-Propane.json @@ -8,6 +8,21 @@ "N-PROPANE" ], "ANCILLARIES": { + "melting_line": { + "BibTeX": "Reeves-JCP-1964", + "T_m": 85.39999999999998, + "parts": [ + { + "T_0": 85.3, + "T_max": 168.63, + "T_min": 85.525, + "a": 718000000.0, + "c": 1.283, + "p_0": 0.0 + } + ], + "type": "Simon" + }, "pL": { "T_r": 369.89, "Tmax": 369.8899999999991, diff --git a/dev/inject_melting_curves.py b/dev/inject_melting_curves.py index 723a9ebd..2ebbb208 100644 --- a/dev/inject_melting_curves.py +++ b/dev/inject_melting_curves.py @@ -1,84 +1,96 @@ +import os, json + + Simon_curves = { "n-Propane" : { - "T_0" : 85.3, "a" : 7.180e8, "c" : 1.283, "p_0" : 0.0, "T_max" : 168.63, "BibTeX" : "Reeves-JCP-1964" + "BibTeX" : "Reeves-JCP-1964", "T_m": -187.75 + 273.15, "parts": [{"T_0" : 85.3, "a" : 7.180e8, "c" : 1.283, "p_0" : 0.0, "T_max" : 168.63}] }, "n-Pentane" : { - "T_0" : 143.5, "a" : 6.600e8, "c" : 1.649, "p_0" : 0.0, "T_max" : 156.2, "BibTeX" : "Reeves-JCP-1964" + "BibTeX" : "Reeves-JCP-1964", "T_m": -129.89 + 273.15, "parts": [{"T_0" : 143.5, "a" : 6.600e8, "c" : 1.649, "p_0" : 0.0, "T_max" : 156.2}] }, "Isopentane" : { - "T_0" : 112.5, "a" : 5.916e8, "c" : 1.563, "p_0" : 0, "T_max" : 212.16, "BibTeX" : "Reeves-JCP-1964" + "BibTeX" : "Reeves-JCP-1964", "T_m": -159.92 + 273.15, "parts": [{"T_0" : 112.5, "a" : 5.916e8, "c" : 1.563, "p_0" : 0, "T_max" : 212.16}] + }, + "Propylene" : { + "BibTeX" : "Reeves-JCP-1964", "T_m": -185.09 + 273.15, "parts": [{"T_0" : 86.0, "a" : 3.196e8, "c" : 2.821, "p_0" : 0, "T_min": 86.0, "T_max" : 129}, + {"T_0" : 109.6, "a" : 3.064e8, "c" : 3.871, "p_0" : 4.450e8, "T_min": 129, "T_max" : 145.3}] }, - "Propylene" : [ - { - "T_0" : 86.0, "a" : 3.196e8, "c" : 2.821, "p_0" : 0, "T_min": 86.0, "T_max" : 129, "BibTeX" : "Reeves-JCP-1964" - }, - { - "T_0" : 109.6, "a" : 3.064e8, "c" : 3.871, "p_0" : 4.450e8, "T_min": 129, "T_max" : 145.3, "BibTeX" : "Reeves-JCP-1964" - } - ], "Cyclohexane" : { - "T_0" : 279.7, "a" : 383.4e6, "c" : 1.41, "p_0" : 0, "T_max" : 401.7, "BibTeX" : "Penoncello-IJT-1995" + "BibTeX" : "Penoncello-IJT-1995", "T_m": 6.81 + 273.15, "parts": [{"T_0" : 279.7, "a" : 383.4e6, "c" : 1.41, "p_0" : 0, "T_max" : 401.7}] }, "Krypton" : { - "T_0" : 1, "a" : 109479.2307, "c" : 1.6169841, "p_0" : -237497645.7, "T_max" : 168.7, "BibTeX" : "Michels-PHYSICA-1962" + "BibTeX" : "Michels-PHYSICA-1962", "T_m": 115.95, "parts": [{"T_0" : 1, "a" : 109479.2307, "c" : 1.6169841, "p_0" : -237497645.7, "T_max" : 168.7}] }, "Xenon" : { - "T_0" : 1, "a" : 80890.5544859, "c" : 1.5891650, "p_0" : -260932309.446, "T_max" : 366.4, "BibTeX" : "Michels-PHYSICA-1962" + "BibTeX" : "Michels-PHYSICA-1962", "T_m": 165.02, "parts": [{"T_0" : 1, "a" : 80890.5544859, "c" : 1.5891650, "p_0" : -260932309.446, "T_max" : 366.4}] }, "CarbonMonoxide" : { - "T_0" : 1, "a" : 19560.8, "c" : 2.10747, "p_0" : -142921439.2, "T_max" : 87.5, "BibTeX" : "Barreiros-JCT-1982" + "BibTeX" : "Barreiros-JCT-1982", "T_m": 81.63, "parts": [{"T_0" : 1, "a" : 19560.8, "c" : 2.10747, "p_0" : -142921439.2, "T_max" : 87.5}] }, "Oxygen": { - "T_0" : 1, "a" : 227606.348, "c" : 1.769, "p_0" : -266999247.652, "T_max" : 63.1, "BibTeX" : "Younglove-NIST-1982" + "BibTeX" : "Younglove-NIST-1982", "T_m": 90.2, "parts": [{"T_0" : 1, "a" : 227606.348, "c" : 1.769, "p_0" : -266999247.652, "T_max" : 63.1}] }, - "ParaHydrogen": [ - { - "T_0" : 1, "a" : 125746.643, "c" : 1.955, "p_0" : -21155737.752, "T_min" : 13.8033, "T_max" : 22, "BibTeX" : "Younglove-NIST-1982" + "ParaHydrogen": { + "BibTeX" : "Younglove-NIST-1982", "T_m": 18.9, "parts": [{"T_0" : 1, "a" : 125746.643, "c" : 1.955, "p_0" : -21155737.752, "T_min" : 13.8033, "T_max" : 22}, + {"T_0" : 1, "a" : 248578.596, "c" : 1.764739, "p_0" : -26280332.904, "T_min" : 22, "T_max" : 164.5}] }, - { - "T_0" : 1, "a" : 248578.596, "c" : 1.764739, "p_0" : -26280332.904, "T_min" : 22, "T_max" : 164.5, "BibTeX" : "Younglove-NIST-1982" + "Methane": { + "BibTeX" : "Abramson-HPR-2011", "T_m": 90.7, "parts": [{"T_0" : 90.6941, "a" : 0.208e9, "c" : 1.698, "p_0" : 1.17e4, "T_max" : 700}] } - ] } polynomial_in_Tr = { "Argon" : { - "T_t" : 83.8058, "a" : [-7476.2665, 9959.0613], "t" : [1.05,1.275], "p_t" : 68891, "T_max" : 254.0, "BibTeX" : "Tegeler-JPCRD-1999" + "BibTeX" : "Tegeler-JPCRD-1999", "T_m": 87.28, "parts": [{"T_0" : 83.8058, "a" : [-7476.2665, 9959.0613], "t" : [1.05,1.275], "p_0" : 68891, "T_max" : 254.0}] }, "Fluorine" : { - "T_t" : 53.4811, "a" : [988043.478261], "t" : [2.1845], "p_t" : 252, "T_max" : 55.4, "BibTeX" : "deReuck-BOOK-1990" + "BibTeX" : "deReuck-BOOK-1990", "T_m": 85.2, "parts": [{"T_0" : 53.4811, "a" : [988043.478261], "t" : [2.1845], "p_0" : 252, "T_max" : 55.4}] }, "Nitrogen" : { - "T_t" : 63.151, "a" : [12798.61], "t" : [1.78963], "p_t" : 12523, "T_max" : 283.8, "BibTeX" : "Span-JPCRD-2000" + "BibTeX" : "Span-JPCRD-2000", "T_m": 77.34, "parts": [{"T_0" : 63.151, "a" : [12798.61], "t" : [1.78963], "p_0" : 12523, "T_max" : 283.8}] }, "Ethane" : { - "T_t" : 90.368, "a" : [2.23626315e8, 1.05262374e8], "t" : [1.0, 2.55], "p_t" : 1.14, "T_max" : 110.2, "BibTeX" : "Buecker-JCRD-2006" + "BibTeX" : "Buecker-JCRD-2006", "T_m": 184.6, "parts": [{"T_0" : 90.368, "a" : [2.23626315e8, 1.05262374e8], "t" : [1.0, 2.55], "p_0" : 1.14, "T_max" : 110.2}] }, "Isobutane" : { - "T_t" : 113.73, "a" : [1.9536371309e9], "t" : [6.12], "p_t" : 0.0219, "T_max" : 124.9, "BibTeX" : "Buecker-JPCRD-2006B" + "BibTeX" : "Buecker-JPCRD-2006B", "T_m": 262, "parts": [{"T_0" : 113.73, "a" : [1.9536371309e9], "t" : [6.12], "p_0" : 0.0219, "T_max" : 124.9}] }, - "Ethylene" : [ - { - "T_t" : 103.989, "a" : [2947001.84], "t" : [2.045], "p_t" : 122.65, "T_min" : 103.989, "T_max" : 110.369, "BibTeX" : "Smukala-JPCRD-2000" + "Ethylene" : { + "BibTeX" : "Smukala-JPCRD-2000", "T_m": 169, "parts": [{"T_0" : 103.989, "a" : [2947001.84], "t" : [2.045], "p_0" : 122.65, "T_min" : 103.989, "T_max" : 110.369}, + {"T_0" : 110.369, "a" : [6.82693421], "t" : [1.089], "p_0" : 46.8e6, "T_min" : 110.369, "T_max" : 188}] }, - { - "T_t" : 110.369, "a" : [6.82693421], "t" : [1.089], "p_t" : 46.8e6, "T_min" : 110.369, "T_max" : 188, "BibTeX" : "Smukala-JPCRD-2000" - } - ], "n-Butane" : { - "T_t" : 134.895, "a" : [5.585582364e8], "t" : [2.206], "p_t" : 0.653, "T_max" : 163.9, "BibTeX" : "Buecker-JPCRD-2006B" + "BibTeX" : "Buecker-JPCRD-2006B", "T_m": -137.92 + 273.15, "parts": [{"T_0" : 134.895, "a" : [5.585582364e8], "t" : [2.206], "p_0" : 0.653, "T_max" : 163.9}] + }, + "Water" : { + "BibTeX" : "IAPWS", "T_m": -1, "parts": [{"T_0" : 273.16, "a" : [-0.119539337e7,-0.808183159e5,-0.333826860e4], "t" : [0.3000000e1, 0.257500e2, 0.103750e3], "p_0" : 611.657, "T_min": 273.16, "T_max" : 251.165}, + {"T_0" : 251.165, "a" : [0.299948], "t" : [60], "p_0" : 208.566e6, "T_min": 251.165, "T_max" : 256.164}, + {"T_0" : 256.164, "a" : [1.18721], "t" : [8], "p_0" : 350.1e6, "T_min": 256.164, "T_max" : 273.31}, + {"T_0" : 273.31, "a" : [1.07476], "t" : [4.6], "p_0" : 623.4e6, "T_min": 273.31, "T_max" : 355} + ] } } polynomial_in_theta = { "Methanol" : { - "T_t" : 175.61, "a" : [5.330770e9, 4.524780e9, 3.888861e10], "t" : [1, 1.5, 4], "p_t" : 0.187, "T_max" : 245.9, "BibTeX" : "deReuck-BOOK-1993" + "BibTeX" : "deReuck-BOOK-1993", "T_m": 337.8, "parts": [{"T_0" : 175.61, "a" : [5.330770e9, 4.524780e9, 3.888861e10], "t" : [1, 1.5, 4], "p_0" : 0.187, "T_max" : 245.9}] }, "CarbonDioxide" : { - "T_t" : 216.592, "a" : [1955.5390, 2055.4593], "t" : [1, 2], "p_t" : 517950, "T_max" : 327.6, "BibTeX" : "Span-JPCRD-1996" + "BibTeX" : "Span-JPCRD-1996", "T_m": 216.58, "parts": [{"T_0" : 216.592, "a" : [1955.5390, 2055.4593], "t" : [1, 2], "p_0" : 517950, "T_max" : 327.6}] } } +import CoolProp +__ = 0 +for fluid in CoolProp.__fluids__: + if fluid not in Simon_curves and fluid not in polynomial_in_Tr and fluid not in polynomial_in_theta: + print fluid + __ += 1 + else: + print ' '*30, fluid +print __ + +import CoolProp.CoolProp as CP import json, numpy as np, matplotlib.pyplot as plt, pandas ip = 1 @@ -105,6 +117,7 @@ def plot_rho(T, rho, fit = False): def simon(): global ip, irho + for fluid, values in Simon_curves.iteritems(): axp = figp.add_subplot(Nrow, Ncol, ip); ip += 1 axrho = figrho.add_subplot(Nrow, Ncol, irho); irho += 1 @@ -115,21 +128,36 @@ def simon(): axp.set_title(fluid) axrho.set_title(fluid) - if not isinstance(values, list): - values = [values] - df = pandas.read_csv('melting_curves/'+fluid+'.mlt',names=['T','p','rho']) - axp.plot(df['T'], df['p'], 'o', mfc='none') - x,y = plot_rho(df['T'],df['rho'],fit = True) - axrho.plot(x,y, 'o', mfc='none') - else: - for i in ['I','II']: - df = pandas.read_csv('melting_curves/'+fluid+'-'+i+'.mlt',names=['T','p','rho']) - axp.plot(df['T'], df['p'], 'o', mfc='none') - x,y = plot_rho(df['T'],df['rho'],fit = True) - axrho.plot(x,y, 'o', mfc='none') + fname = os.path.join('fluids',fluid+'.json') + j = json.load(open(fname,'r')) + for part in values['parts']: + if 'T_min' not in part: + part['T_min'] = round(CP.Props(fluid,"Tmin"),4) + values['type'] = 'Simon' + + j['ANCILLARIES']['melting_line'] = values - for i,value in enumerate(values): - Tmin = value.get('T_min',min(df['T'])) + fp = open(fname,'w') + from package_json import json_options + fp.write(json.dumps(j,**json_options)) + fp.close() + +# if not isinstance(values, list): +# values = [values] +# df = pandas.read_csv('melting_curves/'+fluid+'.mlt',names=['T','p','rho']) +# axp.plot(df['T'], df['p'], 'o', mfc='none') +# x,y = plot_rho(df['T'],df['rho'],fit = True) +# axrho.plot(x,y, 'o', mfc='none') +# else: +# for i in ['I','II']: +# df = pandas.read_csv('melting_curves/'+fluid+'-'+i+'.mlt',names=['T','p','rho']) +# axp.plot(df['T'], df['p'], 'o', mfc='none') +# x,y = plot_rho(df['T'],df['rho'],fit = True) +# axrho.plot(x,y, 'o', mfc='none') + + for i, value in enumerate(values['parts']): + + Tmin = value.get('T_min',CP.Props(fluid,"Tmin")) Tmax = value['T_max'] T = np.linspace(Tmin, Tmax, 200) @@ -155,35 +183,50 @@ def Tr(): axp.set_title(fluid) axrho.set_title(fluid) + fname = os.path.join('fluids',fluid+'.json') + j = json.load(open(fname,'r')) + for part in values['parts']: + if 'T_min' not in part: + part['T_min'] = round(CP.Props(fluid,"Tmin"),4) + values['type'] = 'polynomial_in_Tr' + + j['ANCILLARIES']['melting_line'] = values + + fp = open(fname,'w') + from package_json import json_options + fp.write(json.dumps(j,**json_options)) + fp.close() + if fluid == 'Ethylene': T = [104.003, 104.059, 104.13, 104.2, 104.27, 104.41, 104.55, 104.69, 104.83, 104.969, 105.108, 105.386, 106.077, 106.764, 107.446, 111.384, 119.283, 127.136, 158.146, 188.621] p = np.array([0.1, 0.5, 1, 1.5, 2, 3, 4, 5, 6, 7, 8, 10, 15, 20, 25, 50, 75, 100, 200, 300])*1e6 axp.plot(T,p,'*') - if not isinstance(values, list): - values = [values] - df = pandas.read_csv('melting_curves/'+fluid+'.mlt',names=['T','p','rho']) - axp.plot(df['T'], df['p'], 'o', mfc='none') - x,y = plot_rho(df['T'],df['rho'],fit = True) - axrho.plot(x,y, 'o', mfc='none') - - else: - for i in ['I','II']: - df = pandas.read_csv('melting_curves/'+fluid+'-'+i+'.mlt',names=['T','p','rho']) - axp.plot(df['T'], df['p'], 'o', mfc='none') - x,y = plot_rho(df['T'],df['rho'],fit = True) - axrho.plot(x,y, 'o', mfc='none') +# if not isinstance(values, list): +# values = [values] +# df = pandas.read_csv('melting_curves/'+fluid+'.mlt',names=['T','p','rho']) +# axp.plot(df['T'], df['p'], 'o', mfc='none') +# x,y = plot_rho(df['T'],df['rho'],fit = True) +# axrho.plot(x,y, 'o', mfc='none') +# +# else: +# for i in ['I','II']: +# df = pandas.read_csv('melting_curves/'+fluid+'-'+i+'.mlt',names=['T','p','rho']) +# axp.plot(df['T'], df['p'], 'o', mfc='none') +# x,y = plot_rho(df['T'],df['rho'],fit = True) +# axrho.plot(x,y, 'o', mfc='none') - for i,value in enumerate(values): - Tmin = value.get('T_min',min(df['T'])) + for i,value in enumerate(values['parts']): + + Tmin = value.get('T_min',CP.Props(fluid,"Tmin")) Tmax = value['T_max'] T = np.linspace(Tmin, Tmax, 200) a = value['a'] t = value['t'] - T_t = value['T_t'] - p_t = value['p_t'] + T_t = value['T_0'] + p_t = value['p_0'] RHS = 0 for i in range(len(a)): @@ -196,7 +239,7 @@ def Tr(): def theta(): global ip, irho - for fluid, value in polynomial_in_theta.iteritems(): + for fluid, values in polynomial_in_theta.iteritems(): axp = figp.add_subplot(Nrow, Ncol, ip); ip += 1 axrho = figrho.add_subplot(Nrow, Ncol, irho); irho += 1 @@ -207,29 +250,45 @@ def theta(): axp.set_title(fluid) axrho.set_title(fluid) - a = value['a'] - t = value['t'] - T_t = value['T_t'] - p_t = value['p_t'] + fname = os.path.join('fluids',fluid+'.json') + j = json.load(open(fname,'r')) + for part in values['parts']: + if 'T_min' not in part: + part['T_min'] = round(CP.Props(fluid,"Tmin"),4) + values['type'] = 'polynomial_in_Theta' + + j['ANCILLARIES']['melting_line'] = values - Tmin = T_t - Tmax = value['T_max'] - T = np.linspace(Tmin, Tmax, 200) + fp = open(fname,'w') + from package_json import json_options + fp.write(json.dumps(j,**json_options)) + fp.close() - RHS = 0 - for i in range(len(a)): - RHS += a[i]*(T/T_t - 1)**t[i] + for value in values['parts']: + + a = value['a'] + t = value['t'] + T_t = value['T_0'] + p_t = value['p_0'] + + Tmin = T_t + Tmax = value['T_max'] + T = np.linspace(Tmin, Tmax, 200) + + RHS = 0 + for i in range(len(a)): + RHS += a[i]*(T/T_t - 1)**t[i] + + p = p_t*(RHS + 1) + + #df = pandas.read_csv('melting_curves/' + fluid + '.mlt', names=['T','p','rho']) + + #axp.plot(df['T'], df['p'], 'o', mfc='none') + + axp.plot(T, p) - p = p_t*(RHS + 1) - - df = pandas.read_csv('melting_curves/' + fluid + '.mlt', names=['T','p','rho']) - - axp.plot(df['T'], df['p'], 'o', mfc='none') - - axp.plot(T, p) - - x,y = plot_rho(df['T'],df['rho'],fit = True) - axrho.plot(x,y, 'o', mfc='none') + #x,y = plot_rho(df['T'],df['rho'],fit = True) + #axrho.plot(x,y, 'o', mfc='none') if __name__=='__main__': simon() diff --git a/include/CoolPropFluid.h b/include/CoolPropFluid.h index 58ce678b..469b14c4 100644 --- a/include/CoolPropFluid.h +++ b/include/CoolPropFluid.h @@ -112,6 +112,7 @@ struct ConductivityCriticalSimplifiedOlchowySengersData{ qD = 2e9; //[m] // Set to invalid number, can be provided in the JSON file + // Default is 1.5*Tc T_ref = _HUGE; } }; @@ -365,14 +366,105 @@ public: } }; -class MeltingLine +struct MeltingLinePiecewiseSimonSegment { + long double T_0, a, c, p_0, T_max, T_min; +}; +struct MeltingLinePiecewiseSimonData +{ + std::vector parts; +}; +struct MeltingLinePiecewisePolynomialInTrSegment +{ + std::vector a, t; + long double T_0, p_0, T_max, T_min; +}; +struct MeltingLinePiecewisePolynomialInTrData +{ + std::vector parts; +}; +struct MeltingLinePiecewisePolynomialInThetaSegment +{ + std::vector a, t; + long double T_0, p_0, T_max, T_min; +}; +struct MeltingLinePiecewisePolynomialInThetaData +{ + std::vector parts; +}; +class MeltingLineVariables +{ +public: + enum MeltingLineVariablesEnum{ + MELTING_LINE_SIMON_TYPE, + MELTING_LINE_POLYNOMIAL_IN_TR_TYPE, + MELTING_LINE_POLYNOMIAL_IN_THETA_TYPE, + MELTING_LINE_NOT_SET + }; + long double evaluate(int OF, int GIVEN, long double value) + { + if (type == MELTING_LINE_NOT_SET){throw ValueError("Melting line curve not set");} + if (OF == iP && GIVEN == iT){ + long double T = value; + if (type == MELTING_LINE_SIMON_TYPE){ + // Need to find the right segment + for (std::size_t i = 0; i < simon.parts.size(); ++i){ + MeltingLinePiecewiseSimonSegment &part = simon.parts[i]; + if (T >= part.T_min && T <= part.T_max){ + return part.p_0 + part.a*(pow(T/part.T_0,part.c)-1); + } + } + throw ValueError("unable to calculate melting line (p,T) for Simon curve"); + } + else if (type == MELTING_LINE_POLYNOMIAL_IN_TR_TYPE){ + // Need to find the right segment + for (std::size_t i = 0; i < polynomial_in_Tr.parts.size(); ++i){ + MeltingLinePiecewisePolynomialInTrSegment &part = polynomial_in_Tr.parts[i]; + if (T >= part.T_min && T <= part.T_max){ + long double summer = 0; + for (std::size_t i =0; i < part.a.size(); ++i){ + summer += part.a[i]*(pow(T/part.T_0,part.t[i])-1); + } + return part.p_0*(1+summer); + } + } + throw ValueError("unable to calculate melting line (p,T) for polynomial_in_Tr curve"); + } + else if (type == MELTING_LINE_POLYNOMIAL_IN_THETA_TYPE){ + // Need to find the right segment + for (std::size_t i = 0; i < polynomial_in_Theta.parts.size(); ++i){ + MeltingLinePiecewisePolynomialInThetaSegment &part = polynomial_in_Theta.parts[i]; + if (T >= part.T_min && T <= part.T_max){ + long double summer = 0; + for (std::size_t i =0; i < part.a.size(); ++i){ + summer += part.a[i]*pow(T/part.T_0-1,part.t[i]); + } + return part.p_0*(1+summer); + } + } + throw ValueError("unable to calculate melting line (p,T) for polynomial_in_Theta curve"); + } + else{ + throw ValueError("only Simon supported now"); + } + } + else{ + throw ValueError("only melt(P,T) supported now"); + } + } + std::string BibTeX; + long double T_m; ///< Melting temperature at 1 atmosphere + MeltingLinePiecewiseSimonData simon; + MeltingLinePiecewisePolynomialInTrData polynomial_in_Tr; + MeltingLinePiecewisePolynomialInThetaData polynomial_in_Theta; + int type; + MeltingLineVariables(){type = MELTING_LINE_NOT_SET;}; }; struct Ancillaries { SaturationAncillaryFunction pL, pV, rhoL, rhoV; - MeltingLine melting_line; + MeltingLineVariables melting_line; SurfaceTensionCorrelation surface_tension; }; diff --git a/include/rapidjson/rapidjson_include.h b/include/rapidjson/rapidjson_include.h index ecf313a0..00bb6b81 100644 --- a/include/rapidjson/rapidjson_include.h +++ b/include/rapidjson/rapidjson_include.h @@ -100,6 +100,20 @@ namespace cpjson return out; }; + /// A convenience function to get a long double array compactly + inline std::vector get_long_double_array(rapidjson::Value &v, std::string name) + { + std::vector out; + if (!v.HasMember(name.c_str())){ throw CoolProp::ValueError(format("Does not have member [%s]",name.c_str())); } + if (!v[name.c_str()].IsArray()) { throw CoolProp::ValueError("input is not an array"); } + for (rapidjson::Value::ValueIterator itr = v[name.c_str()].Begin(); itr != v[name.c_str()].End(); ++itr) + { + if (!itr->IsNumber()){throw CoolProp::ValueError("input is not a number");} + out.push_back(itr->GetDouble()); + } + return out; + }; + /// A convenience function to get a string array compactly inline std::vector get_string_array(rapidjson::Value &v) { diff --git a/src/Backends/Helmholtz/Fluids/FluidLibrary.h b/src/Backends/Helmholtz/Fluids/FluidLibrary.h index 6f5520c8..f21ade87 100644 --- a/src/Backends/Helmholtz/Fluids/FluidLibrary.h +++ b/src/Backends/Helmholtz/Fluids/FluidLibrary.h @@ -311,7 +311,7 @@ protected: EOS.reduce.rhomolar = cpjson::get_double(reducing_state,"rhomolar"); EOS.reduce.p = cpjson::get_double(reducing_state,"p"); - /// todo: define limits of EOS better + /// \todo: define limits of EOS better EOS.limits.Tmin = cpjson::get_double(satminL_state, "T"); EOS.Ttriple = EOS.limits.Tmin; @@ -804,6 +804,71 @@ protected: fluid.transport.epsilon_over_k = Tc/1.3593; // [K] } + void parse_melting_line(rapidjson::Value &melting_line, CoolPropFluid & fluid) + { + fluid.ancillaries.melting_line.T_m = cpjson::get_double(melting_line, "T_m"); + fluid.ancillaries.melting_line.BibTeX = cpjson::get_string(melting_line, "BibTeX"); + + if (melting_line.HasMember("type")) + { + std::string type = cpjson::get_string(melting_line, "type"); + if (!type.compare("Simon")) + { + rapidjson::Value &parts = melting_line["parts"]; + for (rapidjson::Value::ValueIterator itr = parts.Begin(); itr != parts.End(); ++itr) + { + MeltingLinePiecewiseSimonSegment data; + data.a = cpjson::get_double((*itr),"a"); + data.c = cpjson::get_double((*itr),"c"); + data.T_min = cpjson::get_double((*itr),"T_min"); + data.T_max = cpjson::get_double((*itr),"T_max"); + data.T_0 = cpjson::get_double((*itr),"T_0"); + data.p_0 = cpjson::get_double((*itr),"p_0"); + fluid.ancillaries.melting_line.simon.parts.push_back(data); + } + fluid.ancillaries.melting_line.type = MeltingLineVariables::MELTING_LINE_SIMON_TYPE; + } + else if (!type.compare("polynomial_in_Tr")) + { + rapidjson::Value &parts = melting_line["parts"]; + for (rapidjson::Value::ValueIterator itr = parts.Begin(); itr != parts.End(); ++itr) + { + MeltingLinePiecewisePolynomialInTrSegment data; + data.a = cpjson::get_long_double_array((*itr),"a"); + data.t = cpjson::get_long_double_array((*itr),"t"); + data.T_min = cpjson::get_double((*itr),"T_min"); + data.T_max = cpjson::get_double((*itr),"T_max"); + data.T_0 = cpjson::get_double((*itr),"T_0"); + data.p_0 = cpjson::get_double((*itr),"p_0"); + fluid.ancillaries.melting_line.polynomial_in_Tr.parts.push_back(data); + } + fluid.ancillaries.melting_line.type = MeltingLineVariables::MELTING_LINE_POLYNOMIAL_IN_TR_TYPE; + } + else if (!type.compare("polynomial_in_Theta")) + { + rapidjson::Value &parts = melting_line["parts"]; + for (rapidjson::Value::ValueIterator itr = parts.Begin(); itr != parts.End(); ++itr) + { + MeltingLinePiecewisePolynomialInThetaSegment data; + data.a = cpjson::get_long_double_array((*itr),"a"); + data.t = cpjson::get_long_double_array((*itr),"t"); + data.T_min = cpjson::get_double((*itr),"T_min"); + data.T_max = cpjson::get_double((*itr),"T_max"); + data.T_0 = cpjson::get_double((*itr),"T_0"); + data.p_0 = cpjson::get_double((*itr),"p_0"); + fluid.ancillaries.melting_line.polynomial_in_Theta.parts.push_back(data); + } + fluid.ancillaries.melting_line.type = MeltingLineVariables::MELTING_LINE_POLYNOMIAL_IN_THETA_TYPE; + } + else{ + throw ValueError(format("melting line type [%s] is not understood for fluid %s", type.c_str(), fluid.name.c_str())); + } + } + else{ + throw ValueError(format("melting line does not have \"type\" for fluid %s", fluid.name.c_str())); + } + }; + /// Parse the critical state for the given EOS void parse_states(rapidjson::Value &states, CoolPropFluid & fluid) { @@ -936,6 +1001,16 @@ public: parse_surface_tension(fluid_json["ANCILLARIES"]["surface_tension"], fluid); } + // Melting line + if (!(fluid_json["ANCILLARIES"].HasMember("melting_line"))){ + if (get_debug_level() > 0){ + std::cout << format("Melting line curves are missing for fluid [%s]\n", fluid.name.c_str()) ; + } + } + else{ + parse_melting_line(fluid_json["ANCILLARIES"]["melting_line"], fluid); + } + // Parse the environmental parameters if (!(fluid_json.HasMember("ENVIRONMENTAL"))){ if (get_debug_level() > 0){ diff --git a/src/Backends/Helmholtz/HelmholtzEOSMixtureBackend.cpp b/src/Backends/Helmholtz/HelmholtzEOSMixtureBackend.cpp index b2aa77d3..625164d1 100644 --- a/src/Backends/Helmholtz/HelmholtzEOSMixtureBackend.cpp +++ b/src/Backends/Helmholtz/HelmholtzEOSMixtureBackend.cpp @@ -115,6 +115,17 @@ long double HelmholtzEOSMixtureBackend::calc_molar_mass(void) } return summer; } +long double HelmholtzEOSMixtureBackend::calc_melt_p_T(long double T) +{ + if (is_pure_or_pseudopure) + { + return components[0]->ancillaries.melting_line.evaluate(iP, iT, T); + } + else + { + throw NotImplementedError(format("calc_melt_p_T not implemented for mixtures")); + } +} long double HelmholtzEOSMixtureBackend::calc_surface_tension(void) { if (is_pure_or_pseudopure) @@ -1591,8 +1602,8 @@ long double HelmholtzEOSMixtureBackend::calc_speed_sound(void) long double d2ar_dDelta2 = d2alphar_dDelta2(); long double d2ar_dDelta_dTau = d2alphar_dDelta_dTau(); long double d2ar_dTau2 = d2alphar_dTau2(); - long double R_u = static_cast(_gas_constant); - long double mm = static_cast(_molar_mass); + long double R_u = gas_constant(); + long double mm = molar_mass(); // Get speed of sound _speed_sound = sqrt(R_u*_T/mm*(1+2*_delta.pt()*dar_dDelta+pow(_delta.pt(),2)*d2ar_dDelta2 - pow(1+_delta.pt()*dar_dDelta-_delta.pt()*_tau.pt()*d2ar_dDelta_dTau,2)/(pow(_tau.pt(),2)*(d2ar_dTau2 + d2a0_dTau2)))); diff --git a/src/Backends/Helmholtz/HelmholtzEOSMixtureBackend.h b/src/Backends/Helmholtz/HelmholtzEOSMixtureBackend.h index 19f43abb..151e18da 100644 --- a/src/Backends/Helmholtz/HelmholtzEOSMixtureBackend.h +++ b/src/Backends/Helmholtz/HelmholtzEOSMixtureBackend.h @@ -17,10 +17,10 @@ class FlashRoutines; class HelmholtzEOSMixtureBackend : public AbstractState { protected: std::vector components; ///< The components that are in use - + bool is_pure_or_pseudopure; ///< A flag for whether the substance is a pure or pseudo-pure fluid (true) or a mixture (false) std::vector mole_fractions; ///< The mole fractions of the components - std::vector mole_fractions_liq, ///< The mole fractions of the saturated liquid + std::vector mole_fractions_liq, ///< The mole fractions of the saturated liquid mole_fractions_vap, ///< The mole fractions of the saturated vapor K, ///< The K factors for the components lnK; ///< The natural logarithms of the K factors of the components @@ -37,7 +37,7 @@ public: friend class FlashRoutines; // Allows the static methods in the FlashRoutines class to have access to all the protected members and methods of this class friend class TransportRoutines; // Allows the static methods in the TransportRoutines class to have access to all the protected members and methods of this class - //friend class MixtureDerivatives; // + //friend class MixtureDerivatives; // // Helmholtz EOS backend uses mole fractions bool using_mole_fractions(){return true;} @@ -46,7 +46,7 @@ public: std::vector &get_K(){return K;}; std::vector &get_lnK(){return lnK;}; - shared_ptr SatL, SatV; ///< + shared_ptr SatL, SatV; ///< void update(long input_pair, double value1, double value2); @@ -69,19 +69,19 @@ public: void set_excess_term(); /// Set the mole fractions - /** + /** @param mole_fractions The vector of mole fractions of the components */ void set_mole_fractions(const std::vector &mole_fractions); const std::vector &get_mole_fractions(){return mole_fractions;}; - + /// Set the mass fractions - /** + /** @param mass_fractions The vector of mass fractions of the components */ void set_mass_fractions(const std::vector &mass_fractions){throw std::exception();}; - + long double calc_molar_mass(void); long double calc_gas_constant(void); @@ -118,6 +118,7 @@ public: long double calc_d2alpha0_dDelta_dTau(void); long double calc_d2alpha0_dTau2(void); + long double calc_melt_p_T(long double T); long double calc_surface_tension(void); long double calc_viscosity(void); long double calc_viscosity_dilute(void); @@ -137,7 +138,7 @@ public: std::string calc_name(void); long double calc_alphar_deriv_nocache(const int nTau, const int nDelta, const std::vector & mole_fractions, const long double &tau, const long double &delta); - + /** \brief Take derivatives of the ideal-gas part of the Helmholtz energy, don't use any cached values, or store any cached values @@ -163,7 +164,7 @@ public: \sa Table B5, GERG 2008 from Kunz Wagner, JCED, 2012 */ long double calc_alpha0_deriv_nocache(const int nTau, const int nDelta, const std::vector & mole_fractions, const long double &tau, const long double &delta, const long double &Tr, const long double &rhor); - + void calc_reducing_state(void); SimpleState calc_reducing_state_nocache(const std::vector & mole_fractions); @@ -183,11 +184,11 @@ public: void mass_to_molar_inputs(long &input_pair, double &value1, double &value2); - // *************************************************************** + // *************************************************************** // *************************************************************** // ************* PHASE DETERMINATION ROUTINES ****************** // *************************************************************** - // *************************************************************** + // *************************************************************** void T_phase_determination_pure_or_pseudopure(int other, long double value); void p_phase_determination_pure_or_pseudopure(int other, long double value); void DmolarP_phase_determination(); @@ -197,8 +198,8 @@ public: // *************************************************************** // ******************* SOLVER ROUTINES ************************* // *************************************************************** - // *************************************************************** - + // *************************************************************** + long double solver_rho_Tp(long double T, long double p, long double rho_guess = -1); long double solver_rho_Tp_SRK(long double T, long double p, int phase); long double solver_for_rho_given_T_oneof_HSU(long double T, long double value, int other); @@ -310,7 +311,7 @@ public: \f[ n\left(\frac{\partial \ln \phi_i}{\partial n_j}\right)_{T,p} = n\left(\frac{\partial^2n\alpha^r}{\partial n_j \partial n_i} \right)_{T,V}+1+\frac{n}{RT}\frac{\left(\frac{\partial p}{\partial n_j}\right)_{T,V,n_i}\left(\frac{\partial p}{\partial n_i}\right)_{T,V,n_j}}{\left(\frac{\partial p}{\partial V}\right)_{T,\bar n}} \f] - which is also equal to + which is also equal to \f[ n\left(\frac{\partial \ln \phi_i}{\partial n_j}\right)_{T,p} = n\left(\frac{\partial^2n\alpha^r}{\partial n_j \partial n_i} \right)_{T,V}+1-\frac{\hat v_i}{RT}\left[n\left(\frac{\partial p}{\partial n_j}\right)_{T,V,n_i}\right] \f] @@ -320,7 +321,7 @@ public: /// Gernert Equation 3.115 /// Catch test provided long double mixderiv_dln_fugacity_coefficient_dxj__constT_p_xi(int i, int j); - + /// Gernert Equation 3.130 /// Catch test provided long double mixderiv_dpdxj__constT_V_xi(int j); @@ -390,7 +391,7 @@ public: \f] GERG 2004 Monograph equation 7.47: \f{eqnarray*}{ - n\left( \frac{\partial}{\partial n_j}\left(n\left(\frac{\partial \alpha^r}{\partial n_i}\right)_{T,V,n_j} \right) \right)_{T,V,n_i} &=& \left( \frac{\partial}{\partial \delta}\left(n\left(\frac{\partial\alpha^r}{\partial n_i}\right)_{T,V,n_j}\right)\right)_{\tau,\bar x}\cdot n\left(\frac{\partial\delta}{\partial n_j}\right)_{T,V,n_i}\\ + n\left( \frac{\partial}{\partial n_j}\left(n\left(\frac{\partial \alpha^r}{\partial n_i}\right)_{T,V,n_j} \right) \right)_{T,V,n_i} &=& \left( \frac{\partial}{\partial \delta}\left(n\left(\frac{\partial\alpha^r}{\partial n_i}\right)_{T,V,n_j}\right)\right)_{\tau,\bar x}\cdot n\left(\frac{\partial\delta}{\partial n_j}\right)_{T,V,n_i}\\ &+& \left( \frac{\partial}{\partial \tau}\left(n\left(\frac{\partial\alpha^r}{\partial n_i}\right)_{T,V,n_j}\right)\right)_{\tau,\bar x}\cdot n\left(\frac{\partial\tau}{\partial n_j}\right)_{T,V,n_i}\\ &+& \left( \frac{\partial}{\partial x_j}\left(n\left(\frac{\partial\alpha^r}{\partial n_i}\right)_{T,V,n_j}\right)\right)_{\delta,\tau,x_i}-\sum_{k=1}^{N}x_k \left( \frac{\partial}{\partial x_k}\left(n\left(\frac{\partial\alpha^r}{\partial n_i}\right)_{T,V,n_j}\right)\right)_{\delta,\tau,x_i}\\ \f} @@ -404,7 +405,7 @@ public: \f] */ long double mixderiv_nddeltadni__constT_V_nj(int i); - + /// GERG 2004 Monograph equation 7.49 /** The derivative term \f[ From 1fd88a8087fa0e4a0e6de26851f88ea67d2827ac Mon Sep 17 00:00:00 2001 From: Ian Bell Date: Mon, 9 Jun 2014 18:44:10 +0200 Subject: [PATCH 22/26] Updated a few melting lines Signed-off-by: Ian Bell --- CoolPropBibTeXLibrary.bib | 13 +++++++ Web/index.rst | 3 +- dev/fluids/CarbonMonoxide.json | 2 +- dev/fluids/Ethane.json | 2 +- dev/fluids/Fluorine.json | 2 +- dev/fluids/Helium.json | 15 ++++++++ dev/fluids/Hydrogen.json | 15 ++++++++ dev/fluids/IsoButane.json | 2 +- dev/fluids/Methane.json | 2 +- dev/fluids/Neon.json | 15 ++++++++ dev/fluids/Oxygen.json | 2 +- dev/inject_melting_curves.py | 63 ++++++++++++++++++++++++++++------ 12 files changed, 118 insertions(+), 18 deletions(-) diff --git a/CoolPropBibTeXLibrary.bib b/CoolPropBibTeXLibrary.bib index 5804d740..3651f6c9 100644 --- a/CoolPropBibTeXLibrary.bib +++ b/CoolPropBibTeXLibrary.bib @@ -1176,6 +1176,19 @@ timestamp = {2013.04.10} } +@ARTICLE{SantamariaPerez-PRB-2010, + author = {David Santamar{\'i}a-P{\'e}rez and Goutam Dev Mukherjee and Beate + Schwager and Reinhard Boehler}, + title = {High-pressure melting curve of helium and neon: Deviations from corresponding + states theory}, + journal = {Physical Review B}, + year = {2010}, + volume = {81}, + pages = {214101:1-5}, + owner = {Belli}, + timestamp = {2014.06.09} +} + @ARTICLE{Scalabrin-JPCRD-2006-CO2, author = {G. Scalabrin and P. Marchi and F. Finezzo and R. Span}, title = {{A Reference Multiparameter Thermal Conductivity Equation for Carbon diff --git a/Web/index.rst b/Web/index.rst index 6eef6447..c33040a8 100644 --- a/Web/index.rst +++ b/Web/index.rst @@ -47,10 +47,9 @@ Open-Source Projects Using CoolProp Help ==== -- File a `Github issue `_ +- File a `Github issue `_ - Email the `Google group `_ - =============== Main Developers =============== diff --git a/dev/fluids/CarbonMonoxide.json b/dev/fluids/CarbonMonoxide.json index c4bfe4ff..f02d2314 100644 --- a/dev/fluids/CarbonMonoxide.json +++ b/dev/fluids/CarbonMonoxide.json @@ -6,7 +6,7 @@ "ANCILLARIES": { "melting_line": { "BibTeX": "Barreiros-JCT-1982", - "T_m": 81.63, + "T_m": 68.3, "parts": [ { "T_0": 1, diff --git a/dev/fluids/Ethane.json b/dev/fluids/Ethane.json index 2561ef0d..17610d45 100644 --- a/dev/fluids/Ethane.json +++ b/dev/fluids/Ethane.json @@ -6,7 +6,7 @@ "ANCILLARIES": { "melting_line": { "BibTeX": "Buecker-JCRD-2006", - "T_m": 184.6, + "T_m": 90.4, "parts": [ { "T_0": 90.368, diff --git a/dev/fluids/Fluorine.json b/dev/fluids/Fluorine.json index 132769b5..1b47fb0b 100644 --- a/dev/fluids/Fluorine.json +++ b/dev/fluids/Fluorine.json @@ -6,7 +6,7 @@ "ANCILLARIES": { "melting_line": { "BibTeX": "deReuck-BOOK-1990", - "T_m": 85.2, + "T_m": 53.15, "parts": [ { "T_0": 53.4811, diff --git a/dev/fluids/Helium.json b/dev/fluids/Helium.json index 9563bc07..085d4a13 100644 --- a/dev/fluids/Helium.json +++ b/dev/fluids/Helium.json @@ -5,6 +5,21 @@ "He" ], "ANCILLARIES": { + "melting_line": { + "BibTeX": "Datchi-PRB-2000", + "T_m": 1.15, + "parts": [ + { + "T_0": 1, + "T_max": 700, + "T_min": 2.1768, + "a": 1606700.0, + "c": 1.565, + "p_0": -1606700.0 + } + ], + "type": "Simon" + }, "pL": { "T_r": 5.1953, "Tmax": 5.195299999999987, diff --git a/dev/fluids/Hydrogen.json b/dev/fluids/Hydrogen.json index d0a177a8..e60f52a3 100644 --- a/dev/fluids/Hydrogen.json +++ b/dev/fluids/Hydrogen.json @@ -6,6 +6,21 @@ "R702" ], "ANCILLARIES": { + "melting_line": { + "BibTeX": "Datchi-PRB-2000", + "T_m": 14.009985, + "parts": [ + { + "T_0": 1, + "T_max": 700, + "T_min": 13.957, + "a": 231000.0, + "c": 1.7627, + "p_0": -236200.0 + } + ], + "type": "Simon" + }, "pL": { "T_r": 33.145, "Tmax": 33.144999999999925, diff --git a/dev/fluids/IsoButane.json b/dev/fluids/IsoButane.json index 52d34a21..2897e40c 100644 --- a/dev/fluids/IsoButane.json +++ b/dev/fluids/IsoButane.json @@ -9,7 +9,7 @@ "ANCILLARIES": { "melting_line": { "BibTeX": "Buecker-JPCRD-2006B", - "T_m": 262, + "T_m": 113.55, "parts": [ { "T_0": 113.73, diff --git a/dev/fluids/Methane.json b/dev/fluids/Methane.json index 84b6b847..8ee20ab7 100644 --- a/dev/fluids/Methane.json +++ b/dev/fluids/Methane.json @@ -11,7 +11,7 @@ "parts": [ { "T_0": 90.6941, - "T_max": 700, + "T_max": 600, "T_min": 90.6941, "a": 208000000.0, "c": 1.698, diff --git a/dev/fluids/Neon.json b/dev/fluids/Neon.json index c49259d1..8071908d 100644 --- a/dev/fluids/Neon.json +++ b/dev/fluids/Neon.json @@ -4,6 +4,21 @@ "NEON" ], "ANCILLARIES": { + "melting_line": { + "BibTeX": "SantamariaPerez-PRB-2010", + "T_m": -1, + "parts": [ + { + "T_0": 24.4, + "T_max": 700, + "T_min": 24.56, + "a": 1700000000.0, + "c": 1.2987012987012987, + "p_0": 101325 + } + ], + "type": "Simon" + }, "pL": { "T_r": 44.4918, "Tmax": 44.49179999999988, diff --git a/dev/fluids/Oxygen.json b/dev/fluids/Oxygen.json index a8e3980c..27b3d788 100644 --- a/dev/fluids/Oxygen.json +++ b/dev/fluids/Oxygen.json @@ -7,7 +7,7 @@ "ANCILLARIES": { "melting_line": { "BibTeX": "Younglove-NIST-1982", - "T_m": 90.2, + "T_m": 54.75, "parts": [ { "T_0": 1, diff --git a/dev/inject_melting_curves.py b/dev/inject_melting_curves.py index 2ebbb208..8a6b0767 100644 --- a/dev/inject_melting_curves.py +++ b/dev/inject_melting_curves.py @@ -25,17 +25,26 @@ Simon_curves = { "BibTeX" : "Michels-PHYSICA-1962", "T_m": 165.02, "parts": [{"T_0" : 1, "a" : 80890.5544859, "c" : 1.5891650, "p_0" : -260932309.446, "T_max" : 366.4}] }, "CarbonMonoxide" : { - "BibTeX" : "Barreiros-JCT-1982", "T_m": 81.63, "parts": [{"T_0" : 1, "a" : 19560.8, "c" : 2.10747, "p_0" : -142921439.2, "T_max" : 87.5}] + "BibTeX" : "Barreiros-JCT-1982", "T_m": 68.3, "parts": [{"T_0" : 1, "a" : 19560.8, "c" : 2.10747, "p_0" : -142921439.2, "T_max" : 87.5}] }, "Oxygen": { - "BibTeX" : "Younglove-NIST-1982", "T_m": 90.2, "parts": [{"T_0" : 1, "a" : 227606.348, "c" : 1.769, "p_0" : -266999247.652, "T_max" : 63.1}] + "BibTeX" : "Younglove-NIST-1982", "T_m": 54.75, "parts": [{"T_0" : 1, "a" : 227606.348, "c" : 1.769, "p_0" : -266999247.652, "T_max" : 63.1}] }, "ParaHydrogen": { "BibTeX" : "Younglove-NIST-1982", "T_m": 18.9, "parts": [{"T_0" : 1, "a" : 125746.643, "c" : 1.955, "p_0" : -21155737.752, "T_min" : 13.8033, "T_max" : 22}, {"T_0" : 1, "a" : 248578.596, "c" : 1.764739, "p_0" : -26280332.904, "T_min" : 22, "T_max" : 164.5}] }, "Methane": { - "BibTeX" : "Abramson-HPR-2011", "T_m": 90.7, "parts": [{"T_0" : 90.6941, "a" : 0.208e9, "c" : 1.698, "p_0" : 1.17e4, "T_max" : 700}] + "BibTeX" : "Abramson-HPR-2011", "T_m": 90.7, "parts": [{"T_0" : 90.6941, "a" : 0.208e9, "c" : 1.698, "p_0" : 1.17e4, "T_max" : 600}] + }, + "Helium": { + "BibTeX" : "Datchi-PRB-2000", "T_m": 1.15, "parts": [{"T_0" : 1, "a" : 1.6067e6, "c" : 1.565, "p_0" : -1.6067e6, "T_max" : 700}] + }, + "Neon": { + "BibTeX" : "SantamariaPerez-PRB-2010", "T_m": -1, "parts": [{"T_0" : 24.4, "a" : 1.7e9, "c" : 1/0.77, "p_0" : 101325, "T_max" : 700}] + }, + "Hydrogen": { + "BibTeX" : "Datchi-PRB-2000", "T_m": 14.009985, "parts": [{"T_0" : 1, "a" : 2.31e5, "c" : 1.7627, "p_0" : -0.0052e6-2.31e5, "T_max" : 700}] } } @@ -44,16 +53,16 @@ polynomial_in_Tr = { "BibTeX" : "Tegeler-JPCRD-1999", "T_m": 87.28, "parts": [{"T_0" : 83.8058, "a" : [-7476.2665, 9959.0613], "t" : [1.05,1.275], "p_0" : 68891, "T_max" : 254.0}] }, "Fluorine" : { - "BibTeX" : "deReuck-BOOK-1990", "T_m": 85.2, "parts": [{"T_0" : 53.4811, "a" : [988043.478261], "t" : [2.1845], "p_0" : 252, "T_max" : 55.4}] + "BibTeX" : "deReuck-BOOK-1990", "T_m": 53.15, "parts": [{"T_0" : 53.4811, "a" : [988043.478261], "t" : [2.1845], "p_0" : 252, "T_max" : 55.4}] }, "Nitrogen" : { "BibTeX" : "Span-JPCRD-2000", "T_m": 77.34, "parts": [{"T_0" : 63.151, "a" : [12798.61], "t" : [1.78963], "p_0" : 12523, "T_max" : 283.8}] }, "Ethane" : { - "BibTeX" : "Buecker-JCRD-2006", "T_m": 184.6, "parts": [{"T_0" : 90.368, "a" : [2.23626315e8, 1.05262374e8], "t" : [1.0, 2.55], "p_0" : 1.14, "T_max" : 110.2}] + "BibTeX" : "Buecker-JCRD-2006", "T_m": 90.4, "parts": [{"T_0" : 90.368, "a" : [2.23626315e8, 1.05262374e8], "t" : [1.0, 2.55], "p_0" : 1.14, "T_max" : 110.2}] }, "Isobutane" : { - "BibTeX" : "Buecker-JPCRD-2006B", "T_m": 262, "parts": [{"T_0" : 113.73, "a" : [1.9536371309e9], "t" : [6.12], "p_0" : 0.0219, "T_max" : 124.9}] + "BibTeX" : "Buecker-JPCRD-2006B", "T_m": 113.55, "parts": [{"T_0" : 113.73, "a" : [1.9536371309e9], "t" : [6.12], "p_0" : 0.0219, "T_max" : 124.9}] }, "Ethylene" : { "BibTeX" : "Smukala-JPCRD-2000", "T_m": 169, "parts": [{"T_0" : 103.989, "a" : [2947001.84], "t" : [2.045], "p_0" : 122.65, "T_min" : 103.989, "T_max" : 110.369}, @@ -117,7 +126,6 @@ def plot_rho(T, rho, fit = False): def simon(): global ip, irho - for fluid, values in Simon_curves.iteritems(): axp = figp.add_subplot(Nrow, Ncol, ip); ip += 1 axrho = figrho.add_subplot(Nrow, Ncol, irho); irho += 1 @@ -125,7 +133,7 @@ def simon(): axp.set_ylabel('p [Pa]') axrho.set_xlabel('T [K]') axrho.set_ylabel('rho [mol/m$^3$]') - axp.set_title(fluid) + axp.set_title(fluid+' - '+str(round(CP.Props(fluid,"molemass"),2))) axrho.set_title(fluid) fname = os.path.join('fluids',fluid+'.json') @@ -155,6 +163,7 @@ def simon(): # x,y = plot_rho(df['T'],df['rho'],fit = True) # axrho.plot(x,y, 'o', mfc='none') + T_m = values['T_m'] for i, value in enumerate(values['parts']): Tmin = value.get('T_min',CP.Props(fluid,"Tmin")) @@ -169,6 +178,20 @@ def simon(): p = p_0 + a*((T/T_0)**c - 1) axp.plot(T, p) + + cc = 1.75 + aa = 3e8#(101325-p_0)/((T_m/T_0)**cc-1) + pt = CP.Props(fluid,'ptriple') + pp = pt + aa*((T/Tmin)**cc - 1) + axp.plot(T_m,101325,'*') + axp.plot(T,pp,'--') + + print fluid, CP.Props(fluid,"molemass"), CP.Props(fluid, 'accentric'), pp[-1]/p[-1]-1 + +# if fluid == 'Helium': +# T = np.array([326.2,345.1,362.8,385.1,419.4,459,499,535.7,570,608]) +# p = p_0 + a*((T/T_0)**c - 1) +# print p def Tr(): global ip, irho @@ -180,7 +203,7 @@ def Tr(): axp.set_ylabel('p [Pa]') axrho.set_xlabel('T [K]') axrho.set_ylabel('rho [mol/m$^3$]') - axp.set_title(fluid) + axp.set_title(fluid+' - '+str(round(CP.Props(fluid,"molemass"),2))) axrho.set_title(fluid) fname = os.path.join('fluids',fluid+'.json') @@ -217,6 +240,7 @@ def Tr(): # x,y = plot_rho(df['T'],df['rho'],fit = True) # axrho.plot(x,y, 'o', mfc='none') + T_m = values['T_m'] for i,value in enumerate(values['parts']): Tmin = value.get('T_min',CP.Props(fluid,"Tmin")) @@ -235,6 +259,15 @@ def Tr(): p = p_t*(RHS + 1) axp.plot(T, p) + + cc = 1.75 + aa = 3e8#(101325-p_0)/((T_m/T_0)**cc-1) + pt = CP.Props(fluid,'ptriple') + pp = pt + aa*((T/Tmin)**cc - 1) + axp.plot(T_m,101325,'*') + axp.plot(T,pp,'--') + + print fluid, CP.Props(fluid,"molemass"), CP.Props(fluid, 'accentric'), pp[-1]/p[-1]-1 def theta(): @@ -247,7 +280,7 @@ def theta(): axp.set_ylabel('p [Pa]') axrho.set_xlabel('T [K]') axrho.set_ylabel('rho [mol/m$^3$]') - axp.set_title(fluid) + axp.set_title(fluid+' - '+str(round(CP.Props(fluid,"molemass"),2))) axrho.set_title(fluid) fname = os.path.join('fluids',fluid+'.json') @@ -264,6 +297,7 @@ def theta(): fp.write(json.dumps(j,**json_options)) fp.close() + T_m = values['T_m'] for value in values['parts']: a = value['a'] @@ -289,6 +323,15 @@ def theta(): #x,y = plot_rho(df['T'],df['rho'],fit = True) #axrho.plot(x,y, 'o', mfc='none') + + cc = 1.75 + aa = 3e8#(101325-p_0)/((T_m/T_0)**cc-1) + pt = CP.Props(fluid,'ptriple') + pp = pt + aa*((T/Tmin)**cc - 1) + axp.plot(T_m,101325,'*') + axp.plot(T,pp,'--') + + print fluid, CP.Props(fluid,"molemass"), CP.Props(fluid, 'accentric'), pp[-1]/p[-1]-1 if __name__=='__main__': simon() From a866ad88a32b1727919c8d1dde710515fd25bfa4 Mon Sep 17 00:00:00 2001 From: Ian Bell Date: Mon, 9 Jun 2014 19:50:10 +0200 Subject: [PATCH 23/26] EES DLF file can now build using CMake - works Signed-off-by: Ian Bell --- CMakeLists.txt | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f8e6b0aa..03688c4a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,9 +32,17 @@ set (CoolProp_VERSION ${CoolProp_VERSION_MAJOR}.${CoolProp_VERSION_MINOR}.${Cool ####################################### option (COOLPROP_STATIC_LIBRARY - "Build and install CoolProp as a STATIC library (.lib, .a) as opposed to SHARED (.dll, .so)" - ON) + "Build CoolProp as a static library (.lib, .a)" + OFF) +option (COOLPROP_SHARED_LIBRARY + "Build CoolProp as a shared library (.dll, .so)" + OFF) + +option (COOLPROP_EES_MODULE + "Build the EES module" + OFF) + option (COOLPROP_TESTING "Build with test flags and include main() from catch" OFF) @@ -54,6 +62,9 @@ file(GLOB_RECURSE APP_SOURCES "src/*.cpp") file(GLOB_RECURSE APP_HEADERS "include/*.h" "src/*.h") # "externals/*.hpp") list(REMOVE_ITEM APP_SOURCES "${CMAKE_SOURCE_DIR}/src/Tests/Tests.cpp") +if (NOT DEFINED CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE CACHE Release STRING "hfsfhskj" FORCE) +endif() set (APP_INCLUDE_DIRS "") foreach (_headerFile ${APP_HEADERS}) @@ -94,16 +105,25 @@ endif() add_custom_target(generate_headers COMMAND ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/dev/generate_headers.py") - ### COOLPROP LIB or DLL ### if (COOLPROP_STATIC_LIBRARY) add_library(${app_name} STATIC ${APP_SOURCES}) -else() + add_dependencies (${app_name} generate_headers) +endif() +if (COOLPROP_SHARED_LIBRARY) add_library(${app_name} SHARED ${APP_SOURCES}) set_target_properties (${app_name} PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -DCOOLPROP_LIB") + add_dependencies (${app_name} generate_headers) endif() -add_dependencies (${app_name} generate_headers) +if (COOLPROP_EES_MODULE) + list (APPEND APP_SOURCES "wrappers/EES/main.cpp") + include_directories(${APP_INCLUDE_DIRS}) + add_library(COOLPROP_EES SHARED ${APP_SOURCES}) + set_target_properties (COOLPROP_EES PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -DCOOLPROP_LIB -DCONVENTION=__cdecl") + add_dependencies (COOLPROP_EES generate_headers) + set_target_properties(COOLPROP_EES PROPERTIES SUFFIX ".dlf" PREFIX "") +endif() ### COOLPROP TESTING APP ### if (COOLPROP_TESTING) @@ -121,7 +141,6 @@ if (COOLPROP_TESTING) endif() add_test(ProceedureTests testRunner.exe) - # C++ Documentation Test add_executable (docuTest.exe "Web/examples/C++/Example.cpp") add_dependencies (docuTest.exe ${app_name}) From 895c1de27808a62ffbea5eea97d957401a21c464 Mon Sep 17 00:00:00 2001 From: Ian Bell Date: Mon, 9 Jun 2014 21:08:04 +0200 Subject: [PATCH 24/26] CMake now working for 64-bit DLL 32-bit/cdecl DLL and 32-bit/stdcall DLL. Swig ones are next. Signed-off-by: Ian Bell --- CMakeLists.txt | 53 +++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 48 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 03688c4a..a5839854 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,10 +62,6 @@ file(GLOB_RECURSE APP_SOURCES "src/*.cpp") file(GLOB_RECURSE APP_HEADERS "include/*.h" "src/*.h") # "externals/*.hpp") list(REMOVE_ITEM APP_SOURCES "${CMAKE_SOURCE_DIR}/src/Tests/Tests.cpp") -if (NOT DEFINED CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE CACHE Release STRING "hfsfhskj" FORCE) -endif() - set (APP_INCLUDE_DIRS "") foreach (_headerFile ${APP_HEADERS}) get_filename_component(_dir ${_headerFile} PATH) @@ -103,19 +99,51 @@ endif() ### FLUIDS, MIXTURES JSON ### add_custom_target(generate_headers - COMMAND ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/dev/generate_headers.py") + COMMAND ${PYTHON_EXECUTABLE} "${CMAKE_SOURCE_DIR}/dev/generate_headers.py") ### COOLPROP LIB or DLL ### if (COOLPROP_STATIC_LIBRARY) add_library(${app_name} STATIC ${APP_SOURCES}) add_dependencies (${app_name} generate_headers) endif() + +##### COOLPROP SHARED LIBRARY ###### if (COOLPROP_SHARED_LIBRARY) add_library(${app_name} SHARED ${APP_SOURCES}) set_target_properties (${app_name} PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -DCOOLPROP_LIB") add_dependencies (${app_name} generate_headers) endif() +if (COOLPROP_64BIT_SHARED_LIBRARY) + add_library(${app_name} SHARED ${APP_SOURCES}) + set_target_properties (${app_name} PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -DCOOLPROP_LIB") + if (!MSVC) + set_target_properties(${app_name} PROPERTIES COMPILE_FLAGS "-m64" LINK_FLAGS "-m64") + endif() + add_dependencies (${app_name} generate_headers) + set_target_properties(${app_name} PROPERTIES PREFIX "") +endif() + +if (COOLPROP_32BIT_CDECL_SHARED_LIBRARY) + add_library(${app_name} SHARED ${APP_SOURCES}) + set_target_properties (${app_name} PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -DCOOLPROP_LIB -DCONVENTION=__cdecl") + if (!MSVC) + set_target_properties(${app_name} PROPERTIES COMPILE_FLAGS "-m32" LINK_FLAGS "-m32") + endif() + add_dependencies (${app_name} generate_headers) + set_target_properties(${app_name} PROPERTIES PREFIX "") +endif() + +if (COOLPROP_32BIT_STDCALL_SHARED_LIBRARY) + add_library(${app_name} SHARED ${APP_SOURCES}) + set_target_properties (${app_name} PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -DCOOLPROP_LIB -DCONVENTION=__stdcall") + if (!MSVC) + set_target_properties(${app_name} PROPERTIES COMPILE_FLAGS "-m32" LINK_FLAGS "-m32") + endif() + add_dependencies (${app_name} generate_headers) + set_target_properties(${app_name} PROPERTIES PREFIX "") +endif() + if (COOLPROP_EES_MODULE) list (APPEND APP_SOURCES "wrappers/EES/main.cpp") include_directories(${APP_INCLUDE_DIRS}) @@ -123,6 +151,21 @@ if (COOLPROP_EES_MODULE) set_target_properties (COOLPROP_EES PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -DCOOLPROP_LIB -DCONVENTION=__cdecl") add_dependencies (COOLPROP_EES generate_headers) set_target_properties(COOLPROP_EES PROPERTIES SUFFIX ".dlf" PREFIX "") + set_target_properties(COOLPROP_EES PROPERTIES COMPILE_FLAGS "-m32" LINK_FLAGS "-m32") +endif() + +if (COOLPROP_MATHEMATICA_MODULE) + + # copy "C:\Program Files\Wolfram Research\Mathematica\9.0\SystemFiles\IncludeFiles\C\WolframLibrary.h" . + # REM folder obtained from FileNameJoin[{$BaseDirectory, "SystemFiles", "LibraryResources", $SystemID}] in Mathematica + # copy CoolProp.dll "C:\ProgramData\Mathematica\SystemFiles\LibraryResources\Windows-x86-64\" + + list (APPEND APP_SOURCES "wrappers/Mathematica/CoolPropMathematica.cpp") + include_directories(${APP_INCLUDE_DIRS}) + add_library(COOLProp SHARED ${APP_SOURCES}) + set_target_properties (COOLPROP_EES PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -DCOOLPROP_LIB -DCONVENTION=__cdecl") + add_dependencies (COOLPROP_EES generate_headers) + set_target_properties(COOLPROP_EES PROPERTIES SUFFIX ".dlf" PREFIX "") endif() ### COOLPROP TESTING APP ### From 62e9a2d4decac67367add556b305ccec192f21f8 Mon Sep 17 00:00:00 2001 From: Ian Bell Date: Mon, 9 Jun 2014 23:46:43 +0200 Subject: [PATCH 25/26] Octave wrapper works on windows with MINGW builds of Octave Signed-off-by: Ian Bell --- CMakeLists.txt | 40 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a5839854..e523b0d1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -118,7 +118,7 @@ if (COOLPROP_64BIT_SHARED_LIBRARY) add_library(${app_name} SHARED ${APP_SOURCES}) set_target_properties (${app_name} PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -DCOOLPROP_LIB") if (!MSVC) - set_target_properties(${app_name} PROPERTIES COMPILE_FLAGS "-m64" LINK_FLAGS "-m64") + set_target_properties(${app_name} PROPERTIES COMPILE_FLAGS "-m64" LINK_FLAGS "-m64") endif() add_dependencies (${app_name} generate_headers) set_target_properties(${app_name} PROPERTIES PREFIX "") @@ -128,7 +128,7 @@ if (COOLPROP_32BIT_CDECL_SHARED_LIBRARY) add_library(${app_name} SHARED ${APP_SOURCES}) set_target_properties (${app_name} PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -DCOOLPROP_LIB -DCONVENTION=__cdecl") if (!MSVC) - set_target_properties(${app_name} PROPERTIES COMPILE_FLAGS "-m32" LINK_FLAGS "-m32") + set_target_properties(${app_name} PROPERTIES COMPILE_FLAGS "-m32" LINK_FLAGS "-m32") endif() add_dependencies (${app_name} generate_headers) set_target_properties(${app_name} PROPERTIES PREFIX "") @@ -138,7 +138,7 @@ if (COOLPROP_32BIT_STDCALL_SHARED_LIBRARY) add_library(${app_name} SHARED ${APP_SOURCES}) set_target_properties (${app_name} PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -DCOOLPROP_LIB -DCONVENTION=__stdcall") if (!MSVC) - set_target_properties(${app_name} PROPERTIES COMPILE_FLAGS "-m32" LINK_FLAGS "-m32") + set_target_properties(${app_name} PROPERTIES COMPILE_FLAGS "-m32" LINK_FLAGS "-m32") endif() add_dependencies (${app_name} generate_headers) set_target_properties(${app_name} PROPERTIES PREFIX "") @@ -151,9 +151,41 @@ if (COOLPROP_EES_MODULE) set_target_properties (COOLPROP_EES PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -DCOOLPROP_LIB -DCONVENTION=__cdecl") add_dependencies (COOLPROP_EES generate_headers) set_target_properties(COOLPROP_EES PROPERTIES SUFFIX ".dlf" PREFIX "") - set_target_properties(COOLPROP_EES PROPERTIES COMPILE_FLAGS "-m32" LINK_FLAGS "-m32") + if (!MSVC) + set_target_properties(COOLPROP_EES PROPERTIES COMPILE_FLAGS "-m32" LINK_FLAGS "-m32") + endif() endif() +if (COOLPROP_OCTAVE_MODULE) + + # Must have SWIG and Octave + FIND_PACKAGE(SWIG REQUIRED) + INCLUDE(${SWIG_USE_FILE}) + FIND_PACKAGE(Octave REQUIRED) + + # Find the required libraries + find_library(OCTAVE_LIB octave PATHS ${OCTAVE_LINK_DIRS}) + find_library(OCTINTERP_LIB octinterp PATHS ${OCTAVE_LINK_DIRS}) + find_library(CRUFT_LIB cruft PATHS ${OCTAVE_LINK_DIRS}) + + # Set the include folders + SET(OCTAVE_WRAP_INCLUDE_DIRS ${INCLUDE_DIR}) + foreach(ITR ${OCTAVE_INCLUDE_DIRS}) + list(APPEND OCTAVE_WRAP_INCLUDE_DIRS ${ITR}) + endforeach() + include_directories(${OCTAVE_WRAP_INCLUDE_DIRS}) + + set(I_FILE "${CMAKE_SOURCE_DIR}/src/CoolProp.i") + + SET_SOURCE_FILES_PROPERTIES(${I_FILE} PROPERTIES CPLUSPLUS ON) + SWIG_ADD_MODULE(CoolProp octave ${I_FILE} ${APP_SOURCES}) + SWIG_LINK_LIBRARIES(CoolProp ${OCTAVE_LIB} ${OCTINTERP_LIB} ${CRUFT_LIB}) + + set_target_properties(CoolProp PROPERTIES SUFFIX ".oct" PREFIX "") + +endif() + +# NOT WORKING! if (COOLPROP_MATHEMATICA_MODULE) # copy "C:\Program Files\Wolfram Research\Mathematica\9.0\SystemFiles\IncludeFiles\C\WolframLibrary.h" . From db6e794dba81fe6b133cd968f2441c4b7730a2ac Mon Sep 17 00:00:00 2001 From: Ian Bell Date: Mon, 9 Jun 2014 23:58:29 +0200 Subject: [PATCH 26/26] Now octave works on xubuntu with main CMake file - have to mkdir src folder - not sure why. --- CMakeLists.txt | 4 ++-- include/CoolProp.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e523b0d1..2f9cec95 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -166,7 +166,6 @@ if (COOLPROP_OCTAVE_MODULE) # Find the required libraries find_library(OCTAVE_LIB octave PATHS ${OCTAVE_LINK_DIRS}) find_library(OCTINTERP_LIB octinterp PATHS ${OCTAVE_LINK_DIRS}) - find_library(CRUFT_LIB cruft PATHS ${OCTAVE_LINK_DIRS}) # Set the include folders SET(OCTAVE_WRAP_INCLUDE_DIRS ${INCLUDE_DIR}) @@ -179,8 +178,9 @@ if (COOLPROP_OCTAVE_MODULE) SET_SOURCE_FILES_PROPERTIES(${I_FILE} PROPERTIES CPLUSPLUS ON) SWIG_ADD_MODULE(CoolProp octave ${I_FILE} ${APP_SOURCES}) - SWIG_LINK_LIBRARIES(CoolProp ${OCTAVE_LIB} ${OCTINTERP_LIB} ${CRUFT_LIB}) + SWIG_LINK_LIBRARIES(CoolProp ${OCTAVE_LIB} ${OCTINTERP_LIB}) + add_dependencies (CoolProp generate_headers) set_target_properties(CoolProp PROPERTIES SUFFIX ".oct" PREFIX "") endif() diff --git a/include/CoolProp.h b/include/CoolProp.h index fd7d3b22..c734b120 100644 --- a/include/CoolProp.h +++ b/include/CoolProp.h @@ -133,7 +133,7 @@ You might want to start by looking at CoolProp.h /// @param rho Density at reference state [mol/m^3] /// @param h0 Enthalpy at reference state [J/kg] /// @param s0 Entropy at references state [J/kg/K] - void set_reference_stateD(std::string FluidName, double T, double rho, double h0, double s0); + //void set_reference_stateD(std::string FluidName, double T, double rho, double h0, double s0); /* /// Return the phase of the given state point with temperature, pressure as inputs