OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#1836 Add region selection threshold fields

Browse Source
This commit is contained in:
Bjørnar Grip Fjær
2017-08-29 16:21:19 +02:00
parent fa943226bc
commit c736e10ad5
4 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/ReservoirDataModel/RigFlowDiagResults.cpp
View File

@@ -695,7 +695,9 @@ std::vector<int> RigFlowDiagResults::calculatedTimeSteps(RigFlowDiagResultAddres
RigFlowDiagSolverInterface::FlowCharacteristicsResultFrame RigFlowDiagResults::flowCharacteristicsResults(int frameIndex,
CellFilter cellSelection,
const std::vector<QString>& tracerNames,
double max_pv_fraction)
double max_pv_fraction,
double minCommunication,
int maxTof)
{
std::set<std::string> injectorNames;
std::set<std::string> producerNames;
@@ -734,7 +736,7 @@ RigFlowDiagSolverInterface::FlowCharacteristicsResultFrame RigFlowDiagResults::f
for (size_t i = 0; i < communicationResult->size(); ++i)
{
if (communicationResult->at(i) != HUGE_VAL && communicationResult->at(i) >= 0)
if (communicationResult->at(i) != HUGE_VAL && communicationResult->at(i) >= minCommunication)
{
selectedCellIndices.push_back(i);
if (allInjectorResults != nullptr) injectorResults.push_back(allInjectorResults->at(i));
@@ -748,7 +750,7 @@ RigFlowDiagSolverInterface::FlowCharacteristicsResultFrame RigFlowDiagResults::f
{
for (size_t i = 0; i < allInjectorResults->size(); ++i)
{
if (allInjectorResults->at(i) != HUGE_VAL)
if (allInjectorResults->at(i) != HUGE_VAL && allInjectorResults->at(i) <= maxTof)
{
selectedCellIndices.push_back(i);
injectorResults.push_back(allInjectorResults->at(i));
@@ -770,7 +772,7 @@ RigFlowDiagSolverInterface::FlowCharacteristicsResultFrame RigFlowDiagResults::f
{
for (size_t i = 0; i < allProducerResults->size(); ++i)
{
if (allProducerResults->at(i) != HUGE_VAL)
if (allProducerResults->at(i) != HUGE_VAL && allProducerResults->at(i) <= maxTof)
{
selectedCellIndices.push_back(i);
producerResults.push_back(allProducerResults->at(i));