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

riTRANXYZ: Started to add it to the rest of the system

Browse Source
This commit is contained in:
Jacob Støren 2014-08-20 09:51:55 +02:00
parent a3af100189
commit 83965a4f7b
4 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ProjectDataModel/RimDefines.cpp
View File

@ -64,6 +64,10 @@ bool RimDefines::isPerCellFaceResult(const QString& resultName)
{ {
return true; return true;
} }
else if (resultName.compare(RimDefines::combinedRiTransResultName(), Qt::CaseInsensitive) == 0)
{
return true;
}
return false; return false;
} }

2
ApplicationCode/ProjectDataModel/RimDefines.h
View File

@ -46,7 +46,7 @@ public:
static QString combinedTransmissibilityResultName() { return "TRANSXYZ"; } static QString combinedTransmissibilityResultName() { return "TRANSXYZ"; }
static QString ternarySaturationResultName() { return "TERNARY"; } static QString ternarySaturationResultName() { return "TERNARY"; }
static QString combinedMultResultName() { return "MULTXYZ"; } static QString combinedMultResultName() { return "MULTXYZ"; }
static QString combinedRiTransResultName() { return "riTRANSXYZ"; }
// Mock model text identifiers // Mock model text identifiers
static QString mockModelBasic() { return "Result Mock Debug Model Simple"; } static QString mockModelBasic() { return "Result Mock Debug Model Simple"; }

20
ApplicationCode/ReservoirDataModel/RigCaseCellResultsData.cpp
View File

@ -228,6 +228,8 @@ size_t RigCaseCellResultsData::addEmptyScalarResult(RimDefines::ResultCatType ty
ResultInfo resInfo(type, needsToBeStored, false, resultName, scalarResultIndex); ResultInfo resInfo(type, needsToBeStored, false, resultName, scalarResultIndex);
m_resultInfos.push_back(resInfo); m_resultInfos.push_back(resInfo);
cvf::ref<RigStatisticsCalculator> statisticsCalculator;
// Create statistics calculator and add cache object // Create statistics calculator and add cache object
if (resultName == RimDefines::combinedTransmissibilityResultName()) if (resultName == RimDefines::combinedTransmissibilityResultName())
{ {
@ -240,8 +242,7 @@ size_t RigCaseCellResultsData::addEmptyScalarResult(RimDefines::ResultCatType ty
calc->addStatisticsCalculator(new RigNativeStatCalc(this, tranY)); calc->addStatisticsCalculator(new RigNativeStatCalc(this, tranY));
calc->addStatisticsCalculator(new RigNativeStatCalc(this, tranZ)); calc->addStatisticsCalculator(new RigNativeStatCalc(this, tranZ));
cvf::ref<RigStatisticsDataCache> dataCache = new RigStatisticsDataCache(calc.p()); statisticsCalculator = calc;
m_statisticsDataCache.push_back(dataCache.p());
} }
else if (resultName == RimDefines::combinedMultResultName()) else if (resultName == RimDefines::combinedMultResultName())
{ {
@ -272,16 +273,19 @@ size_t RigCaseCellResultsData::addEmptyScalarResult(RimDefines::ResultCatType ty
if (scalarIdx != cvf::UNDEFINED_SIZE_T) calc->addStatisticsCalculator(new RigNativeStatCalc(this, scalarIdx)); if (scalarIdx != cvf::UNDEFINED_SIZE_T) calc->addStatisticsCalculator(new RigNativeStatCalc(this, scalarIdx));
} }
cvf::ref<RigStatisticsDataCache> dataCache = new RigStatisticsDataCache(calc.p()); statisticsCalculator = calc;
m_statisticsDataCache.push_back(dataCache.p()); }
else if (resultName == RimDefines::combinedRiTransResultName())
{
} }
else else
{ {
cvf::ref<RigNativeStatCalc> calc = new RigNativeStatCalc(this, scalarResultIndex); statisticsCalculator = new RigNativeStatCalc(this, scalarResultIndex);
cvf::ref<RigStatisticsDataCache> dataCache = new RigStatisticsDataCache(calc.p());
m_statisticsDataCache.push_back(dataCache.p());
} }
cvf::ref<RigStatisticsDataCache> dataCache = new RigStatisticsDataCache(statisticsCalculator.p());
m_statisticsDataCache.push_back(dataCache.p());
} }
return scalarResultIndex; return scalarResultIndex;

16
ApplicationCode/ReservoirDataModel/RigResultAccessorFactory.cpp
View File

@ -35,6 +35,7 @@
#include "cvfObject.h" #include "cvfObject.h"
#include <math.h> #include <math.h>
#include "RigCombRiTransResultAccessor.h"
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
@ -79,6 +80,21 @@ cvf::ref<RigResultAccessor> RigResultAccessorFactory::createResultAccessor(RigCa
return cellFaceAccessObject; return cellFaceAccessObject;
} }
else if (uiResultName == RimDefines::combinedRiTransResultName())
{
cvf::ref<RigCombRiTransResultAccessor> cellFaceAccessObject = new RigCombRiTransResultAccessor(grid);
cvf::ref<RigResultAccessor> permX = RigResultAccessorFactory::createNativeResultAccessor(eclipseCase, gridIndex, porosityModel, timeStepIndex, "PERMX");
cvf::ref<RigResultAccessor> permY = RigResultAccessorFactory::createNativeResultAccessor(eclipseCase, gridIndex, porosityModel, timeStepIndex, "PERMY");
cvf::ref<RigResultAccessor> permZ = RigResultAccessorFactory::createNativeResultAccessor(eclipseCase, gridIndex, porosityModel, timeStepIndex, "PERMZ");
cvf::ref<RigResultAccessor> ntg = RigResultAccessorFactory::createNativeResultAccessor(eclipseCase, gridIndex, porosityModel, timeStepIndex, "NTG");
cellFaceAccessObject->setPermResultAccessors(permX.p(), permY.p(), permZ.p());
cellFaceAccessObject->setNTGResultAccessor(ntg.p());
// todo : cellFaceAccessObject->setCDARCHY();
return cellFaceAccessObject;
}
return RigResultAccessorFactory::createNativeResultAccessor(eclipseCase, gridIndex, porosityModel, timeStepIndex, uiResultName); return RigResultAccessorFactory::createNativeResultAccessor(eclipseCase, gridIndex, porosityModel, timeStepIndex, uiResultName);
} }