github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-04-23 03:00:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

For pure fluids, only use one saturation pressure curve, pS, instead of pL and pV in json files; closes #711

Browse Source
This commit is contained in:
Ian Bell
2015-07-20 20:34:26 -06:00
parent fb10d74f7b
commit 96178b7ec8
110 changed files with 152 additions and 2915 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Backends/Helmholtz/Fluids/FluidLibrary.h
View File

@@ -1020,12 +1020,26 @@ protected:
/// Parse the critical state for the given EOS
void parse_ancillaries(rapidjson::Value &ancillaries, CoolPropFluid & fluid)
{
if (!ancillaries.HasMember("pL") || !ancillaries.HasMember("pV") || !ancillaries.HasMember("rhoL") || !ancillaries.HasMember("rhoV")){throw ValueError("Ancillary curves are missing");};
fluid.ancillaries.pL = SaturationAncillaryFunction(ancillaries["pL"]);
fluid.ancillaries.pV = SaturationAncillaryFunction(ancillaries["pV"]);
if (!ancillaries.HasMember("rhoL") || !ancillaries.HasMember("rhoV")){
throw ValueError("Ancillary curves for either rhoL or rhoV are missing");
}
fluid.ancillaries.rhoL = SaturationAncillaryFunction(ancillaries["rhoL"]);
fluid.ancillaries.rhoV = SaturationAncillaryFunction(ancillaries["rhoV"]);
// If a pseudo-pure fluid, has pL and pV curves
if (ancillaries.HasMember("pL") && ancillaries.HasMember("pV")){
fluid.ancillaries.pL = SaturationAncillaryFunction(ancillaries["pL"]);
fluid.ancillaries.pV = SaturationAncillaryFunction(ancillaries["pV"]);
}
// Otherwise has a single pS curve and not pL and not pV
else if (!ancillaries.HasMember("pL") && !ancillaries.HasMember("pV") && ancillaries.HasMember("pS")){
fluid.ancillaries.pL = SaturationAncillaryFunction(ancillaries["pS"]);
fluid.ancillaries.pV = SaturationAncillaryFunction(ancillaries["pS"]);
}
else{
throw ValueError("Pressure ancillary curves are missing or invalid");
}
if (ancillaries.HasMember("hL")){
fluid.ancillaries.hL = SaturationAncillaryFunction(ancillaries["hL"]);
}