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

Ensemble Surface improvements

Browse Source 
* Performance : Improve surface import
* Performance: Use opm when importing files
* Surface : Use the triangle size as basis for the maximum search distance
* Performance : Resample surfaces in parallell
* Performance: Import file surfaces in parallell
* Ensemble Surface : Create one ensemble per surface
This commit is contained in:
Magne Sjaastad
2021-09-16 14:28:19 +02:00
committed by GitHub
parent 1e83254e9e
commit 2480a782d1
11 changed files with 253 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ApplicationLibCode/ProjectDataModel/Surfaces/RimEnsembleSurface.cpp
View File

@@ -103,11 +103,14 @@ std::vector<RimFileSurface*> RimEnsembleSurface::sourceFileSurfaces() const
//--------------------------------------------------------------------------------------------------
void RimEnsembleSurface::loadDataAndUpdate()
{
for ( auto& w : sourceFileSurfaces() )
{
if ( !w->onLoadData() )
auto fileSurfaces = sourceFileSurfaces();
auto surfaceCount = static_cast<int>( fileSurfaces.size() );
#pragma omp parallel for
for ( int i = 0; i < surfaceCount; i++ )
{
RiaLogging::warning( QString( "Failed to load surface: %1" ).arg( w->surfaceFilePath() ) );
auto surf = fileSurfaces[i];
surf->onLoadData();
}
}
@@ -121,9 +124,16 @@ void RimEnsembleSurface::loadDataAndUpdate()
{
cvf::ref<RigSurface> firstSurface = sourceSurfaceForStatistics[0]->surfaceData();
std::vector<cvf::ref<RigSurface>> sourceSurfaces;
for ( auto& w : sourceSurfaceForStatistics )
sourceSurfaces.push_back( RigSurfaceResampler::resampleSurface( firstSurface, w->surfaceData() ) );
auto surfaceCount = static_cast<int>( sourceSurfaceForStatistics.size() );
std::vector<cvf::ref<RigSurface>> sourceSurfaces( surfaceCount );
#pragma omp parallel for
for ( int i = 0; i < surfaceCount; i++ )
{
auto surf = sourceSurfaceForStatistics[i];
auto resampledSurface = RigSurfaceResampler::resampleSurface( firstSurface, surf->surfaceData() );
sourceSurfaces[i] = resampledSurface;
}
m_statisticsSurface = RigSurfaceStatisticsCalculator::computeStatistics( sourceSurfaces );
if ( !m_statisticsSurface.isNull() )