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

#7869 Ensemble Fracture Statistics: optimization by AABB tree. (#7924)

Browse Source
This commit is contained in:
Kristian Bendiksen
2021-08-30 15:01:18 +02:00
committed by GitHub
parent 264e1decdc
commit 8d42533179
4 changed files with 80 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
ApplicationLibCode/ProjectDataModel/Completions/RimEnsembleFractureStatistics.cpp
View File

@@ -899,17 +899,6 @@ double RimEnsembleFractureStatistics::linearSampling( double minVa
return sampleDistance;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimEnsembleFractureStatistics::isCoordinateInsideFractureCell( double x, double y, const RigFractureCell& cell )
{
const cvf::Vec3d& minPoint = cell.getPolygon()[0];
const cvf::Vec3d& maxPoint = cell.getPolygon()[2];
// TODO: Investigate strange ordering for y coords.
return ( x > minPoint.x() && x <= maxPoint.x() && y <= minPoint.y() && y > maxPoint.y() );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -939,24 +928,24 @@ void RimEnsembleFractureStatistics::sampleAllGrids( const std::vector<cvf::cref<
const std::vector<double>& samplesY,
std::vector<std::vector<double>>& samples )
{
for ( size_t y = 0; y < samplesY.size(); y++ )
const int ny = samplesY.size();
#pragma omp parallel for
for ( int y = 0; y < ny; y++ )
{
for ( size_t x = 0; x < samplesX.size(); x++ )
{
double posX = samplesX[x];
double posY = samplesY[y];
double posX = samplesX[x];
double posY = samplesY[y];
cvf::Vec3d pos( posX, posY, 0.0 );
for ( auto fractureGrid : fractureGrids )
{
for ( auto fractureCell : fractureGrid->fractureCells() )
const RigFractureCell* fractureCell = fractureGrid->getCellFromPosition( pos );
if ( fractureCell )
{
if ( isCoordinateInsideFractureCell( posX, posY, fractureCell ) )
{
size_t idx = y * samplesX.size() + x;
double value = fractureCell.getConductivityValue();
if ( !std::isinf( value ) ) samples[idx].push_back( value );
break;
}
size_t idx = y * samplesX.size() + x;
double value = fractureCell->getConductivityValue();
if ( !std::isinf( value ) ) samples[idx].push_back( value );
}
}
}
@@ -1032,7 +1021,9 @@ void RimEnsembleFractureStatistics::generateStatisticsGrids(
RigSlice2D occurrenceGrid( numSamplesX, numSamplesY );
for ( size_t y = 0; y < numSamplesY; y++ )
const int ny = static_cast<int>( numSamplesY );
#pragma omp parallel for
for ( int y = 0; y < ny; y++ )
{
for ( size_t x = 0; x < numSamplesX; x++ )
{