OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-31 17:17:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

#12957 Sector Model Export: introduce RigRefinement interface hierarchy

Browse Source 
Replace the monolithic RigNonUniformRefinement class with a proper
polymorphic hierarchy: RigRefinement (abstract base), RigNoRefinement
(identity), RigUniformRefinement (O(1) uniform), and
RigNonUniformRefinement (per-cell custom fractions).

Ownership uses std::unique_ptr<RigRefinement>, consumers receive
const RigRefinement&. This eliminates the misleading class name,
removes effectiveRefinement() indirection, and gives each refinement
mode an appropriately optimized implementation.
This commit is contained in:
Kristian Bendiksen committed 2026-03-30 11:24:56 +02:00
1 parent 4aa0910db3
commit 3067823e71
33 files changed
+922 -796
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/Commands/ExportCommands/RicExportSectorModelFeature.cpp
+1 -1
View File
@@ -99,7 +99,7 @@ void RicExportSectorModelFeature::doExport( RicExportSectorModelUi* exportSettin
RigSimulationInputSettings settings;
settings.setMin( exportSettings->min() );
settings.setMax( exportSettings->max() );
settings.setEffectiveRefinement( exportSettings->effectiveRefinement() );
settings.setRefinement( exportSettings->effectiveRefinement() );
std::vector<std::string> keywordsToRemove;
for ( auto& s : exportSettings->keywordsToRemove() )
ApplicationLibCode/Commands/ExportCommands/RicExportSectorModelUi.cpp
+1 -10
View File
@@ -460,7 +460,7 @@ RicRefinementSettings* RicExportSectorModelUi::refinementSettings() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RigNonUniformRefinement RicExportSectorModelUi::effectiveRefinement() const
std::unique_ptr<RigRefinement> RicExportSectorModelUi::effectiveRefinement() const
{
m_refinementSettings->setSectorBounds( min(), max() );
return m_refinementSettings->effectiveRefinement();
@@ -475,15 +475,6 @@ cvf::Vec3st RicExportSectorModelUi::refinement() const
return m_refinementSettings->refinement();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RigNonUniformRefinement RicExportSectorModelUi::nonUniformRefinement() const
{
m_refinementSettings->setSectorBounds( min(), max() );
return m_refinementSettings->nonUniformRefinement();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
ApplicationLibCode/Commands/ExportCommands/RicExportSectorModelUi.h
+5 -5
View File
@@ -26,12 +26,13 @@
#include "cafVecIjk.h"
#include "RiaModelExportDefines.h"
#include "RigNonUniformRefinement.h"
#include "RigRefinement.h"
#include <QString>
#include <QStringList>
#include <map>
#include <memory>
class RigModelPaddingSettings;
class RimKeywordBcprop;
@@ -66,10 +67,9 @@ public:
RicRefinementSettings* refinementSettings() const;
RigNonUniformRefinement effectiveRefinement() const;
cvf::Vec3st refinement() const;
RigNonUniformRefinement nonUniformRefinement() const;
bool hasNonUniformRefinement() const;
std::unique_ptr<RigRefinement> effectiveRefinement() const;
cvf::Vec3st refinement() const;
bool hasNonUniformRefinement() const;
std::vector<QString> keywordsToRemove() const;
ApplicationLibCode/Commands/ExportCommands/RicRefinementSettings.cpp
+19 -14
View File
@@ -20,6 +20,10 @@
#include "RiaLogging.h"
#include "RigNoRefinement.h"
#include "RigNonUniformRefinement.h"
#include "RigUniformRefinement.h"
#include "cafPdmUiCheckBoxEditor.h"
#include "cafPdmUiGroup.h"
#include "cafPdmUiRadioButtonEditor.h"
@@ -128,7 +132,7 @@ void RicRefinementSettings::setSectorBounds( const caf::VecIjk0& min, const caf:
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RigNonUniformRefinement RicRefinementSettings::effectiveRefinement() const
std::unique_ptr<RigRefinement> RicRefinementSettings::effectiveRefinement() const
{
size_t sectorSizeI = m_sectorMaxI - m_sectorMinI + 1;
size_t sectorSizeJ = m_sectorMaxJ - m_sectorMinJ + 1;
@@ -136,11 +140,12 @@ RigNonUniformRefinement RicRefinementSettings::effectiveRefinement() const
cvf::Vec3st sectorSize( sectorSizeI, sectorSizeJ, sectorSizeK );
if ( !m_refineGrid() ) return RigNonUniformRefinement( sectorSize );
if ( !m_refineGrid() ) return std::make_unique<RigNoRefinement>( sectorSize );
if ( m_refinementMode() == UNIFORM )
{
return RigNonUniformRefinement::fromUniform( cvf::Vec3st( m_refinementCountI(), m_refinementCountJ(), m_refinementCountK() ), sectorSize );
return std::make_unique<RigUniformRefinement>( cvf::Vec3st( m_refinementCountI(), m_refinementCountJ(), m_refinementCountK() ),
sectorSize );
}
return nonUniformRefinement();
@@ -170,7 +175,7 @@ RicRefinementSettings::RefinementMode RicRefinementSettings::refinementMode() co
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RigNonUniformRefinement RicRefinementSettings::nonUniformRefinement() const
std::unique_ptr<RigNonUniformRefinement> RicRefinementSettings::nonUniformRefinement() const
{
size_t sectorSizeI = m_sectorMaxI - m_sectorMinI + 1;
size_t sectorSizeJ = m_sectorMaxJ - m_sectorMinJ + 1;
@@ -178,7 +183,7 @@ RigNonUniformRefinement RicRefinementSettings::nonUniformRefinement() const
cvf::Vec3st sectorSize( sectorSizeI, sectorSizeJ, sectorSizeK );
RigNonUniformRefinement result( sectorSize );
auto result = std::make_unique<RigNonUniformRefinement>( sectorSize );
if ( !m_refineGrid() || m_refinementMode() != NON_UNIFORM ) return result;
@@ -241,7 +246,7 @@ RigNonUniformRefinement RicRefinementSettings::nonUniformRefinement() const
int sectorEnd = dc.rangeEnd - sectorMin[static_cast<size_t>( dc.dim )];
// Clamp to sector bounds
int sectorMaxIdx = static_cast<int>( result.sectorSize( dc.dim ) ) - 1;
int sectorMaxIdx = static_cast<int>( result->sectorSize( dc.dim ) ) - 1;
sectorStart = std::max( 0, sectorStart );
sectorEnd = std::min( sectorMaxIdx, sectorEnd );
if ( sectorStart > sectorEnd )
@@ -271,19 +276,19 @@ RigNonUniformRefinement RicRefinementSettings::nonUniformRefinement() const
.arg( dc.rangeEnd )
.arg( sectorStart )
.arg( sectorEnd )
.arg( result.sectorSize( dc.dim ) )
.arg( result->sectorSize( dc.dim ) )
.arg( widths.size() ) );
result.distributeWidthsAcrossCells( dc.dim, sectorStart, sectorEnd, widths );
result->distributeWidthsAcrossCells( dc.dim, sectorStart, sectorEnd, widths );
}
else if ( subMode == LINEAR_EQUAL_SPLIT )
{
// Each cell in the range gets exactly N equal subcells
auto equalFractions = RigNonUniformRefinement::generateEqualFractions( static_cast<size_t>( dc.subcellCount ) );
auto equalFractions = RigRefinement::generateEqualFractions( static_cast<size_t>( dc.subcellCount ) );
for ( int c = sectorStart; c <= sectorEnd; ++c )
{
result.setCumulativeFractions( dc.dim, static_cast<size_t>( c ), equalFractions );
result->setCumulativeFractions( dc.dim, static_cast<size_t>( c ), equalFractions );
}
RiaLogging::info( QString( "Non-uniform refinement %1 (linear): %2 subcells per cell in range [%3, %4]" )
@@ -294,7 +299,7 @@ RigNonUniformRefinement RicRefinementSettings::nonUniformRefinement() const
}
else if ( subMode == LOGARITHMIC_CENTER )
{
auto widths = RigNonUniformRefinement::generateLogarithmicWidths( static_cast<size_t>( dc.totalCells ) );
auto widths = RigRefinement::generateLogarithmicWidths( static_cast<size_t>( dc.totalCells ) );
RiaLogging::info( QString( "Non-uniform refinement %1 (logarithmic): %2 total cells across range [%3, %4]" )
.arg( dimLabels[static_cast<size_t>( dc.dim )] )
@@ -302,13 +307,13 @@ RigNonUniformRefinement RicRefinementSettings::nonUniformRefinement() const
.arg( sectorStart )
.arg( sectorEnd ) );
result.distributeWidthsAcrossCells( dc.dim, sectorStart, sectorEnd, widths );
result->distributeWidthsAcrossCells( dc.dim, sectorStart, sectorEnd, widths );
}
RiaLogging::info( QString( "Non-uniform refinement %1: total refined count = %2 (was %3)" )
.arg( dimLabels[static_cast<size_t>( dc.dim )] )
.arg( result.totalRefinedCount( dc.dim ) )
.arg( result.sectorSize( dc.dim ) ) );
.arg( result->totalRefinedCount( dc.dim ) )
.arg( result->sectorSize( dc.dim ) ) );
}
return result;
ApplicationLibCode/Commands/ExportCommands/RicRefinementSettings.h
+9 -6
View File
@@ -22,11 +22,14 @@
#include "cafPdmObject.h"
#include "cafVecIjk.h"
#include "RigNonUniformRefinement.h"
#include "RigRefinement.h"
#include <QString>
#include <map>
#include <memory>
class RigNonUniformRefinement;
//==================================================================================================
///
@@ -59,11 +62,11 @@ public:
void setSectorBounds( const caf::VecIjk0& min, const caf::VecIjk0& max );
// Data access
RigNonUniformRefinement effectiveRefinement() const;
cvf::Vec3st refinement() const;
RefinementMode refinementMode() const;
RigNonUniformRefinement nonUniformRefinement() const;
bool hasNonUniformRefinement() const;
std::unique_ptr<RigRefinement> effectiveRefinement() const;
cvf::Vec3st refinement() const;
RefinementMode refinementMode() const;
std::unique_ptr<RigNonUniformRefinement> nonUniformRefinement() const;
bool hasNonUniformRefinement() const;
// UI integration
void addToUiOrdering( caf::PdmUiOrdering& uiOrdering );