github/CoolProp
1
1
Fork 0
mirror of https://github.com/CoolProp/CoolProp.git synced 2026-01-31 16:58:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Do not evaluate flash call if inputs are all in outputs; see #409

Browse Source 
Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
This commit is contained in:
Ian Bell
2015-02-02 20:20:43 -05:00
parent 6d3181b7f9
commit b2018a4abc
3 changed files with 70 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/CoolProp.cpp
View File

@@ -285,6 +285,20 @@ void _PropsSI_outputs(shared_ptr<AbstractState> &State,
all_trivial_outputs = false;
}
}
// If all outputs are also inputs, never do a state update
bool all_outputs_in_inputs = true;
// Split the input pair into parameters
parameters p1, p2;
split_input_pair(input_pair, p1, p2);
// See if each parameter is in the output vector and is a normal type input
for (std::size_t j = 0; j < output_parameters.size(); ++j){
if (output_parameters[j].type != output_parameter::OUTPUT_TYPE_NORMAL){
all_outputs_in_inputs = false; break;
}
if (!(output_parameters[j].Of1 == p1 || output_parameters[j].Of1 == p2)){
all_outputs_in_inputs = false; break;
}
}
if (get_debug_level() > 100)
{
@@ -308,7 +322,7 @@ void _PropsSI_outputs(shared_ptr<AbstractState> &State,
// Iterate over the state variable inputs
for (std::size_t i = 0; i < IO.size(); ++i){
try{
if (input_pair != INPUT_PAIR_INVALID && !all_trivial_outputs){
if (input_pair != INPUT_PAIR_INVALID && !all_trivial_outputs && !all_outputs_in_inputs){
// Update the state since it is a valid set of inputs
State->update(input_pair, in1[i], in2[i]);
}
@@ -321,6 +335,18 @@ void _PropsSI_outputs(shared_ptr<AbstractState> &State,
}
for (std::size_t j = 0; j < IO[i].size(); ++j){
// If all the outputs are inputs, there is no need for a state input
if (all_outputs_in_inputs){
if (p1 == output_parameters[j].Of1){
IO[i][j] = in1[i]; success = true; continue;
}
else if (p2 == output_parameters[j].Of1){
IO[i][j] = in2[i]; success = true; continue;
}
else{
throw ValueError();
}
}
try{
output_parameter &output = output_parameters[j];
switch (output.type){
@@ -357,6 +383,7 @@ void _PropsSImulti(const std::vector<std::string> &Outputs,
std::vector<std::vector<double> > &IO)
{
shared_ptr<AbstractState> State;
CoolProp::parameters key1, key2;
CoolProp::input_pairs input_pair;
std::vector<output_parameter> output_parameters;
std::vector<double> v1, v2;
@@ -372,9 +399,7 @@ void _PropsSImulti(const std::vector<std::string> &Outputs,
try{
// Get update pair
CoolProp::parameters key1;
is_valid_parameter(Name1, key1);
CoolProp::parameters key2;
is_valid_parameter(Name2, key2);
input_pair = generate_update_pair(key1, Prop1, key2, Prop2, v1, v2);
}