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

#4251 Saturation Pressure Plots: Create curves only for unique values from EQLNUM

Browse Source
This commit is contained in:
Magne Sjaastad
2019-03-29 15:15:15 +01:00
parent b08271b982
commit 2a534f88df
5 changed files with 133 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ProjectDataModel/GridCrossPlots/RimSaturationPressurePlot.cpp
View File

@@ -125,7 +125,7 @@ void RimSaturationPressurePlot::assignCaseAndEquilibriumRegion(RiaDefines::Poros
RimEclipseResultDefinition* resultDefinition = new RimEclipseResultDefinition();
resultDefinition->setEclipseCase(eclipseResultCase);
resultDefinition->setResultType(RiaDefines::STATIC_NATIVE);
resultDefinition->setResultVariable("EQLNUM");
resultDefinition->setResultVariable(RiaDefines::eqlnumResultName());
cellFilter->setResultDefinition(resultDefinition);
}
@@ -205,7 +205,7 @@ RimPlotCellPropertyFilter*
RimEclipseResultDefinition* resultDefinition = new RimEclipseResultDefinition();
resultDefinition->setEclipseCase(eclipseResultCase);
resultDefinition->setResultType(RiaDefines::STATIC_NATIVE);
resultDefinition->setResultVariable("EQLNUM");
resultDefinition->setResultVariable(RiaDefines::eqlnumResultName());
cellFilter->setResultDefinition(resultDefinition);

36
ApplicationCode/ProjectDataModel/GridCrossPlots/RimSaturationPressurePlotCollection.cpp
View File

@@ -18,7 +18,9 @@
#include "RimSaturationPressurePlotCollection.h"
#include "RigCaseCellResultsData.h"
#include "RigEclipseCaseData.h"
#include "RigEclipseResultAddress.h"
#include "RigEquil.h"
#include "RimEclipseResultCase.h"
@@ -55,21 +57,39 @@ std::vector<RimSaturationPressurePlot*>
RigEclipseCaseData* eclipseCaseData = eclipseResultCase->eclipseCaseData();
if (!eclipseCaseData) return generatedPlots;
auto results = eclipseCaseData->results(RiaDefines::MATRIX_MODEL);
std::set<int> eqlnumRegionIdsFound;
{
RigEclipseResultAddress resAdr(RiaDefines::STATIC_NATIVE, RiaDefines::eqlnumResultName());
if (results->hasResultEntry(resAdr))
{
auto vals = results->uniqueCellScalarValues(resAdr);
for (auto v : vals)
{
eqlnumRegionIdsFound.insert(v);
}
}
}
std::vector<RigEquil> equilData = eclipseCaseData->equilData();
for (size_t i = 0; i < equilData.size(); i++)
{
RimSaturationPressurePlot* plot = new RimSaturationPressurePlot();
plot->setAsPlotMdiWindow();
int zeroBasedEquilibriumRegion = static_cast<int>(i);
int equilibriumRegion = static_cast<int>(i);
if (eqlnumRegionIdsFound.find(zeroBasedEquilibriumRegion + 1) != eqlnumRegionIdsFound.end())
{
RimSaturationPressurePlot* plot = new RimSaturationPressurePlot();
plot->setAsPlotMdiWindow();
// As discussed with Liv Merete, it is not any use for creation of different plots for matrix/fracture. For now, use
// hardcoded value for MATRIX
plot->assignCaseAndEquilibriumRegion(RiaDefines::MATRIX_MODEL, eclipseResultCase, equilibriumRegion);
// As discussed with Liv Merete, it is not any use for creation of different plots for matrix/fracture. For now, use
// hardcoded value for MATRIX
plot->assignCaseAndEquilibriumRegion(RiaDefines::MATRIX_MODEL, eclipseResultCase, zeroBasedEquilibriumRegion);
m_saturationPressurePlots.push_back(plot);
m_saturationPressurePlots.push_back(plot);
generatedPlots.push_back(plot);
generatedPlots.push_back(plot);
}
}
return generatedPlots;