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

Moved needed code to above "delete" mark

Browse Source
This commit is contained in:
Jacob Støren
2014-08-06 16:51:09 +02:00
committed by Magne Sjaastad
parent 3c52137481
commit aff8d8fd2a
2 changed files with 65 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/ModelVisualization/RivCellEdgeEffectGenerator.h
View File

@@ -98,6 +98,14 @@ public:
texCoords[i*4 + 3] = texCoord; texCoords[i*4 + 3] = texCoord;
} }
Texturing needs in ResInsight:
* ScalarMapper
* Handle HugeVal/nan
* PipeCellTransparency
- includes geometry point to cell mapping
* Modify the Scalarmapper Texture
* The domain values to convert pr geometry point
*/ */

119
ApplicationCode/ReservoirDataModel/RigResultAccessObjectFactory.cpp
View File

@@ -95,9 +95,65 @@ cvf::ref<RigResultAccessObject> RigResultAccessObjectFactory::createNativeDataAc
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
cvf::ref<RigResultAccessObject> RigResultAccessObjectFactory::createResultAccessObject(RigCaseData* eclipseCase,
size_t gridIndex,
RifReaderInterface::PorosityModelResultType porosityModel,
size_t timeStepIndex,
QString& uiResultName)
{
CVF_ASSERT(gridIndex < eclipseCase->gridCount());
CVF_ASSERT(eclipseCase);
CVF_ASSERT(eclipseCase->results(porosityModel));
CVF_ASSERT(eclipseCase->activeCellInfo(porosityModel));
RigGridBase* grid = eclipseCase->grid(gridIndex);
// Ternary
if (uiResultName == RimDefines::ternarySaturationResultName())
{
return NULL;
}
else if (uiResultName == RimDefines::combinedTransmissibilityResultName())
{
// TODO
// Taken from RivTransmissibilityColorMapper::updateCombinedTransmissibilityTextureCoordinates
//
cvf::ref<RigCombTransResultAccessObject> cellFaceAccessObject = new RigCombTransResultAccessObject(grid, uiResultName);
{
cvf::ref<RigResultAccessObject> nativeAccessObject = RigResultAccessObjectFactory::createNativeDataAccessObject(eclipseCase, gridIndex, porosityModel, timeStepIndex, QString("TRANX"));
if (nativeAccessObject.notNull())
{
cellFaceAccessObject->setDataAccessObjectForFace(cvf::StructGridInterface::POS_I, nativeAccessObject.p());
}
}
{
cvf::ref<RigResultAccessObject> nativeAccessObject = RigResultAccessObjectFactory::createNativeDataAccessObject(eclipseCase, gridIndex, porosityModel, timeStepIndex, QString("TRANY"));
if (nativeAccessObject.notNull())
{
cellFaceAccessObject->setDataAccessObjectForFace(cvf::StructGridInterface::POS_J, nativeAccessObject.p());
}
}
{
cvf::ref<RigResultAccessObject> nativeAccessObject = RigResultAccessObjectFactory::createNativeDataAccessObject(eclipseCase, gridIndex, porosityModel, timeStepIndex, QString("TRANZ"));
if (nativeAccessObject.notNull())
{
cellFaceAccessObject->setDataAccessObjectForFace(cvf::StructGridInterface::POS_K, nativeAccessObject.p());
}
}
return cellFaceAccessObject;
}
return NULL;
}
@@ -277,64 +333,3 @@ cvf::ref<cvf::StructGridScalarDataAccess> RigResultAccessObjectFactory::TO_BE_DE
return object; return object;
} }
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
cvf::ref<RigResultAccessObject> RigResultAccessObjectFactory::createResultAccessObject(RigCaseData* eclipseCase,
size_t gridIndex,
RifReaderInterface::PorosityModelResultType porosityModel,
size_t timeStepIndex,
QString& uiResultName)
{
CVF_ASSERT(gridIndex < eclipseCase->gridCount());
CVF_ASSERT(eclipseCase);
CVF_ASSERT(eclipseCase->results(porosityModel));
CVF_ASSERT(eclipseCase->activeCellInfo(porosityModel));
RigGridBase* grid = eclipseCase->grid(gridIndex);
// Ternary
if (uiResultName == RimDefines::ternarySaturationResultName())
{
return NULL;
}
else if (uiResultName == RimDefines::combinedTransmissibilityResultName())
{
// TODO
// Taken from RivTransmissibilityColorMapper::updateCombinedTransmissibilityTextureCoordinates
//
cvf::ref<RigCombTransResultAccessObject> cellFaceAccessObject = new RigCombTransResultAccessObject(grid, uiResultName);
{
cvf::ref<RigResultAccessObject> nativeAccessObject = RigResultAccessObjectFactory::createNativeDataAccessObject(eclipseCase, gridIndex, porosityModel, timeStepIndex, QString("TRANX"));
if (nativeAccessObject.notNull())
{
cellFaceAccessObject->setDataAccessObjectForFace(cvf::StructGridInterface::POS_I, nativeAccessObject.p());
}
}
{
cvf::ref<RigResultAccessObject> nativeAccessObject = RigResultAccessObjectFactory::createNativeDataAccessObject(eclipseCase, gridIndex, porosityModel, timeStepIndex, QString("TRANY"));
if (nativeAccessObject.notNull())
{
cellFaceAccessObject->setDataAccessObjectForFace(cvf::StructGridInterface::POS_J, nativeAccessObject.p());
}
}
{
cvf::ref<RigResultAccessObject> nativeAccessObject = RigResultAccessObjectFactory::createNativeDataAccessObject(eclipseCase, gridIndex, porosityModel, timeStepIndex, QString("TRANZ"));
if (nativeAccessObject.notNull())
{
cellFaceAccessObject->setDataAccessObjectForFace(cvf::StructGridInterface::POS_K, nativeAccessObject.p());
}
}
return cellFaceAccessObject;
}
return NULL;
}