github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-01-22 20:38:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

Eliminated some more warnings regarding missing return values

Browse Source
This commit is contained in:
Jorrit Wronski
2016-02-22 15:38:26 +01:00
parent 6b664b9127
commit 3bc286b8f9
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Backends/REFPROP/REFPROPMixtureBackend.cpp
View File

@@ -526,11 +526,13 @@ double REFPROPMixtureBackend::get_binary_interaction_double(const std::string &C
else if (parameter == "Fij"){ val = fij[4]; }
else{
throw ValueError(format(" I don't know what to do with your parameter [%s]", parameter.c_str()));
return _HUGE;
}
return val;
}
else{
//throw ValueError(format("For now, model [%s] must start with KW or GE", hmodij));
return _HUGE;
}
}
/// Get binary mixture string value
@@ -549,13 +551,17 @@ std::string REFPROPMixtureBackend::get_binary_interaction_string(const std::stri
std::string shmodij(hmodij);
if (shmodij.find("KW")==0 || shmodij.find("GE")==0)// Starts with KW or GE
{
if (parameter == "model"){ return shmodij;}
else{
if (parameter == "model"){
return shmodij;
}
else {
throw ValueError(format(" I don't know what to do with your parameter [%s]", parameter.c_str()));
return "";
}
}
else{
else {
//throw ValueError(format("For now, model [%s] must start with KW or GE", hmodij));
return "";
}
}
void REFPROPMixtureBackend::set_mole_fractions(const std::vector<CoolPropDbl> &mole_fractions)
@@ -1733,10 +1739,12 @@ void REFPROPMixtureBackend::calc_true_critical_point(double &T, double &rho)
CoolPropDbl REFPROPMixtureBackend::calc_saturated_liquid_keyed_output(parameters key) {
if ((key == iDmolar) && _rhoLmolar) return _rhoLmolar;
throw ValueError("The saturated liquid state has not been set.");
return _HUGE;
}
CoolPropDbl REFPROPMixtureBackend::calc_saturated_vapor_keyed_output(parameters key) {
if ((key == iDmolar) && _rhoVmolar) return _rhoVmolar;
ValueError("The saturated vapor state has not been set.");
return _HUGE;
}
void REFPROPMixtureBackend::calc_ideal_curve(const std::string &type, std::vector<double> &T, std::vector<double> &p){