github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-02-01 17:34:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Added enthalpy and entropy for triple point states

Browse Source 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
This commit is contained in:
Ian Bell
2014-10-30 00:21:29 -04:00
parent 968c8a16b9
commit 21a2e998af
115 changed files with 2408 additions and 576 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -956,11 +956,15 @@ protected:
fluid.triple_liquid.T = -1;
fluid.triple_liquid.p = -1;
fluid.triple_liquid.rhomolar = -1;
fluid.triple_liquid.hmolar = _HUGE;
fluid.triple_liquid.smolar = _HUGE;
}
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");
fluid.triple_liquid.hmolar = cpjson::get_double(triple_liquid, "hmolar");
fluid.triple_liquid.smolar = cpjson::get_double(triple_liquid, "smolar");
}
if (!states.HasMember("triple_vapor")){ throw ValueError(format("fluid[\"STATES\"] [%s] does not have \"triple_vapor\" member",fluid.name.c_str())); }
@@ -970,11 +974,15 @@ protected:
fluid.triple_vapor.T = -1;
fluid.triple_vapor.p = -1;
fluid.triple_vapor.rhomolar = -1;
fluid.triple_vapor.hmolar = _HUGE;
fluid.triple_vapor.smolar = _HUGE;
}
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");
fluid.triple_vapor.hmolar = cpjson::get_double(triple_vapor, "hmolar");
fluid.triple_vapor.smolar = cpjson::get_double(triple_vapor, "smolar");
}
};