github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-02-09 05:15:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

Relaxed some pressure domain checks and pass state by reference

Browse Source 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
This commit is contained in:
Ian Bell
2014-08-12 23:40:16 +02:00
parent 36620cdc94
commit f7c0cb0b06
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Backends/Helmholtz/FlashRoutines.cpp
View File

@@ -140,7 +140,7 @@ void FlashRoutines::PQ_flash(HelmholtzEOSMixtureBackend &HEOS)
pmin_sat = std::max(pmin_satL, pmin_satV);
// Check limits
if (!is_in_closed_range(pmin_sat, pmax_sat, static_cast<long double>(HEOS._p))){
if (!is_in_closed_range(pmin_sat*0.999999, pmax_sat*1.000001, static_cast<long double>(HEOS._p))){
throw ValueError(format("Pressure to PQ_flash [%6g Pa] must be in range [%8g Pa, %8g Pa]",HEOS._p, pmin_sat, pmax_sat));
}
// ------------------

9
src/Backends/Helmholtz/HelmholtzEOSMixtureBackend.cpp
View File

@@ -131,7 +131,7 @@ void HelmholtzEOSMixtureBackend::update_states(void)
// Clear again just to be sure
clear();
}
const CoolProp::SimpleState HelmholtzEOSMixtureBackend::calc_state(const std::string &state)
const CoolProp::SimpleState & HelmholtzEOSMixtureBackend::calc_state(const std::string &state)
{
if (is_pure_or_pseudopure)
{
@@ -738,7 +738,7 @@ void HelmholtzEOSMixtureBackend::p_phase_determination_pure_or_pseudopure(int ot
}
}
// Check between triple point pressure and psat_max
else if (_p > components[0]->pEOS->ptriple && _p < _crit.p)
else if (_p >= components[0]->pEOS->ptriple*0.9999 && _p <= _crit.p)
{
// First try the ancillaries, use them to determine the state if you can
@@ -911,10 +911,13 @@ void HelmholtzEOSMixtureBackend::p_phase_determination_pure_or_pseudopure(int ot
_rhomolar = 1/(_Q/HEOS.SatV->rhomolar() + (1-_Q)/HEOS.SatL->rhomolar());
return;
}
else if (_p < components[0]->pEOS->ptriple)
else if (_p < components[0]->pEOS->ptriple*0.9999)
{
throw NotImplementedError(format("for now, we don't support p [%g Pa] below ptriple [%g Pa]",_p, components[0]->pEOS->ptriple));
}
else{
throw ValueError(format("The pressure [%g Pa] cannot be used in p_phase_determination",_p));
}
}
void HelmholtzEOSMixtureBackend::T_phase_determination_pure_or_pseudopure(int other, long double value)
{

2
src/Backends/Helmholtz/HelmholtzEOSMixtureBackend.h
View File

@@ -49,7 +49,7 @@ public:
long double calc_melting_line(int param, int given, long double value);
int calc_phase(void){return _phase;};
const CoolProp::SimpleState calc_state(const std::string &state);
const CoolProp::SimpleState &calc_state(const std::string &state);
const std::vector<CoolPropFluid*> &get_components(){return components;};
std::vector<long double> &get_K(){return K;};