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

Work in progress

Browse Source
This commit is contained in:
Jon Jenssen
2024-10-01 17:02:59 +02:00
parent cc4bfb2d20
commit 0edb4e5d65
9 changed files with 161 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationLibCode/ReservoirDataModel/ResultAccessors/RigActiveCellsResultAccessor.cpp
View File

@@ -40,7 +40,7 @@ double RigActiveCellsResultAccessor::cellScalar( size_t gridLocalCellIndex ) con
{
if ( m_reservoirResultValues == nullptr || m_reservoirResultValues->empty() ) return HUGE_VAL;
size_t reservoirCellIndex = m_grid->reservoirCellIndex( gridLocalCellIndex );
size_t reservoirCellIndex = m_grid->localCellIndexToNative( gridLocalCellIndex );
size_t resultValueIndex = m_activeCellInfo->cellResultIndex( reservoirCellIndex );
if ( resultValueIndex == cvf::UNDEFINED_SIZE_T ) return HUGE_VAL;

2
ApplicationLibCode/ReservoirDataModel/ResultAccessors/RigAllGridCellsResultAccessor.cpp
View File

@@ -39,7 +39,7 @@ double RigAllGridCellsResultAccessor::cellScalar( size_t gridLocalCellIndex ) co
{
if ( m_reservoirResultValues->empty() ) return HUGE_VAL;
size_t reservoirCellIndex = m_grid->reservoirCellIndex( gridLocalCellIndex );
size_t reservoirCellIndex = m_grid->localCellIndexToNative( gridLocalCellIndex );
CVF_TIGHT_ASSERT( reservoirCellIndex < m_reservoirResultValues->size() );
return m_reservoirResultValues->at( reservoirCellIndex );

4
ApplicationLibCode/ReservoirDataModel/RigCaseCellResultCalculator.cpp
View File

@@ -185,7 +185,7 @@ bool RigCaseCellResultCalculator::computeDifference( RigEclipseCaseData*
#pragma omp parallel for
for ( long localGridCellIdx = 0; localGridCellIdx < static_cast<long>( grid->cellCount() ); localGridCellIdx++ )
{
size_t reservoirCellIndex = grid->reservoirCellIndex( localGridCellIdx );
size_t reservoirCellIndex = grid->localNativeToNative( localGridCellIdx );
if ( activeCellInfo->isActive( reservoirCellIndex ) )
{
double sourceVal = sourceResultAccessor->cellScalar( localGridCellIdx );
@@ -290,7 +290,7 @@ bool RigCaseCellResultCalculator::computeDivideByCellFaceArea( RigMainGrid*
#pragma omp parallel for
for ( int localGridCellIdx = 0; localGridCellIdx < static_cast<int>( grid->cellCount() ); localGridCellIdx++ )
{
const size_t reservoirCellIndex = grid->reservoirCellIndex( localGridCellIdx );
const size_t reservoirCellIndex = grid->localNativeToNative( localGridCellIdx );
if ( activeCellInfo->isActive( reservoirCellIndex ) )
{
double sourceVal = sourceResultAccessor->cellScalar( localGridCellIdx );

4
ApplicationLibCode/ReservoirDataModel/RigGridBase.cpp
View File

@@ -603,9 +603,7 @@ bool RigGridCellFaceVisibilityFilter::isFaceVisible( size_t
// Do not show cell geometry if a fault is present to avoid z fighting between surfaces
// It will always be a better solution to avoid geometry creation instead of part priority and polygon offset
const auto cellIndex = m_grid->nativeCellIndexToGlobal( nativeCellIndex );
size_t resvCellIndex = m_grid->reservoirCellIndex( cellIndex );
const RigFault* fault = m_grid->mainGrid()->findFaultFromCellIndexAndCellFace( resvCellIndex, face );
const RigFault* fault = m_grid->mainGrid()->findFaultFromCellIndexAndCellFace( nativeCellIndex, face );
if ( fault )
{
return false;

2
ApplicationLibCode/ReservoirDataModel/RigReservoirBuilder.cpp
View File

@@ -109,7 +109,7 @@ void RigReservoirBuilder::createGridsAndCells( RigEclipseCaseData* eclipseCase )
eclipseCase->mainGrid()->addLocalGrid( localGrid );
localGrid->setParentGrid( eclipseCase->mainGrid() );
localGrid->setIndexToStartOfCells( mainGridNodes.size() / 8 );
localGrid->setIndexToGlobalStartOfCells( mainGridNodes.size() / 8 );
cvf::Vec3st gridPointDimensions( lgr.m_singleCellRefinementFactors.x() *
( lgr.m_mainGridMaxCellPosition.x() - lgr.m_mainGridMinCellPosition.x() + 1 ) +
1,

10
ApplicationLibCode/ReservoirDataModel/RigResultModifier.h
View File

@@ -45,10 +45,10 @@ public:
void setCellScalar( size_t gridLocalCellIndex, double scalarValue ) override
{
size_t reservoirCellIndex = m_grid->reservoirCellIndex( gridLocalCellIndex );
CVF_TIGHT_ASSERT( reservoirCellIndex < m_reservoirResultValues->size() );
size_t nativeCellIndex = m_grid->localCellIndexToNative( gridLocalCellIndex );
CVF_TIGHT_ASSERT( nativeCellIndex < m_reservoirResultValues->size() );
( *m_reservoirResultValues )[reservoirCellIndex] = scalarValue;
( *m_reservoirResultValues )[nativeCellIndex] = scalarValue;
}
private:
@@ -71,8 +71,8 @@ public:
void setCellScalar( size_t gridLocalCellIndex, double scalarValue ) override
{
size_t reservoirCellIndex = m_grid->reservoirCellIndex( gridLocalCellIndex );
size_t resultValueIndex = m_activeCellInfo->cellResultIndex( reservoirCellIndex );
size_t nativeCellIndex = m_grid->localCellIndexToNative( gridLocalCellIndex );
size_t resultValueIndex = m_activeCellInfo->cellResultIndex( nativeCellIndex );
CVF_TIGHT_ASSERT( m_reservoirResultValues != nullptr && resultValueIndex < m_reservoirResultValues->size() );