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

Set _phase in REFPROP backend and return it in calc_phase() (#1797)

Browse Source 
* Set _phase in REFPROP backend and return it in calc_phase()

* Comment touch-up

* Throw error from REFPROPMixtureBackend::calc_phase() for mixtures

* Remove redundant qualifier on GetRPphase() in REFPROPMixtureBackend.h
This commit is contained in:
Jeff Henning
2019-02-10 01:09:51 -05:00
committed by Ian Bell
parent e65d89ad81
commit b493de51a4
3 changed files with 74 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/CoolProp.cpp
View File

@@ -1048,24 +1048,24 @@ std::string phase_lookup_string(phases Phase)
{
switch (Phase)
{
case iphase_liquid: ///< Liquid
return "liquid";
case iphase_supercritical: ///< Supercritical (p > pc, T > Tc)
return "supercritical";
case iphase_supercritical_gas: ///< Supercritical gas (p < pc, T > Tc)
return "supercritical_gas";
case iphase_supercritical_liquid: ///< Supercritical liquid (p > pc, T < Tc)
return "supercritical_liquid";
case iphase_critical_point: ///< At the critical point
return "critical_point";
case iphase_gas: ///< Subcritical gas
return "gas";
case iphase_twophase: ///< Twophase
return "twophase";
case iphase_unknown: ///< Unknown phase
return "unknown";
case iphase_not_imposed:
return "not_imposed";
case iphase_liquid: ///< Liquid
return "liquid";
case iphase_supercritical: ///< Supercritical (p > pc, T > Tc)
return "supercritical";
case iphase_supercritical_gas: ///< Supercritical gas (p < pc, T > Tc)
return "supercritical_gas";
case iphase_supercritical_liquid: ///< Supercritical liquid (p > pc, T < Tc)
return "supercritical_liquid";
case iphase_critical_point: ///< At the critical point
return "critical_point";
case iphase_gas: ///< Subcritical gas
return "gas";
case iphase_twophase: ///< Twophase (between saturation curves - inclusive)
return "twophase";
case iphase_unknown: ///< Unknown phase
return "unknown";
case iphase_not_imposed:
return "not_imposed";
}
throw ValueError("I should never be thrown");
}