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

move code to separate functions

Browse Source
This commit is contained in:
Magne Sjaastad 2019-03-19 14:26:31 +01:00
parent 516fd9a929
commit 3579667cd8
4 changed files with 75 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -949,8 +949,8 @@ bool RimGridCrossPlotCurveSet::isYAxisLogarithmic() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimGridCrossPlotCurveSet::setFromCaseAndEquilibriumRegion(RimEclipseResultCase* eclipseCase,
const QString& dynamicResultName)
void RimGridCrossPlotCurveSet::configureForPressureSaturationCurves(RimEclipseResultCase* eclipseCase,
const QString& dynamicResultName)
{
m_case = eclipseCase;

3
ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotCurveSet.h
View File

@ -126,11 +126,10 @@ public:
bool isXAxisLogarithmic() const;
bool isYAxisLogarithmic() const;
void setFromCaseAndEquilibriumRegion(RimEclipseResultCase* eclipseResultCase, const QString& dynamicResultName);
void configureForPressureSaturationCurves(RimEclipseResultCase* eclipseResultCase, const QString& dynamicResultName);
void addCellFilter(RimPlotCellFilter* cellFilter);
void setCustomColor(const cvf::Color3f color);
protected:
void initAfterRead() override;
void onLoadDataAndUpdate(bool updateParentPlot);

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

@ -18,6 +18,7 @@
#include "RimSaturationPressurePlot.h"
#include "RigCaseCellResultsData.h"
#include "RigEclipseCaseData.h"
#include "RigEquil.h"
@ -28,7 +29,6 @@
#include "RimPlotAxisProperties.h"
#include "CellFilters/RimPlotCellPropertyFilter.h"
#include "RigCaseCellResultsData.h"
CAF_PDM_SOURCE_INIT(RimSaturationPressurePlot, "RimSaturationPressurePlot");
@ -61,44 +61,28 @@ void RimSaturationPressurePlot::assignCaseAndEquilibriumRegion(RiaDefines::Poros
double waterOilContactDepth = eq.waterOilContactDepth();
{
// Blue PRESSURE curve with data for specified EQLNUM value
RimGridCrossPlotCurveSet* curveSet = createCurveSet();
curveSet->setFromCaseAndEquilibriumRegion(eclipseResultCase, "PRESSURE");
curveSet->configureForPressureSaturationCurves(eclipseResultCase, "PRESSURE");
curveSet->setCustomColor(cvf::Color3::BLUE);
RimPlotCellPropertyFilter* cellFilter = new RimPlotCellPropertyFilter();
{
RimEclipseResultDefinition* resultDefinition = new RimEclipseResultDefinition();
resultDefinition->setEclipseCase(eclipseResultCase);
resultDefinition->setResultType(RiaDefines::STATIC_NATIVE);
resultDefinition->setResultVariable("EQLNUM");
cellFilter->setResultDefinition(resultDefinition);
}
cellFilter->setValueRange(zeroBasedEquilRegionIndex + 1, zeroBasedEquilRegionIndex + 1);
RimPlotCellPropertyFilter* cellFilter =
createEquilibriumRegionPropertyFilter(eclipseResultCase, zeroBasedEquilRegionIndex);
curveSet->addCellFilter(cellFilter);
}
{
// Red dew pressure (PDEW) curve with data for specified EQLNUM value, filtered on depth by gasOilContact
RimGridCrossPlotCurveSet* curveSet = createCurveSet();
curveSet->setFromCaseAndEquilibriumRegion(eclipseResultCase, "PDEW");
curveSet->configureForPressureSaturationCurves(eclipseResultCase, "PDEW");
curveSet->setCustomColor(cvf::Color3::RED);
{
RimPlotCellPropertyFilter* cellFilter = new RimPlotCellPropertyFilter();
{
RimEclipseResultDefinition* resultDefinition = new RimEclipseResultDefinition();
resultDefinition->setEclipseCase(eclipseResultCase);
resultDefinition->setResultType(RiaDefines::STATIC_NATIVE);
resultDefinition->setResultVariable("EQLNUM");
cellFilter->setResultDefinition(resultDefinition);
}
cellFilter->setValueRange(zeroBasedEquilRegionIndex + 1, zeroBasedEquilRegionIndex + 1);
curveSet->addCellFilter(cellFilter);
}
RimPlotCellPropertyFilter* cellFilter =
createEquilibriumRegionPropertyFilter(eclipseResultCase, zeroBasedEquilRegionIndex);
curveSet->addCellFilter(cellFilter);
{
RigCaseCellResultsData* caseCellResultsData = eclipseResultCase->eclipseCaseData()->results(porosityType);
@ -112,18 +96,7 @@ void RimSaturationPressurePlot::assignCaseAndEquilibriumRegion(RiaDefines::Poros
maxDepth = gasOilContactDepth;
RimPlotCellPropertyFilter* depthCellFilter = new RimPlotCellPropertyFilter();
{
RimEclipseResultDefinition* resultDefinition = new RimEclipseResultDefinition();
resultDefinition->setPorosityModel(porosityType);
resultDefinition->setEclipseCase(eclipseResultCase);
resultDefinition->setResultType(depthResultAddress.m_resultCatType);
resultDefinition->setResultVariable(depthResultAddress.m_resultName);
depthCellFilter->setResultDefinition(resultDefinition);
}
depthCellFilter->setValueRange(minDepth, maxDepth);
RimPlotCellPropertyFilter* depthCellFilter = createDepthPropertyFilter(eclipseResultCase, minDepth, maxDepth);
curveSet->addCellFilter(depthCellFilter);
}
@ -131,8 +104,11 @@ void RimSaturationPressurePlot::assignCaseAndEquilibriumRegion(RiaDefines::Poros
}
{
// Green bubble point pressure (PBUB) curve with data for specified EQLNUM value, filtered on depth between gasOilContact
// and waterOilContactDepth
RimGridCrossPlotCurveSet* curveSet = createCurveSet();
curveSet->setFromCaseAndEquilibriumRegion(eclipseResultCase, "PBUB");
curveSet->configureForPressureSaturationCurves(eclipseResultCase, "PBUB");
curveSet->setCustomColor(cvf::Color3::GREEN);
{
@ -150,7 +126,7 @@ void RimSaturationPressurePlot::assignCaseAndEquilibriumRegion(RiaDefines::Poros
curveSet->addCellFilter(cellFilter);
}
{
RigCaseCellResultsData* caseCellResultsData = eclipseResultCase->eclipseCaseData()->results(porosityType);
if (caseCellResultsData)
@ -164,23 +140,11 @@ void RimSaturationPressurePlot::assignCaseAndEquilibriumRegion(RiaDefines::Poros
minDepth = gasOilContactDepth;
maxDepth = waterOilContactDepth;
RimPlotCellPropertyFilter* depthCellFilter = new RimPlotCellPropertyFilter();
{
RimEclipseResultDefinition* resultDefinition = new RimEclipseResultDefinition();
resultDefinition->setPorosityModel(porosityType);
resultDefinition->setEclipseCase(eclipseResultCase);
resultDefinition->setResultType(depthResultAddress.m_resultCatType);
resultDefinition->setResultVariable(depthResultAddress.m_resultName);
depthCellFilter->setResultDefinition(resultDefinition);
}
depthCellFilter->setValueRange(minDepth, maxDepth);
RimPlotCellPropertyFilter* depthCellFilter = createDepthPropertyFilter(eclipseResultCase, minDepth, maxDepth);
curveSet->addCellFilter(depthCellFilter);
}
}
}
RimPlotAxisProperties* yAxisProps = yAxisProperties();
@ -212,3 +176,45 @@ void RimSaturationPressurePlot::initAfterRead()
RimGridCrossPlot::initAfterRead();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimPlotCellPropertyFilter*
RimSaturationPressurePlot::createEquilibriumRegionPropertyFilter(RimEclipseResultCase* eclipseResultCase,
int zeroBasedEquilRegionIndex)
{
RimPlotCellPropertyFilter* cellFilter = new RimPlotCellPropertyFilter();
RimEclipseResultDefinition* resultDefinition = new RimEclipseResultDefinition();
resultDefinition->setEclipseCase(eclipseResultCase);
resultDefinition->setResultType(RiaDefines::STATIC_NATIVE);
resultDefinition->setResultVariable("EQLNUM");
cellFilter->setResultDefinition(resultDefinition);
cellFilter->setValueRange(zeroBasedEquilRegionIndex + 1, zeroBasedEquilRegionIndex + 1);
return cellFilter;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimPlotCellPropertyFilter* RimSaturationPressurePlot::createDepthPropertyFilter(RimEclipseResultCase* eclipseResultCase,
double minDepth,
double maxDepth)
{
RimPlotCellPropertyFilter* depthCellFilter = new RimPlotCellPropertyFilter();
RimEclipseResultDefinition* resultDefinition = new RimEclipseResultDefinition();
resultDefinition->setEclipseCase(eclipseResultCase);
resultDefinition->setResultType(RiaDefines::STATIC_NATIVE);
resultDefinition->setResultVariable("DEPTH");
depthCellFilter->setResultDefinition(resultDefinition);
depthCellFilter->setValueRange(minDepth, maxDepth);
return depthCellFilter;
}

11
ApplicationCode/ProjectDataModel/GridCrossPlots/RimSaturationPressurePlot.h
View File

@ -18,10 +18,12 @@
#pragma once
#include "RimGridCrossPlot.h"
#include "RiaPorosityModel.h"
#include "RimGridCrossPlot.h"
class RimEclipseResultCase;
class RimPlotCellPropertyFilter;
//--------------------------------------------------------------------------------------------------
///
@ -39,4 +41,11 @@ public:
protected:
void initAfterRead() override;
private:
RimPlotCellPropertyFilter* createEquilibriumRegionPropertyFilter(RimEclipseResultCase* eclipseResultCase,
int zeroBasedEquilRegionIndex);
RimPlotCellPropertyFilter*
createDepthPropertyFilter(RimEclipseResultCase* eclipseResultCase, double minDepth, double maxDepth);
};