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

Grid Cross Plot: Use the term Grouping instead of Categorization

Browse Source
This commit is contained in:
Gaute Lindkvist
2019-03-05 13:26:59 +01:00
parent b6a2bcfa59
commit 8845c456bc
11 changed files with 138 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake
View File

@@ -68,7 +68,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RigCaseRealizationParameters.h
${CMAKE_CURRENT_LIST_DIR}/RigGeoMechBoreHoleStressCalculator.h
${CMAKE_CURRENT_LIST_DIR}/RigPolyLinesData.h
${CMAKE_CURRENT_LIST_DIR}/RigCaseCellResultCalculator.h
${CMAKE_CURRENT_LIST_DIR}/RigGridCrossPlotCurveCategorization.h
${CMAKE_CURRENT_LIST_DIR}/RigGridCrossPlotCurveGrouping.h
${CMAKE_CURRENT_LIST_DIR}/RigEclipseCrossPlotDataExtractor.h
)

22
ApplicationCode/ReservoirDataModel/RigEclipseCrossPlotDataExtractor.cpp
View File

@@ -38,8 +38,8 @@ RigEclipseCrossPlotResult RigEclipseCrossPlotDataExtractor::extract(RigEclipseCa
int resultTimeStep,
const RigEclipseResultAddress& xAddress,
const RigEclipseResultAddress& yAddress,
RigGridCrossPlotCurveCategorization categorizationType,
const RigEclipseResultAddress& catAddress,
RigGridCrossPlotCurveGrouping groupingType,
const RigEclipseResultAddress& groupAddress,
std::map<int, cvf::UByteArray> timeStepCellVisibilityMap)
{
RigEclipseCrossPlotResult result;
@@ -61,10 +61,10 @@ RigEclipseCrossPlotResult RigEclipseCrossPlotDataExtractor::extract(RigEclipseCa
const std::vector<std::vector<double>>& xValuesForAllSteps = resultData->cellScalarResults(xAddress);
const std::vector<std::vector<double>>& yValuesForAllSteps = resultData->cellScalarResults(yAddress);
if (categorizationType == RESULT_CATEGORIZATION && catAddress.isValid())
if (groupingType == GROUP_BY_RESULT && groupAddress.isValid())
{
resultData->ensureKnownResultLoaded(catAddress);
catValuesForAllSteps = &resultData->cellScalarResults(catAddress);
resultData->ensureKnownResultLoaded(groupAddress);
catValuesForAllSteps = &resultData->cellScalarResults(groupAddress);
}
std::set<int> timeStepsToInclude;
@@ -120,11 +120,11 @@ RigEclipseCrossPlotResult RigEclipseCrossPlotDataExtractor::extract(RigEclipseCa
result.xValues.push_back(xValue);
result.yValues.push_back(yValue);
if (categorizationType == TIME_CATEGORIZATION)
if (groupingType == GROUP_BY_TIME)
{
result.catValuesDiscrete.push_back(timeStep);
result.groupValuesDiscrete.push_back(timeStep);
}
else if (categorizationType == FORMATION_CATEGORIZATION)
else if (groupingType == GROUP_BY_FORMATION)
{
CVF_ASSERT(activeFormationNames);
int category = 0;
@@ -133,16 +133,16 @@ RigEclipseCrossPlotResult RigEclipseCrossPlotDataExtractor::extract(RigEclipseCa
{
category = activeFormationNames->formationIndexFromKLayerIdx(k);
}
result.catValuesDiscrete.push_back(category);
result.groupValuesDiscrete.push_back(category);
}
else if (categorizationType == RESULT_CATEGORIZATION)
else if (groupingType == GROUP_BY_RESULT)
{
double catValue = HUGE_VAL;
if (catAccessor)
{
catValue = catAccessor->cellScalarGlobIdx(globalCellIdx);
}
result.catValuesContinuous.push_back(catValue);
result.groupValuesContinuous.push_back(catValue);
}
}
}

10
ApplicationCode/ReservoirDataModel/RigEclipseCrossPlotDataExtractor.h
View File

@@ -17,7 +17,7 @@
/////////////////////////////////////////////////////////////////////////////////
#pragma once
#include "RigGridCrossPlotCurveCategorization.h"
#include "RigGridCrossPlotCurveGrouping.h"
#include "cvfBase.h"
#include "cvfArray.h"
@@ -35,8 +35,8 @@ struct RigEclipseCrossPlotResult
{
std::vector<double> xValues;
std::vector<double> yValues;
std::vector<double> catValuesContinuous;
std::vector<int> catValuesDiscrete;
std::vector<double> groupValuesContinuous;
std::vector<int> groupValuesDiscrete;
};
class RigEclipseCrossPlotDataExtractor
@@ -46,7 +46,7 @@ public:
int resultTimeStep,
const RigEclipseResultAddress& xAddress,
const RigEclipseResultAddress& yAddress,
RigGridCrossPlotCurveCategorization categorizationType,
const RigEclipseResultAddress& categoryAddress,
RigGridCrossPlotCurveGrouping groupingType,
const RigEclipseResultAddress& groupAddress,
std::map<int, cvf::UByteArray> timeStepCellVisibilityMap);
};

10
ApplicationCode/ReservoirDataModel/RigGridCrossPlotCurveCategorization.h → ApplicationCode/ReservoirDataModel/RigGridCrossPlotCurveGrouping.h
View File

@@ -17,11 +17,11 @@
/////////////////////////////////////////////////////////////////////////////////
#pragma once
enum RigGridCrossPlotCurveCategorization
enum RigGridCrossPlotCurveGrouping
{
NO_CATEGORIZATION,
TIME_CATEGORIZATION,
FORMATION_CATEGORIZATION,
RESULT_CATEGORIZATION
NO_GROUPING,
GROUP_BY_TIME,
GROUP_BY_FORMATION,
GROUP_BY_RESULT
};