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

Merge branch 'master' into cpp_review

Browse Source
This commit is contained in:
Jorrit Wronski
2022-12-19 23:07:25 +01:00
committed by GitHub
parent 37e2eb56fa d241e083b7
commit 86ca7f1286
89 changed files with 4538 additions and 2644 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/CoolProp.cpp
View File

@@ -891,6 +891,15 @@ double Props1SI(std::string FluidName, std::string Output) {
return val1;
}
}
std::vector<std::vector<double>> Props1SImulti(const std::vector<std::string>& Outputs, const std::string& backend, const std::vector<std::string>& fluids, const std::vector<double>& fractions) {
std::vector<double> zero_vector(1, 0.);
std::vector<std::vector<double>> val1 = PropsSImulti(Outputs, "", zero_vector, "", zero_vector, backend, fluids, fractions);
// error handling is done in PropsSImulti, val1 will be an empty vector if an error occured
return val1;
}
#if defined(ENABLE_CATCH)
TEST_CASE("Check inputs to Props1SI", "[Props1SI],[PropsSI]") {
SECTION("Good fluid, good parameter") {