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

Disambiguate IF97 Fluid Names - Water only (#1770)

Browse Source
This commit is contained in:
Jeff Henning
2018-12-19 22:55:42 -05:00
committed by GitHub
parent 620cbf29d5
commit de465e1cf6
2 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/AbstractState.cpp
View File

@@ -54,8 +54,20 @@ void register_backend(const backend_families &bf, shared_ptr<AbstractStateGenera
class IF97BackendGenerator : public AbstractStateGenerator{
public:
AbstractState * get_AbstractState(const std::vector<std::string> &fluid_names){
return new IF97Backend();
AbstractState * get_AbstractState(const std::vector<std::string> &fluid_names) {
if (fluid_names.size() == 1) { // Check that fluid_names[0] has only one component
std::string str = fluid_names[0]; // Check that the fluid name is an alias for "Water"
if ((upper(str) == "WATER") ||
(upper(str) == "H2O")) {
return new IF97Backend();
}
else {
throw ValueError(format("The IF97 backend returns Water props only; fluid name [%s] not allowed", fluid_names[0].c_str()));
}
}
else {
throw ValueError(format("The IF97 backend does not support mixtures, only Water"));
};
};
} ;
// This static initialization will cause the generator to register