From 261ec01c719005b28af71034f2ebe0fe9ee8f06c Mon Sep 17 00:00:00 2001 From: Ian Bell Date: Sun, 1 Jun 2014 20:20:33 +0200 Subject: [PATCH] Added REFPROP names for all fluids - renovated get_fluid_param_string --- dev/fluids/1-Butene.json | 3 +- dev/fluids/AceticAcid.json | 3 +- dev/fluids/Acetone.json | 3 +- dev/fluids/Air.json | 1 + dev/fluids/Ammonia.json | 1 + dev/fluids/Argon.json | 1 + dev/fluids/Benzene.json | 1 + dev/fluids/CarbonDioxide.json | 1 + dev/fluids/CarbonMonoxide.json | 3 +- dev/fluids/CarbonylSulfide.json | 3 +- dev/fluids/CycloHexane.json | 3 +- dev/fluids/CycloPropane.json | 3 +- dev/fluids/Cyclopentane.json | 3 +- dev/fluids/D4.json | 3 +- dev/fluids/D5.json | 3 +- dev/fluids/D6.json | 3 +- dev/fluids/Deuterium.json | 3 +- dev/fluids/DimethylCarbonate.json | 3 +- dev/fluids/DimethylEther.json | 1 + dev/fluids/Ethane.json | 1 + dev/fluids/Ethanol.json | 1 + dev/fluids/EthylBenzene.json | 3 +- dev/fluids/Ethylene.json | 3 +- dev/fluids/Fluorine.json | 3 +- dev/fluids/HFE143m.json | 3 +- dev/fluids/Helium.json | 1 + dev/fluids/Hydrogen.json | 1 + dev/fluids/HydrogenSulfide.json | 1 + dev/fluids/IsoButane.json | 1 + dev/fluids/IsoButene.json | 3 +- dev/fluids/Isohexane.json | 3 +- dev/fluids/Isopentane.json | 3 +- dev/fluids/Krypton.json | 3 +- dev/fluids/MD2M.json | 3 +- dev/fluids/MD3M.json | 3 +- dev/fluids/MD4M.json | 3 +- dev/fluids/MDM.json | 3 +- dev/fluids/MM.json | 3 +- dev/fluids/Methane.json | 3 +- dev/fluids/Methanol.json | 3 +- dev/fluids/MethylLinoleate.json | 3 +- dev/fluids/MethylLinolenate.json | 3 +- dev/fluids/MethylOleate.json | 3 +- dev/fluids/MethylPalmitate.json | 3 +- dev/fluids/MethylStearate.json | 3 +- dev/fluids/Neon.json | 3 +- dev/fluids/Neopentane.json | 3 +- dev/fluids/Nitrogen.json | 1 + dev/fluids/NitrousOxide.json | 3 +- dev/fluids/OrthoDeuterium.json | 3 +- dev/fluids/OrthoHydrogen.json | 3 +- dev/fluids/Oxygen.json | 1 + dev/fluids/ParaDeuterium.json | 3 +- dev/fluids/ParaHydrogen.json | 1 + dev/fluids/Propylene.json | 3 +- dev/fluids/Propyne.json | 3 +- dev/fluids/R11.json | 3 +- dev/fluids/R113.json | 3 +- dev/fluids/R114.json | 3 +- dev/fluids/R116.json | 3 +- dev/fluids/R12.json | 3 +- dev/fluids/R123.json | 1 + dev/fluids/R1233zd(E).json | 3 +- dev/fluids/R1234yf.json | 1 + dev/fluids/R1234ze(E).json | 1 + dev/fluids/R1234ze(Z).json | 3 +- dev/fluids/R124.json | 1 + dev/fluids/R125.json | 1 + dev/fluids/R13.json | 3 +- dev/fluids/R134a.json | 1 + dev/fluids/R14.json | 3 +- dev/fluids/R141b.json | 3 +- dev/fluids/R142b.json | 3 +- dev/fluids/R143a.json | 3 +- dev/fluids/R152A.json | 1 + dev/fluids/R161.json | 3 +- dev/fluids/R21.json | 3 +- dev/fluids/R218.json | 3 +- dev/fluids/R22.json | 3 +- dev/fluids/R227EA.json | 3 +- dev/fluids/R23.json | 1 + dev/fluids/R236EA.json | 3 +- dev/fluids/R236FA.json | 3 +- dev/fluids/R245fa.json | 3 +- dev/fluids/R32.json | 3 +- dev/fluids/R365MFC.json | 3 +- dev/fluids/R404A.json | 1 + dev/fluids/R407C.json | 1 + dev/fluids/R407F.json | 3 +- dev/fluids/R41.json | 3 +- dev/fluids/R410A.json | 1 + dev/fluids/R507A.json | 1 + dev/fluids/RC318.json | 3 +- dev/fluids/SES36.json | 3 +- dev/fluids/SulfurDioxide.json | 3 +- dev/fluids/SulfurHexafluoride.json | 1 + dev/fluids/Toluene.json | 1 + dev/fluids/Water.json | 1 + dev/fluids/Xenon.json | 3 +- dev/fluids/cis-2-Butene.json | 3 +- dev/fluids/m-Xylene.json | 3 +- dev/fluids/n-Butane.json | 1 + dev/fluids/n-Decane.json | 1 + dev/fluids/n-Dodecane.json | 1 + dev/fluids/n-Heptane.json | 1 + dev/fluids/n-Hexane.json | 1 + dev/fluids/n-Nonane.json | 1 + dev/fluids/n-Octane.json | 1 + dev/fluids/n-Pentane.json | 3 +- dev/fluids/n-Propane.json | 1 + dev/fluids/n-Undecane.json | 3 +- dev/fluids/o-Xylene.json | 3 +- dev/fluids/p-Xylene.json | 3 +- dev/fluids/trans-2-Butene.json | 3 +- include/CoolProp.h | 6 +- src/Backends/Helmholtz/Fluids/FluidLibrary.h | 6 ++ src/CoolProp.cpp | 94 ++++++++------------ src/main.cxx | 2 +- 118 files changed, 238 insertions(+), 136 deletions(-) diff --git a/dev/fluids/1-Butene.json b/dev/fluids/1-Butene.json index 52b3a187..c3898889 100644 --- a/dev/fluids/1-Butene.json +++ b/dev/fluids/1-Butene.json @@ -262,5 +262,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "1-Butene" + "NAME": "1-Butene", + "REFPROP_NAME": "1BUTENE" } \ No newline at end of file diff --git a/dev/fluids/AceticAcid.json b/dev/fluids/AceticAcid.json index 608262c0..f35e6231 100644 --- a/dev/fluids/AceticAcid.json +++ b/dev/fluids/AceticAcid.json @@ -264,5 +264,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "AceticAcid" + "NAME": "AceticAcid", + "REFPROP_NAME": "N/A" } \ No newline at end of file diff --git a/dev/fluids/Acetone.json b/dev/fluids/Acetone.json index b3985b22..de6a4773 100644 --- a/dev/fluids/Acetone.json +++ b/dev/fluids/Acetone.json @@ -258,5 +258,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "Acetone" + "NAME": "Acetone", + "REFPROP_NAME": "ACETONE" } \ No newline at end of file diff --git a/dev/fluids/Air.json b/dev/fluids/Air.json index e2d65806..63533cda 100644 --- a/dev/fluids/Air.json +++ b/dev/fluids/Air.json @@ -305,6 +305,7 @@ } ], "NAME": "Air", + "REFPROP_NAME": "AIR", "TRANSPORT": { "conductivity": { "BibTeX": "Lemmon-IJT-2004", diff --git a/dev/fluids/Ammonia.json b/dev/fluids/Ammonia.json index 0a811f9c..6a2643c9 100644 --- a/dev/fluids/Ammonia.json +++ b/dev/fluids/Ammonia.json @@ -299,6 +299,7 @@ } ], "NAME": "Ammonia", + "REFPROP_NAME": "AMMONIA", "TRANSPORT": { "conductivity": { "BibTeX": "Tufeu-BBPC-1984", diff --git a/dev/fluids/Argon.json b/dev/fluids/Argon.json index dd367736..c0138e57 100644 --- a/dev/fluids/Argon.json +++ b/dev/fluids/Argon.json @@ -391,6 +391,7 @@ } ], "NAME": "Argon", + "REFPROP_NAME": "ARGON", "TRANSPORT": { "conductivity": { "BibTeX": "Lemmon-IJT-2004", diff --git a/dev/fluids/Benzene.json b/dev/fluids/Benzene.json index 2a9d8120..fe41a18a 100644 --- a/dev/fluids/Benzene.json +++ b/dev/fluids/Benzene.json @@ -300,6 +300,7 @@ } ], "NAME": "Benzene", + "REFPROP_NAME": "BENZENE", "TRANSPORT": { "conductivity": { "BibTeX": "Assael-JPCRD-2013-Hexane", diff --git a/dev/fluids/CarbonDioxide.json b/dev/fluids/CarbonDioxide.json index 9ced3e67..1ccdcda1 100644 --- a/dev/fluids/CarbonDioxide.json +++ b/dev/fluids/CarbonDioxide.json @@ -454,6 +454,7 @@ } ], "NAME": "CarbonDioxide", + "REFPROP_NAME": "CO2", "TRANSPORT": { "conductivity": { "BibTeX": "Scalabrin-JPCRD-2006-CO2", diff --git a/dev/fluids/CarbonMonoxide.json b/dev/fluids/CarbonMonoxide.json index a149025c..bc9e63bd 100644 --- a/dev/fluids/CarbonMonoxide.json +++ b/dev/fluids/CarbonMonoxide.json @@ -263,5 +263,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "CarbonMonoxide" + "NAME": "CarbonMonoxide", + "REFPROP_NAME": "CO" } \ No newline at end of file diff --git a/dev/fluids/CarbonylSulfide.json b/dev/fluids/CarbonylSulfide.json index 84863147..8ff5fb5f 100644 --- a/dev/fluids/CarbonylSulfide.json +++ b/dev/fluids/CarbonylSulfide.json @@ -260,5 +260,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "CarbonylSulfide" + "NAME": "CarbonylSulfide", + "REFPROP_NAME": "COS" } \ No newline at end of file diff --git a/dev/fluids/CycloHexane.json b/dev/fluids/CycloHexane.json index 480c5f34..f18241ed 100644 --- a/dev/fluids/CycloHexane.json +++ b/dev/fluids/CycloHexane.json @@ -339,5 +339,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "CycloHexane" + "NAME": "CycloHexane", + "REFPROP_NAME": "CYCLOHEX" } \ No newline at end of file diff --git a/dev/fluids/CycloPropane.json b/dev/fluids/CycloPropane.json index c92b848c..e1053418 100644 --- a/dev/fluids/CycloPropane.json +++ b/dev/fluids/CycloPropane.json @@ -294,5 +294,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "CycloPropane" + "NAME": "CycloPropane", + "REFPROP_NAME": "CYCLOPRO" } \ No newline at end of file diff --git a/dev/fluids/Cyclopentane.json b/dev/fluids/Cyclopentane.json index 05a21c02..4cbf9751 100644 --- a/dev/fluids/Cyclopentane.json +++ b/dev/fluids/Cyclopentane.json @@ -287,5 +287,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "Cyclopentane" + "NAME": "Cyclopentane", + "REFPROP_NAME": "CYCLOPEN" } \ No newline at end of file diff --git a/dev/fluids/D4.json b/dev/fluids/D4.json index e4ab5e65..6536d1f1 100644 --- a/dev/fluids/D4.json +++ b/dev/fluids/D4.json @@ -255,5 +255,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "D4" + "NAME": "D4", + "REFPROP_NAME": "D4" } \ No newline at end of file diff --git a/dev/fluids/D5.json b/dev/fluids/D5.json index e349f4db..95650340 100644 --- a/dev/fluids/D5.json +++ b/dev/fluids/D5.json @@ -255,5 +255,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "D5" + "NAME": "D5", + "REFPROP_NAME": "D5" } \ No newline at end of file diff --git a/dev/fluids/D6.json b/dev/fluids/D6.json index 1b174f9e..9be10bdf 100644 --- a/dev/fluids/D6.json +++ b/dev/fluids/D6.json @@ -246,5 +246,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "D6" + "NAME": "D6", + "REFPROP_NAME": "D6" } \ No newline at end of file diff --git a/dev/fluids/Deuterium.json b/dev/fluids/Deuterium.json index 1b7487e5..39610892 100644 --- a/dev/fluids/Deuterium.json +++ b/dev/fluids/Deuterium.json @@ -351,5 +351,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "Deuterium" + "NAME": "Deuterium", + "REFPROP_NAME": "D2" } \ No newline at end of file diff --git a/dev/fluids/DimethylCarbonate.json b/dev/fluids/DimethylCarbonate.json index c6f2ea52..4921ba6d 100644 --- a/dev/fluids/DimethylCarbonate.json +++ b/dev/fluids/DimethylCarbonate.json @@ -309,5 +309,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "DimethylCarbonate" + "NAME": "DimethylCarbonate", + "REFPROP_NAME": "DMC" } \ No newline at end of file diff --git a/dev/fluids/DimethylEther.json b/dev/fluids/DimethylEther.json index 2a746278..916cdc18 100644 --- a/dev/fluids/DimethylEther.json +++ b/dev/fluids/DimethylEther.json @@ -301,6 +301,7 @@ } ], "NAME": "DimethylEther", + "REFPROP_NAME": "DME", "TRANSPORT": { "viscosity": { "BibTeX": "Meng-JCED-2012", diff --git a/dev/fluids/Ethane.json b/dev/fluids/Ethane.json index c572b350..c9d547de 100644 --- a/dev/fluids/Ethane.json +++ b/dev/fluids/Ethane.json @@ -423,6 +423,7 @@ } ], "NAME": "Ethane", + "REFPROP_NAME": "ETHANE", "TRANSPORT": { "conductivity": { "BibTeX": "Friend-JPCRD-1991", diff --git a/dev/fluids/Ethanol.json b/dev/fluids/Ethanol.json index c09b7065..3ff89cf0 100644 --- a/dev/fluids/Ethanol.json +++ b/dev/fluids/Ethanol.json @@ -358,6 +358,7 @@ } ], "NAME": "Ethanol", + "REFPROP_NAME": "ETHANOL", "TRANSPORT": { "conductivity": { "BibTeX": "Assael-JPCRD-2013-Ethanol", diff --git a/dev/fluids/EthylBenzene.json b/dev/fluids/EthylBenzene.json index e05c6032..9547449a 100644 --- a/dev/fluids/EthylBenzene.json +++ b/dev/fluids/EthylBenzene.json @@ -281,5 +281,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "EthylBenzene" + "NAME": "EthylBenzene", + "REFPROP_NAME": "EBENZENE" } \ No newline at end of file diff --git a/dev/fluids/Ethylene.json b/dev/fluids/Ethylene.json index 2e030b2b..a3229408 100644 --- a/dev/fluids/Ethylene.json +++ b/dev/fluids/Ethylene.json @@ -384,5 +384,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "Ethylene" + "NAME": "Ethylene", + "REFPROP_NAME": "ETHYLENE" } \ No newline at end of file diff --git a/dev/fluids/Fluorine.json b/dev/fluids/Fluorine.json index cfec5aaa..b1a9d1cd 100644 --- a/dev/fluids/Fluorine.json +++ b/dev/fluids/Fluorine.json @@ -381,5 +381,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "Fluorine" + "NAME": "Fluorine", + "REFPROP_NAME": "FLUORINE" } \ No newline at end of file diff --git a/dev/fluids/HFE143m.json b/dev/fluids/HFE143m.json index ac807031..eaf7e74f 100644 --- a/dev/fluids/HFE143m.json +++ b/dev/fluids/HFE143m.json @@ -265,5 +265,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "HFE143m" + "NAME": "HFE143m", + "REFPROP_NAME": "RE143A" } \ No newline at end of file diff --git a/dev/fluids/Helium.json b/dev/fluids/Helium.json index a4815475..e469b4a1 100644 --- a/dev/fluids/Helium.json +++ b/dev/fluids/Helium.json @@ -331,6 +331,7 @@ } ], "NAME": "Helium", + "REFPROP_NAME": "HELIUM", "TRANSPORT": { "conductivity": { "BibTeX": "HANDS-CRYO-1981", diff --git a/dev/fluids/Hydrogen.json b/dev/fluids/Hydrogen.json index 8c89b73a..5798b1fe 100644 --- a/dev/fluids/Hydrogen.json +++ b/dev/fluids/Hydrogen.json @@ -309,6 +309,7 @@ } ], "NAME": "Hydrogen", + "REFPROP_NAME": "HYDROGEN", "TRANSPORT": { "conductivity": { "BibTeX": "Assael-JPCRD-2011-Hydrogen", diff --git a/dev/fluids/HydrogenSulfide.json b/dev/fluids/HydrogenSulfide.json index 0a2ddead..07e0f747 100644 --- a/dev/fluids/HydrogenSulfide.json +++ b/dev/fluids/HydrogenSulfide.json @@ -266,6 +266,7 @@ } ], "NAME": "HydrogenSulfide", + "REFPROP_NAME": "H2S", "TRANSPORT": { "viscosity": { "BibTeX": "QuinonesCisneros-JCED-2012", diff --git a/dev/fluids/IsoButane.json b/dev/fluids/IsoButane.json index 2e087e43..e5f45417 100644 --- a/dev/fluids/IsoButane.json +++ b/dev/fluids/IsoButane.json @@ -346,6 +346,7 @@ } ], "NAME": "IsoButane", + "REFPROP_NAME": "ISOBUTAN", "TRANSPORT": { "conductivity": { "BibTeX": "Perkins-JCED-2002-Isobutane", diff --git a/dev/fluids/IsoButene.json b/dev/fluids/IsoButene.json index 53800694..dbe674cd 100644 --- a/dev/fluids/IsoButene.json +++ b/dev/fluids/IsoButene.json @@ -260,5 +260,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "IsoButene" + "NAME": "IsoButene", + "REFPROP_NAME": "IBUTENE" } \ No newline at end of file diff --git a/dev/fluids/Isohexane.json b/dev/fluids/Isohexane.json index df73368d..cd28d2a9 100644 --- a/dev/fluids/Isohexane.json +++ b/dev/fluids/Isohexane.json @@ -260,5 +260,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "Isohexane" + "NAME": "Isohexane", + "REFPROP_NAME": "IHEXANE" } \ No newline at end of file diff --git a/dev/fluids/Isopentane.json b/dev/fluids/Isopentane.json index bee8f039..95e3eeec 100644 --- a/dev/fluids/Isopentane.json +++ b/dev/fluids/Isopentane.json @@ -261,5 +261,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "Isopentane" + "NAME": "Isopentane", + "REFPROP_NAME": "IPENTANE" } \ No newline at end of file diff --git a/dev/fluids/Krypton.json b/dev/fluids/Krypton.json index 2c6bd31f..f44725d0 100644 --- a/dev/fluids/Krypton.json +++ b/dev/fluids/Krypton.json @@ -245,5 +245,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "Krypton" + "NAME": "Krypton", + "REFPROP_NAME": "KRYPTON" } \ No newline at end of file diff --git a/dev/fluids/MD2M.json b/dev/fluids/MD2M.json index 711834fd..36f86df1 100644 --- a/dev/fluids/MD2M.json +++ b/dev/fluids/MD2M.json @@ -246,5 +246,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "MD2M" + "NAME": "MD2M", + "REFPROP_NAME": "MD2M" } \ No newline at end of file diff --git a/dev/fluids/MD3M.json b/dev/fluids/MD3M.json index 917d2d7e..dead4c37 100644 --- a/dev/fluids/MD3M.json +++ b/dev/fluids/MD3M.json @@ -246,5 +246,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "MD3M" + "NAME": "MD3M", + "REFPROP_NAME": "MD3M" } \ No newline at end of file diff --git a/dev/fluids/MD4M.json b/dev/fluids/MD4M.json index b06ac13f..c6181478 100644 --- a/dev/fluids/MD4M.json +++ b/dev/fluids/MD4M.json @@ -244,5 +244,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "MD4M" + "NAME": "MD4M", + "REFPROP_NAME": "MD4M" } \ No newline at end of file diff --git a/dev/fluids/MDM.json b/dev/fluids/MDM.json index 69aed167..c7bd7c6f 100644 --- a/dev/fluids/MDM.json +++ b/dev/fluids/MDM.json @@ -246,5 +246,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "MDM" + "NAME": "MDM", + "REFPROP_NAME": "MDM" } \ No newline at end of file diff --git a/dev/fluids/MM.json b/dev/fluids/MM.json index d525dc4a..62d5d27d 100644 --- a/dev/fluids/MM.json +++ b/dev/fluids/MM.json @@ -255,5 +255,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "MM" + "NAME": "MM", + "REFPROP_NAME": "MM" } \ No newline at end of file diff --git a/dev/fluids/Methane.json b/dev/fluids/Methane.json index cf4dd61a..861c5022 100644 --- a/dev/fluids/Methane.json +++ b/dev/fluids/Methane.json @@ -408,5 +408,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "Methane" + "NAME": "Methane", + "REFPROP_NAME": "METHANE" } \ No newline at end of file diff --git a/dev/fluids/Methanol.json b/dev/fluids/Methanol.json index e9d0a550..45baaac7 100644 --- a/dev/fluids/Methanol.json +++ b/dev/fluids/Methanol.json @@ -303,5 +303,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "Methanol" + "NAME": "Methanol", + "REFPROP_NAME": "METHANOL" } \ No newline at end of file diff --git a/dev/fluids/MethylLinoleate.json b/dev/fluids/MethylLinoleate.json index 3440f3d3..6898d588 100644 --- a/dev/fluids/MethylLinoleate.json +++ b/dev/fluids/MethylLinoleate.json @@ -283,5 +283,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "MethylLinoleate" + "NAME": "MethylLinoleate", + "REFPROP_NAME": "MLINOLEA" } \ No newline at end of file diff --git a/dev/fluids/MethylLinolenate.json b/dev/fluids/MethylLinolenate.json index bfe52f8d..b6f15b68 100644 --- a/dev/fluids/MethylLinolenate.json +++ b/dev/fluids/MethylLinolenate.json @@ -287,5 +287,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "MethylLinolenate" + "NAME": "MethylLinolenate", + "REFPROP_NAME": "MLINOLEN" } \ No newline at end of file diff --git a/dev/fluids/MethylOleate.json b/dev/fluids/MethylOleate.json index dd3c34ad..55bd59e8 100644 --- a/dev/fluids/MethylOleate.json +++ b/dev/fluids/MethylOleate.json @@ -287,5 +287,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "MethylOleate" + "NAME": "MethylOleate", + "REFPROP_NAME": "MOLEATE" } \ No newline at end of file diff --git a/dev/fluids/MethylPalmitate.json b/dev/fluids/MethylPalmitate.json index a6f4426b..58bf45d4 100644 --- a/dev/fluids/MethylPalmitate.json +++ b/dev/fluids/MethylPalmitate.json @@ -287,5 +287,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "MethylPalmitate" + "NAME": "MethylPalmitate", + "REFPROP_NAME": "MPALMITA" } \ No newline at end of file diff --git a/dev/fluids/MethylStearate.json b/dev/fluids/MethylStearate.json index bb89ce7e..e90ad623 100644 --- a/dev/fluids/MethylStearate.json +++ b/dev/fluids/MethylStearate.json @@ -287,5 +287,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "MethylStearate" + "NAME": "MethylStearate", + "REFPROP_NAME": "MSTEARAT" } \ No newline at end of file diff --git a/dev/fluids/Neon.json b/dev/fluids/Neon.json index 88a74103..f74d2552 100644 --- a/dev/fluids/Neon.json +++ b/dev/fluids/Neon.json @@ -317,5 +317,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "Neon" + "NAME": "Neon", + "REFPROP_NAME": "NEON" } \ No newline at end of file diff --git a/dev/fluids/Neopentane.json b/dev/fluids/Neopentane.json index db37c727..4a3545d5 100644 --- a/dev/fluids/Neopentane.json +++ b/dev/fluids/Neopentane.json @@ -249,5 +249,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "Neopentane" + "NAME": "Neopentane", + "REFPROP_NAME": "NEOPENTN" } \ No newline at end of file diff --git a/dev/fluids/Nitrogen.json b/dev/fluids/Nitrogen.json index cd619b19..a0439d9a 100644 --- a/dev/fluids/Nitrogen.json +++ b/dev/fluids/Nitrogen.json @@ -394,6 +394,7 @@ } ], "NAME": "Nitrogen", + "REFPROP_NAME": "NITROGEN", "TRANSPORT": { "conductivity": { "BibTeX": "Lemmon-IJT-2004", diff --git a/dev/fluids/NitrousOxide.json b/dev/fluids/NitrousOxide.json index 68abc8df..178ba758 100644 --- a/dev/fluids/NitrousOxide.json +++ b/dev/fluids/NitrousOxide.json @@ -258,5 +258,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "NitrousOxide" + "NAME": "NitrousOxide", + "REFPROP_NAME": "N2O" } \ No newline at end of file diff --git a/dev/fluids/OrthoDeuterium.json b/dev/fluids/OrthoDeuterium.json index 97cdbd23..b866196d 100644 --- a/dev/fluids/OrthoDeuterium.json +++ b/dev/fluids/OrthoDeuterium.json @@ -328,5 +328,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "OrthoDeuterium" + "NAME": "OrthoDeuterium", + "REFPROP_NAME": "N/A" } \ No newline at end of file diff --git a/dev/fluids/OrthoHydrogen.json b/dev/fluids/OrthoHydrogen.json index 114cc2aa..ed91c437 100644 --- a/dev/fluids/OrthoHydrogen.json +++ b/dev/fluids/OrthoHydrogen.json @@ -290,5 +290,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "OrthoHydrogen" + "NAME": "OrthoHydrogen", + "REFPROP_NAME": "ORTHOHYD" } \ No newline at end of file diff --git a/dev/fluids/Oxygen.json b/dev/fluids/Oxygen.json index e2c5dd87..74728d70 100644 --- a/dev/fluids/Oxygen.json +++ b/dev/fluids/Oxygen.json @@ -367,6 +367,7 @@ } ], "NAME": "Oxygen", + "REFPROP_NAME": "OXYGEN", "TRANSPORT": { "conductivity": { "BibTeX": "Lemmon-IJT-2004", diff --git a/dev/fluids/ParaDeuterium.json b/dev/fluids/ParaDeuterium.json index 59b47064..fac3de93 100644 --- a/dev/fluids/ParaDeuterium.json +++ b/dev/fluids/ParaDeuterium.json @@ -326,5 +326,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "ParaDeuterium" + "NAME": "ParaDeuterium", + "REFPROP_NAME": "N/A" } \ No newline at end of file diff --git a/dev/fluids/ParaHydrogen.json b/dev/fluids/ParaHydrogen.json index 02a529c7..b984cece 100644 --- a/dev/fluids/ParaHydrogen.json +++ b/dev/fluids/ParaHydrogen.json @@ -308,6 +308,7 @@ } ], "NAME": "ParaHydrogen", + "REFPROP_NAME": "PARAHYD", "TRANSPORT": { "conductivity": { "BibTeX": "Assael-JPCRD-2011-Hydrogen", diff --git a/dev/fluids/Propylene.json b/dev/fluids/Propylene.json index 0eac952b..26fd9667 100644 --- a/dev/fluids/Propylene.json +++ b/dev/fluids/Propylene.json @@ -340,5 +340,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "Propylene" + "NAME": "Propylene", + "REFPROP_NAME": "PROPYLEN" } \ No newline at end of file diff --git a/dev/fluids/Propyne.json b/dev/fluids/Propyne.json index 3f39b254..d8e1811c 100644 --- a/dev/fluids/Propyne.json +++ b/dev/fluids/Propyne.json @@ -323,5 +323,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "Propyne" + "NAME": "Propyne", + "REFPROP_NAME": "PROPYNE" } \ No newline at end of file diff --git a/dev/fluids/R11.json b/dev/fluids/R11.json index 9b747a80..20106eca 100644 --- a/dev/fluids/R11.json +++ b/dev/fluids/R11.json @@ -278,5 +278,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "R11" + "NAME": "R11", + "REFPROP_NAME": "R11" } \ No newline at end of file diff --git a/dev/fluids/R113.json b/dev/fluids/R113.json index bd01a444..54228ebc 100644 --- a/dev/fluids/R113.json +++ b/dev/fluids/R113.json @@ -281,5 +281,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "R113" + "NAME": "R113", + "REFPROP_NAME": "R113" } \ No newline at end of file diff --git a/dev/fluids/R114.json b/dev/fluids/R114.json index 4e0f9fdb..993b7857 100644 --- a/dev/fluids/R114.json +++ b/dev/fluids/R114.json @@ -320,5 +320,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "R114" + "NAME": "R114", + "REFPROP_NAME": "R114" } \ No newline at end of file diff --git a/dev/fluids/R116.json b/dev/fluids/R116.json index 843e0776..91db3049 100644 --- a/dev/fluids/R116.json +++ b/dev/fluids/R116.json @@ -257,5 +257,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "R116" + "NAME": "R116", + "REFPROP_NAME": "R116" } \ No newline at end of file diff --git a/dev/fluids/R12.json b/dev/fluids/R12.json index acd535f7..b002d218 100644 --- a/dev/fluids/R12.json +++ b/dev/fluids/R12.json @@ -299,5 +299,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "R12" + "NAME": "R12", + "REFPROP_NAME": "R12" } \ No newline at end of file diff --git a/dev/fluids/R123.json b/dev/fluids/R123.json index 036f4bfd..eef09efa 100644 --- a/dev/fluids/R123.json +++ b/dev/fluids/R123.json @@ -264,6 +264,7 @@ } ], "NAME": "R123", + "REFPROP_NAME": "R123", "TRANSPORT": { "conductivity": { "BibTeX": "Laesecke-IJR-1996", diff --git a/dev/fluids/R1233zd(E).json b/dev/fluids/R1233zd(E).json index e33befaf..24d78f24 100644 --- a/dev/fluids/R1233zd(E).json +++ b/dev/fluids/R1233zd(E).json @@ -290,5 +290,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "R1233zd(E)" + "NAME": "R1233zd(E)", + "REFPROP_NAME": "R1233ZD" } \ No newline at end of file diff --git a/dev/fluids/R1234yf.json b/dev/fluids/R1234yf.json index 214503e8..b8587f3c 100644 --- a/dev/fluids/R1234yf.json +++ b/dev/fluids/R1234yf.json @@ -304,6 +304,7 @@ } ], "NAME": "R1234yf", + "REFPROP_NAME": "R1234YF", "TRANSPORT": { "conductivity": { "BibTeX": "Perkins-JCED-2011", diff --git a/dev/fluids/R1234ze(E).json b/dev/fluids/R1234ze(E).json index 7ee9e921..e75af05e 100644 --- a/dev/fluids/R1234ze(E).json +++ b/dev/fluids/R1234ze(E).json @@ -293,6 +293,7 @@ } ], "NAME": "R1234ze(E)", + "REFPROP_NAME": "R1234ZE", "TRANSPORT": { "conductivity": { "BibTeX": "Perkins-JCED-2011", diff --git a/dev/fluids/R1234ze(Z).json b/dev/fluids/R1234ze(Z).json index 5cf8152f..08c580be 100644 --- a/dev/fluids/R1234ze(Z).json +++ b/dev/fluids/R1234ze(Z).json @@ -259,5 +259,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "R1234ze(Z)" + "NAME": "R1234ze(Z)", + "REFPROP_NAME": "N/A" } \ No newline at end of file diff --git a/dev/fluids/R124.json b/dev/fluids/R124.json index 83dbb172..4bc6f8fa 100644 --- a/dev/fluids/R124.json +++ b/dev/fluids/R124.json @@ -288,6 +288,7 @@ } ], "NAME": "R124", + "REFPROP_NAME": "R124", "TRANSPORT": { "conductivity": { "BibTeX": "", diff --git a/dev/fluids/R125.json b/dev/fluids/R125.json index 34b7158a..dd2bac56 100644 --- a/dev/fluids/R125.json +++ b/dev/fluids/R125.json @@ -309,6 +309,7 @@ } ], "NAME": "R125", + "REFPROP_NAME": "R125", "TRANSPORT": { "conductivity": { "BibTeX": "Perkins-JCED-2006", diff --git a/dev/fluids/R13.json b/dev/fluids/R13.json index 6b6c0df2..9c49196d 100644 --- a/dev/fluids/R13.json +++ b/dev/fluids/R13.json @@ -320,5 +320,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "R13" + "NAME": "R13", + "REFPROP_NAME": "R13" } \ No newline at end of file diff --git a/dev/fluids/R134a.json b/dev/fluids/R134a.json index 9ad02a0f..68a85595 100644 --- a/dev/fluids/R134a.json +++ b/dev/fluids/R134a.json @@ -292,6 +292,7 @@ } ], "NAME": "R134a", + "REFPROP_NAME": "R134A", "TRANSPORT": { "viscosity": { "BibTeX": "Huber-IECR-2003", diff --git a/dev/fluids/R14.json b/dev/fluids/R14.json index ea5bf9b8..0ef0a2bd 100644 --- a/dev/fluids/R14.json +++ b/dev/fluids/R14.json @@ -320,5 +320,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "R14" + "NAME": "R14", + "REFPROP_NAME": "R14" } \ No newline at end of file diff --git a/dev/fluids/R141b.json b/dev/fluids/R141b.json index fec472a3..50ca1a7e 100644 --- a/dev/fluids/R141b.json +++ b/dev/fluids/R141b.json @@ -259,5 +259,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "R141b" + "NAME": "R141b", + "REFPROP_NAME": "R141B" } \ No newline at end of file diff --git a/dev/fluids/R142b.json b/dev/fluids/R142b.json index 986ad01c..c9855fbd 100644 --- a/dev/fluids/R142b.json +++ b/dev/fluids/R142b.json @@ -259,5 +259,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "R142b" + "NAME": "R142b", + "REFPROP_NAME": "R142B" } \ No newline at end of file diff --git a/dev/fluids/R143a.json b/dev/fluids/R143a.json index ddebaeb0..8a47fbac 100644 --- a/dev/fluids/R143a.json +++ b/dev/fluids/R143a.json @@ -286,5 +286,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "R143a" + "NAME": "R143a", + "REFPROP_NAME": "R143A" } \ No newline at end of file diff --git a/dev/fluids/R152A.json b/dev/fluids/R152A.json index 60bd872d..5d4aed06 100644 --- a/dev/fluids/R152A.json +++ b/dev/fluids/R152A.json @@ -258,6 +258,7 @@ } ], "NAME": "R152A", + "REFPROP_NAME": "R152A", "TRANSPORT": { "conductivity": { "BibTeX": "Krauss-IJT-1996", diff --git a/dev/fluids/R161.json b/dev/fluids/R161.json index 3ebd8762..b3ca9313 100644 --- a/dev/fluids/R161.json +++ b/dev/fluids/R161.json @@ -302,5 +302,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "R161" + "NAME": "R161", + "REFPROP_NAME": "R161" } \ No newline at end of file diff --git a/dev/fluids/R21.json b/dev/fluids/R21.json index 3f3a6d25..c5360b7e 100644 --- a/dev/fluids/R21.json +++ b/dev/fluids/R21.json @@ -320,5 +320,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "R21" + "NAME": "R21", + "REFPROP_NAME": "R21" } \ No newline at end of file diff --git a/dev/fluids/R218.json b/dev/fluids/R218.json index 1f789d85..fbc90426 100644 --- a/dev/fluids/R218.json +++ b/dev/fluids/R218.json @@ -255,5 +255,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "R218" + "NAME": "R218", + "REFPROP_NAME": "R218" } \ No newline at end of file diff --git a/dev/fluids/R22.json b/dev/fluids/R22.json index b3383913..2b8d8509 100644 --- a/dev/fluids/R22.json +++ b/dev/fluids/R22.json @@ -378,5 +378,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "R22" + "NAME": "R22", + "REFPROP_NAME": "R22" } \ No newline at end of file diff --git a/dev/fluids/R227EA.json b/dev/fluids/R227EA.json index df5dc099..b19997a7 100644 --- a/dev/fluids/R227EA.json +++ b/dev/fluids/R227EA.json @@ -321,5 +321,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "R227EA" + "NAME": "R227EA", + "REFPROP_NAME": "R227EA" } \ No newline at end of file diff --git a/dev/fluids/R23.json b/dev/fluids/R23.json index 58e7c5aa..3d5f0438 100644 --- a/dev/fluids/R23.json +++ b/dev/fluids/R23.json @@ -280,6 +280,7 @@ } ], "NAME": "R23", + "REFPROP_NAME": "R23", "TRANSPORT": { "conductivity": { "BibTeX": "Shan-ASHRAE-2000", diff --git a/dev/fluids/R236EA.json b/dev/fluids/R236EA.json index 1e94f308..291a5bf1 100644 --- a/dev/fluids/R236EA.json +++ b/dev/fluids/R236EA.json @@ -305,5 +305,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "R236EA" + "NAME": "R236EA", + "REFPROP_NAME": "R236EA" } \ No newline at end of file diff --git a/dev/fluids/R236FA.json b/dev/fluids/R236FA.json index 0b4ea388..3dc475d7 100644 --- a/dev/fluids/R236FA.json +++ b/dev/fluids/R236FA.json @@ -301,5 +301,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "R236FA" + "NAME": "R236FA", + "REFPROP_NAME": "R236FA" } \ No newline at end of file diff --git a/dev/fluids/R245fa.json b/dev/fluids/R245fa.json index 41919ace..1e93a4a4 100644 --- a/dev/fluids/R245fa.json +++ b/dev/fluids/R245fa.json @@ -261,5 +261,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "R245fa" + "NAME": "R245fa", + "REFPROP_NAME": "R245FA" } \ No newline at end of file diff --git a/dev/fluids/R32.json b/dev/fluids/R32.json index 320f8bf6..6b7f2aa7 100644 --- a/dev/fluids/R32.json +++ b/dev/fluids/R32.json @@ -285,5 +285,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "R32" + "NAME": "R32", + "REFPROP_NAME": "R32" } \ No newline at end of file diff --git a/dev/fluids/R365MFC.json b/dev/fluids/R365MFC.json index 379a3766..224294da 100644 --- a/dev/fluids/R365MFC.json +++ b/dev/fluids/R365MFC.json @@ -296,5 +296,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "R365MFC" + "NAME": "R365MFC", + "REFPROP_NAME": "R365MFC" } \ No newline at end of file diff --git a/dev/fluids/R404A.json b/dev/fluids/R404A.json index 910868f8..4befa7aa 100644 --- a/dev/fluids/R404A.json +++ b/dev/fluids/R404A.json @@ -296,6 +296,7 @@ } ], "NAME": "R404A", + "REFPROP_NAME": "R404A", "TRANSPORT": { "conductivity": { "BibTeX": "Geller-PURDUE-2001", diff --git a/dev/fluids/R407C.json b/dev/fluids/R407C.json index 35dce116..4e9e0136 100644 --- a/dev/fluids/R407C.json +++ b/dev/fluids/R407C.json @@ -292,6 +292,7 @@ } ], "NAME": "R407C", + "REFPROP_NAME": "R407C", "TRANSPORT": { "conductivity": { "BibTeX": "Geller-PURDUE-2001", diff --git a/dev/fluids/R407F.json b/dev/fluids/R407F.json index dd407b23..529f22e7 100644 --- a/dev/fluids/R407F.json +++ b/dev/fluids/R407F.json @@ -249,5 +249,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "R407F" + "NAME": "R407F", + "REFPROP_NAME": "N/A" } \ No newline at end of file diff --git a/dev/fluids/R41.json b/dev/fluids/R41.json index 9670a2d5..bc4e6ce0 100644 --- a/dev/fluids/R41.json +++ b/dev/fluids/R41.json @@ -262,5 +262,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "R41" + "NAME": "R41", + "REFPROP_NAME": "R41" } \ No newline at end of file diff --git a/dev/fluids/R410A.json b/dev/fluids/R410A.json index 1d03943c..17098709 100644 --- a/dev/fluids/R410A.json +++ b/dev/fluids/R410A.json @@ -292,6 +292,7 @@ } ], "NAME": "R410A", + "REFPROP_NAME": "R410A", "TRANSPORT": { "conductivity": { "BibTeX": "Geller-PURDUE-2001", diff --git a/dev/fluids/R507A.json b/dev/fluids/R507A.json index 66095656..488d6107 100644 --- a/dev/fluids/R507A.json +++ b/dev/fluids/R507A.json @@ -296,6 +296,7 @@ } ], "NAME": "R507A", + "REFPROP_NAME": "R507A", "TRANSPORT": { "conductivity": { "BibTeX": "Geller-PURDUE-2001", diff --git a/dev/fluids/RC318.json b/dev/fluids/RC318.json index 6cacc789..c468a7e6 100644 --- a/dev/fluids/RC318.json +++ b/dev/fluids/RC318.json @@ -318,5 +318,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "RC318" + "NAME": "RC318", + "REFPROP_NAME": "RC318" } \ No newline at end of file diff --git a/dev/fluids/SES36.json b/dev/fluids/SES36.json index b7a9fb3a..cdce49c3 100644 --- a/dev/fluids/SES36.json +++ b/dev/fluids/SES36.json @@ -266,5 +266,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "SES36" + "NAME": "SES36", + "REFPROP_NAME": "SES36" } \ No newline at end of file diff --git a/dev/fluids/SulfurDioxide.json b/dev/fluids/SulfurDioxide.json index c2f1a851..e744204a 100644 --- a/dev/fluids/SulfurDioxide.json +++ b/dev/fluids/SulfurDioxide.json @@ -269,5 +269,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "SulfurDioxide" + "NAME": "SulfurDioxide", + "REFPROP_NAME": "SO2" } \ No newline at end of file diff --git a/dev/fluids/SulfurHexafluoride.json b/dev/fluids/SulfurHexafluoride.json index 99a32723..e0cadc05 100644 --- a/dev/fluids/SulfurHexafluoride.json +++ b/dev/fluids/SulfurHexafluoride.json @@ -416,6 +416,7 @@ } ], "NAME": "SulfurHexafluoride", + "REFPROP_NAME": "SF6", "TRANSPORT": { "conductivity": { "BibTeX": "Assael-JPCRD-2012-SF6", diff --git a/dev/fluids/Toluene.json b/dev/fluids/Toluene.json index 3356eab0..8af8516a 100644 --- a/dev/fluids/Toluene.json +++ b/dev/fluids/Toluene.json @@ -263,6 +263,7 @@ } ], "NAME": "Toluene", + "REFPROP_NAME": "TOLUENE", "TRANSPORT": { "conductivity": { "BibTeX": "Assael-JPCRD-2012-Toluene", diff --git a/dev/fluids/Water.json b/dev/fluids/Water.json index 22a60060..eaa2e31d 100644 --- a/dev/fluids/Water.json +++ b/dev/fluids/Water.json @@ -496,6 +496,7 @@ } ], "NAME": "Water", + "REFPROP_NAME": "WATER", "TRANSPORT": { "conductivity": { "BibTeX": "Huber-JPCRD-2012", diff --git a/dev/fluids/Xenon.json b/dev/fluids/Xenon.json index 5c276b09..cf717e12 100644 --- a/dev/fluids/Xenon.json +++ b/dev/fluids/Xenon.json @@ -248,5 +248,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "Xenon" + "NAME": "Xenon", + "REFPROP_NAME": "XENON" } \ No newline at end of file diff --git a/dev/fluids/cis-2-Butene.json b/dev/fluids/cis-2-Butene.json index b511998f..e1e4efb6 100644 --- a/dev/fluids/cis-2-Butene.json +++ b/dev/fluids/cis-2-Butene.json @@ -249,5 +249,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "cis-2-Butene" + "NAME": "cis-2-Butene", + "REFPROP_NAME": "C2BUTENE" } \ No newline at end of file diff --git a/dev/fluids/m-Xylene.json b/dev/fluids/m-Xylene.json index 2ee7ae21..725f0fff 100644 --- a/dev/fluids/m-Xylene.json +++ b/dev/fluids/m-Xylene.json @@ -280,5 +280,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "m-Xylene" + "NAME": "m-Xylene", + "REFPROP_NAME": "MXYLENE" } \ No newline at end of file diff --git a/dev/fluids/n-Butane.json b/dev/fluids/n-Butane.json index 9c9d4a75..012b14e1 100644 --- a/dev/fluids/n-Butane.json +++ b/dev/fluids/n-Butane.json @@ -338,6 +338,7 @@ } ], "NAME": "n-Butane", + "REFPROP_NAME": "BUTANE", "TRANSPORT": { "conductivity": { "BibTeX": "Perkins-JCED-2002-nButane", diff --git a/dev/fluids/n-Decane.json b/dev/fluids/n-Decane.json index 4a4d03c4..abbce41d 100644 --- a/dev/fluids/n-Decane.json +++ b/dev/fluids/n-Decane.json @@ -263,6 +263,7 @@ } ], "NAME": "n-Decane", + "REFPROP_NAME": "DECANE", "TRANSPORT": { "conductivity": { "BibTeX": "Huber-FPE-2005", diff --git a/dev/fluids/n-Dodecane.json b/dev/fluids/n-Dodecane.json index 65c3d8af..a3e332ac 100644 --- a/dev/fluids/n-Dodecane.json +++ b/dev/fluids/n-Dodecane.json @@ -265,6 +265,7 @@ } ], "NAME": "n-Dodecane", + "REFPROP_NAME": "C12", "TRANSPORT": { "conductivity": { "BibTeX": "Huber-FPE-2005", diff --git a/dev/fluids/n-Heptane.json b/dev/fluids/n-Heptane.json index 3ea120f2..cc87d27f 100644 --- a/dev/fluids/n-Heptane.json +++ b/dev/fluids/n-Heptane.json @@ -274,6 +274,7 @@ } ], "NAME": "n-Heptane", + "REFPROP_NAME": "HEPTANE", "TRANSPORT": { "conductivity": { "BibTeX": "Assael-JPCRD-2013-Heptane", diff --git a/dev/fluids/n-Hexane.json b/dev/fluids/n-Hexane.json index 5171155a..77898952 100644 --- a/dev/fluids/n-Hexane.json +++ b/dev/fluids/n-Hexane.json @@ -274,6 +274,7 @@ } ], "NAME": "n-Hexane", + "REFPROP_NAME": "HEXANE", "TRANSPORT": { "conductivity": { "BibTeX": "Assael-JPCRD-2013-Hexane", diff --git a/dev/fluids/n-Nonane.json b/dev/fluids/n-Nonane.json index b674fdc9..fef68469 100644 --- a/dev/fluids/n-Nonane.json +++ b/dev/fluids/n-Nonane.json @@ -262,6 +262,7 @@ } ], "NAME": "n-Nonane", + "REFPROP_NAME": "NONANE", "TRANSPORT": { "conductivity": { "BibTeX": "Huber-FPE-2005", diff --git a/dev/fluids/n-Octane.json b/dev/fluids/n-Octane.json index 91332198..fcfc7804 100644 --- a/dev/fluids/n-Octane.json +++ b/dev/fluids/n-Octane.json @@ -276,6 +276,7 @@ } ], "NAME": "n-Octane", + "REFPROP_NAME": "OCTANE", "TRANSPORT": { "conductivity": { "BibTeX": "Huber-FPE-2005", diff --git a/dev/fluids/n-Pentane.json b/dev/fluids/n-Pentane.json index 2a08cde2..ab17afa1 100644 --- a/dev/fluids/n-Pentane.json +++ b/dev/fluids/n-Pentane.json @@ -276,5 +276,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "n-Pentane" + "NAME": "n-Pentane", + "REFPROP_NAME": "PENTANE" } \ No newline at end of file diff --git a/dev/fluids/n-Propane.json b/dev/fluids/n-Propane.json index 36d26f6f..ef61f7e2 100644 --- a/dev/fluids/n-Propane.json +++ b/dev/fluids/n-Propane.json @@ -329,6 +329,7 @@ } ], "NAME": "n-Propane", + "REFPROP_NAME": "PROPANE", "TRANSPORT": { "conductivity": { "BibTeX": "Marsh-JCED-2002", diff --git a/dev/fluids/n-Undecane.json b/dev/fluids/n-Undecane.json index 02988aef..3f0f46da 100644 --- a/dev/fluids/n-Undecane.json +++ b/dev/fluids/n-Undecane.json @@ -254,5 +254,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "n-Undecane" + "NAME": "n-Undecane", + "REFPROP_NAME": "C11" } \ No newline at end of file diff --git a/dev/fluids/o-Xylene.json b/dev/fluids/o-Xylene.json index d5cca605..77b40652 100644 --- a/dev/fluids/o-Xylene.json +++ b/dev/fluids/o-Xylene.json @@ -284,5 +284,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "o-Xylene" + "NAME": "o-Xylene", + "REFPROP_NAME": "OXYLENE" } \ No newline at end of file diff --git a/dev/fluids/p-Xylene.json b/dev/fluids/p-Xylene.json index 96e24dfe..c0d4a0bb 100644 --- a/dev/fluids/p-Xylene.json +++ b/dev/fluids/p-Xylene.json @@ -284,5 +284,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "p-Xylene" + "NAME": "p-Xylene", + "REFPROP_NAME": "PXYLENE" } \ No newline at end of file diff --git a/dev/fluids/trans-2-Butene.json b/dev/fluids/trans-2-Butene.json index 71ccdd88..05fb3ba8 100644 --- a/dev/fluids/trans-2-Butene.json +++ b/dev/fluids/trans-2-Butene.json @@ -249,5 +249,6 @@ "rhoVtriple_units": "mol/m^3" } ], - "NAME": "trans-2-Butene" + "NAME": "trans-2-Butene", + "REFPROP_NAME": "T2BUTENE" } \ No newline at end of file diff --git a/include/CoolProp.h b/include/CoolProp.h index b9f12f76..b68fcb55 100644 --- a/include/CoolProp.h +++ b/include/CoolProp.h @@ -80,13 +80,13 @@ You might want to start by looking at CoolProp.h /*/// Get a long that represents the fluid type /// @param FluidName The fluid name as a string /// @returns long element from global type enumeration - long getFluidType(std::string FluidName); + long getFluidType(std::string FluidName);*/ /// Get a string for a value from a fluid (numerical values can be obtained from Props1 function) /// @param FluidName The name of the fluid that is part of CoolProp, for instance "n-Propane" - /// @param ParamName A string, one of "aliases", "CAS", "CAS_number", "ASHRAE34", "REFPROPName","REFPROP_name", "TTSE_mode", + /// @param ParamName A string, one of "aliases", "CAS", "CAS_number", "ASHRAE34", "REFPROPName","REFPROP_name", /// @returns str The string, or an error message if not valid input - std::string get_fluid_param_string(std::string FluidName, std::string ParamName);*/ + std::string get_fluid_param_string(std::string FluidName, std::string ParamName); /// Returns the BibTeX key from the bibtex library of CoolProp corresponding to the item requested /// @param FluidName The name of the fluid that is part of CoolProp, for instance "n-Propane" diff --git a/src/Backends/Helmholtz/Fluids/FluidLibrary.h b/src/Backends/Helmholtz/Fluids/FluidLibrary.h index 8129b65a..7eff232b 100644 --- a/src/Backends/Helmholtz/Fluids/FluidLibrary.h +++ b/src/Backends/Helmholtz/Fluids/FluidLibrary.h @@ -791,6 +791,12 @@ public: fluid.name = fluid_json["NAME"].GetString(); name_vector.push_back(fluid.name); // CAS number fluid.CAS = fluid_json["CAS"].GetString(); + if (!fluid_json.HasMember("REFPROP_NAME")) + { + std::cout << fluid.name << std::endl; + } + // REFPROP alias + fluid.REFPROPname = fluid_json["REFPROP_NAME"].GetString(); // Critical state parse_crit_state(fluid_json["CRITICAL"], fluid); diff --git a/src/CoolProp.cpp b/src/CoolProp.cpp index 26250eeb..842137d1 100644 --- a/src/CoolProp.cpp +++ b/src/CoolProp.cpp @@ -29,7 +29,6 @@ #include "Backends/Helmholtz/Fluids/FluidLibrary.h" #include "Backends/Helmholtz/HelmholtzEOSBackend.h" - namespace CoolProp { @@ -722,7 +721,8 @@ std::string get_BibTeXKey(std::string Ref, std::string key) else if (!key.compare("VISCOSITY")){ return HEOS.get_components()[0]->transport.BibTeX_viscosity; } else if (!key.compare("CONDUCTIVITY")){ return HEOS.get_components()[0]->transport.BibTeX_conductivity; } else if (!key.compare("ECS_LENNARD_JONES")){ throw NotImplementedError(); } - else if (!key.compare("ECS_FITS")){ throw NotImplementedError(); } + else if (!key.compare("ECS_VISCSOSITY_FITS")){ throw NotImplementedError(); } + else if (!key.compare("ECS_CONDUCTIVITY_FITS")){ throw NotImplementedError(); } else if (!key.compare("SURFACE_TENSION")){ return HEOS.get_components()[0]->ancillaries.surface_tension.BibTeX;} else{ return "Bad key";} } @@ -751,59 +751,41 @@ std::string get_global_param_string(std::string ParamName) return format("Input value [%s] is invalid",ParamName.c_str()).c_str(); } }; -//std::string get_fluid_param_string(std::string FluidName, std::string ParamName) -//{ -// try{ -// pFluid = Fluids.get_fluid(FluidName); -// // Didn't work -// if (pFluid == NULL){ -// err_string=std::string("CoolProp error: ").append(format("%s is an invalid fluid for get_fluid_param_string",FluidName.c_str())); -// return format("%s is an invalid fluid for get_fluid_param_string",FluidName.c_str()).c_str(); -// } -// else{ -// if (!ParamName.compare("aliases")) -// { -// std::vector v = pFluid->get_aliases(); -// return strjoin(v,", "); -// } -// else if (!ParamName.compare("CAS") || !ParamName.compare("CAS_number")) -// { -// return pFluid->params.CAS; -// } -// else if (!ParamName.compare("ASHRAE34")) -// { -// return pFluid->environment.ASHRAE34; -// } -// else if (!ParamName.compare("REFPROPName") || !ParamName.compare("REFPROP_name") || !ParamName.compare("REFPROPname")) -// { -// return pFluid->get_REFPROPname(); -// } -// else if (!ParamName.compare("TTSE_mode")) -// { -// int mode = pFluid->TTSESinglePhase.get_mode(); -// switch (mode) -// { -// case TTSE_MODE_TTSE: -// return "TTSE"; -// case TTSE_MODE_BICUBIC: -// return "BICUBIC"; -// default: -// throw ValueError("TTSE mode is invalid"); -// } -// } -// else -// { -// return format("Input value [%s] is invalid for Fluid [%s]",ParamName.c_str(),FluidName.c_str()).c_str(); -// } -// } -// } -// catch(std::exception &e) -// { -// return(std::string("CoolProp error: ").append(e.what())); -// } -// catch(...){ -// return(std::string("CoolProp error: Indeterminate error")); -// } -//} +std::string get_fluid_param_string(std::string FluidName, std::string ParamName) +{ + try{ + std::tr1::shared_ptr HEOS(new CoolProp::HelmholtzEOSMixtureBackend(std::vector(1,FluidName))); + + CoolProp::CoolPropFluid *fluid = HEOS->get_components()[0]; + + if (!ParamName.compare("aliases")) + { + return strjoin(fluid->aliases, ", "); + } + else if (!ParamName.compare("CAS") || !ParamName.compare("CAS_number")) + { + return fluid->CAS; + } + else if (!ParamName.compare("ASHRAE34")) + { + return fluid->environment.ASHRAE34; + } + else if (!ParamName.compare("REFPROPName") || !ParamName.compare("REFPROP_name") || !ParamName.compare("REFPROPname")) + { + return fluid->REFPROPname; + } + else + { + return format("Input value [%s] is invalid for Fluid [%s]",ParamName.c_str(),FluidName.c_str()).c_str(); + } + } + catch(std::exception &e) + { + return(std::string("CoolProp error: ").append(e.what())); + } + catch(...){ + return(std::string("CoolProp error: Indeterminate error")); + } +} } /* namespace CoolProp */ \ No newline at end of file diff --git a/src/main.cxx b/src/main.cxx index 2c4a3bfd..b0d58124 100644 --- a/src/main.cxx +++ b/src/main.cxx @@ -134,7 +134,7 @@ int main() } if (1) { - + std::string RPname = get_fluid_param_string("Water","REFPROPname"); std::string s = get_BibTeXKey("n-Propane", "rr"); std::vector tags;