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

Hack AbstractState and its SWIG wrapper to expose the liquid and vapor mole fractions; see #824

Browse Source
This commit is contained in:
Ian Bell
2015-09-30 23:21:01 -06:00
parent ddec0be08e
commit e05d58efa3
2 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/AbstractState.h
View File

@@ -414,9 +414,23 @@ public:
/// Get the mole fractions of the equilibrium liquid phase
std::vector<CoolPropDbl> mole_fractions_liquid(void){ return calc_mole_fractions_liquid(); };
/// Get the mole fractions of the equilibrium liquid phase (but as a double for use in SWIG wrapper)
std::vector<double> mole_fractions_liquid_double(void){
std::vector<CoolPropDbl> x = calc_mole_fractions_liquid();
return std::vector<double>(x.begin(), x.end());
};
/// Get the mole fractions of the equilibrium vapor phase
std::vector<CoolPropDbl> mole_fractions_vapor(void){ return calc_mole_fractions_vapor(); };
/// Get the mole fractions of the equilibrium vapor phase (but as a double for use in SWIG wrapper)
std::vector<double> mole_fractions_vapor_double(void){
std::vector<CoolPropDbl> y = calc_mole_fractions_vapor();
return std::vector<double>(y.begin(), y.end());
};
/// Get the mole fractions of the components
virtual const std::vector<CoolPropDbl> & get_mole_fractions(void) = 0;
/// Update the state using two state variables
virtual void update(CoolProp::input_pairs input_pair, double Value1, double Value2) = 0;
@@ -424,9 +438,6 @@ public:
/// Some or all of the guesses will be used - this is backend dependent
virtual void update_with_guesses(CoolProp::input_pairs input_pair, double Value1, double Value2, const GuessesStructure &guesses){ throw NotImplementedError("update_with_guesses is not implemented for this backend"); };
/// Get the mole fractions of the components
virtual const std::vector<CoolPropDbl> & get_mole_fractions(void) = 0;
/// A function that says whether the backend instance can be instantiated in the high-level interface
/// In general this should be true, except for some other backends (especially the tabular backends)
/// To disable use in high-level interface, implement this function and return false