OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-08-27 05:37:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update OPERNUM correctly.

Browse Source
This commit is contained in:
Kristian Bendiksen
2025-11-03 09:56:19 +01:00
parent 241cc34ed4
commit 2e363e4d73
3 changed files with 113 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationLibCode/Commands/ExportCommands/RicExportEclipseSectorModelFeature.cpp
+99 -94
View File
@@ -132,16 +132,6 @@ void RicExportEclipseSectorModelFeature::executeCommand( RimEclipseView*
exportGrid( view, exportSettings );
}
// Generate BORDNUM result based on the selected grid box
auto bordnumVisibility = createVisibilityBasedOnBoxSelection( view, exportSettings );
if ( !bordnumVisibility.isNull() )
{
RigEclipseResultTools::generateBorderResult( view->eclipseCase(), bordnumVisibility, RiaResultNames::bordnum() );
// Generate OPERNUM result based on BORDNUM (border cells get max existing OPERNUM + 1)
RigEclipseResultTools::generateOperNumResult( view->eclipseCase() );
}
if ( exportSettings.exportParameters() != RicExportEclipseSectorModelUi::EXPORT_NO_RESULTS )
{
auto task = progress.task( "Export Properties", resultProgressPercentage );
@@ -157,7 +147,7 @@ void RicExportEclipseSectorModelFeature::executeCommand( RimEclipseView*
// Export simulation input if enabled
if ( exportSettings.m_exportSimulationInput() )
{
if ( auto result = exportSimulationInput( *view->eclipseCase(), exportSettings ); !result )
if ( auto result = exportSimulationInput( *view, *view->eclipseCase(), exportSettings ); !result )
{
RiaLogging::error( QString( "Failed to export simulation input: %1" ).arg( result.error() ) );
}
@@ -206,18 +196,6 @@ void RicExportEclipseSectorModelFeature::exportParameters( RimEclipseView* view,
{
std::vector<QString> keywords = exportSettings.selectedKeywords;
// Automatically add BORDNUM to the keywords list if not already present
if ( std::find( keywords.begin(), keywords.end(), RiaResultNames::bordnum() ) == keywords.end() )
{
keywords.push_back( RiaResultNames::bordnum() );
}
// Automatically add OPERNUM to the keywords list if not already present
if ( std::find( keywords.begin(), keywords.end(), RiaResultNames::opernum() ) == keywords.end() )
{
keywords.push_back( RiaResultNames::opernum() );
}
if ( exportSettings.exportParameters == RicExportEclipseSectorModelUi::EXPORT_TO_SEPARATE_FILE_PER_RESULT )
{
QFileInfo info( exportSettings.exportGridFilename() );
@@ -309,7 +287,8 @@ void RicExportEclipseSectorModelFeature::exportFaults( RimEclipseView* view, con
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::expected<void, QString> RicExportEclipseSectorModelFeature::exportSimulationInput( RimEclipseCase& eclipseCase,
std::expected<void, QString> RicExportEclipseSectorModelFeature::exportSimulationInput( RimEclipseView& view,
RimEclipseCase& eclipseCase,
const RicExportEclipseSectorModelUi& exportSettings )
{
// Load the deck file
@@ -334,6 +313,21 @@ std::expected<void, QString> RicExportEclipseSectorModelFeature::exportSimulatio
return result;
}
// Generate BORDNUM result based on the selected grid box
auto bordnumVisibility = createVisibilityBasedOnBoxSelection( &view, exportSettings );
if ( !bordnumVisibility.isNull() )
{
RigEclipseResultTools::generateBorderResult( &eclipseCase, bordnumVisibility, RiaResultNames::bordnum() );
// Generate OPERNUM result based on BORDNUM (border cells get max existing OPERNUM + 1)
RigEclipseResultTools::generateOperNumResult( &eclipseCase );
}
if ( auto result = addOperNumRegionAndOperater( &eclipseCase, exportSettings, deckFile ); !result )
{
return result;
}
if ( auto result = replaceKeywordValuesInDeckFile( &eclipseCase, exportSettings, deckFile ); !result )
{
return result;
@@ -353,76 +347,6 @@ std::expected<void, QString> RicExportEclipseSectorModelFeature::exportSimulatio
{
return result;
}
// Update REGDIMS and add OPERATER keyword for OPERNUM regions
// Get the OPERNUM region number that was assigned to border cells
int maxOperNum = RigEclipseResultTools::findMaxOperNumValue( &eclipseCase );
int operNumRegion = maxOperNum; // Border cells use this region number
RiaLogging::info( QString( "Using OPERNUM region %1 for border cells" ).arg( operNumRegion ) );
// Ensure REGDIMS keyword exists
if ( !deckFile.ensureRegdimsKeyword() )
{
return std::unexpected( "Failed to ensure REGDIMS keyword exists in RUNSPEC section" );
}
// Read current REGDIMS values
auto regdimsValues = deckFile.regdims();
if ( regdimsValues.empty() )
{
// Use defaults if reading failed
regdimsValues = { 1, 1, 0, 0, 0, 1, 0 }; // NTFIP NMFIPR NRFREG NTFREG MAX_ETRACK NTCREG MAX_OPERNUM
}
// Update MAX_OPERNUM (item 7) to the new region number
if ( regdimsValues.size() < 7 )
{
regdimsValues.resize( 7, 0 );
}
regdimsValues[6] = operNumRegion; // Index 6 is item 7 (MAX_OPERNUM)
// Update REGDIMS in deck
if ( !deckFile.setRegdims( regdimsValues[0],
regdimsValues[1],
regdimsValues[2],
regdimsValues[3],
regdimsValues[4],
regdimsValues[5],
regdimsValues[6] ) )
{
return std::unexpected( "Failed to update REGDIMS keyword in deck file" );
}
// Check if OPERNUM keyword already exists in deck
auto opernumKeyword = deckFile.findKeyword( "OPERNUM" );
if ( !opernumKeyword.has_value() )
{
// Add INCLUDE for OPERNUM.GRDECL in REGIONS section
if ( !deckFile.addIncludeKeyword( "REGIONS", "OPERNUM", "OPERNUM.GRDECL" ) )
{
return std::unexpected( "Failed to add INCLUDE for OPERNUM in REGIONS section" );
}
RiaLogging::info( "Added INCLUDE 'OPERNUM.GRDECL' to REGIONS section" );
}
else
{
RiaLogging::info( "OPERNUM keyword already exists in deck, skipping INCLUDE" );
}
// Create OPERATER keyword to multiply pore volume in border region
// OPERATER format: TARGET_ARRAY REGION_NUMBER OPERATION ARRAY_PARAMETER PARAM1 PARAM2 REGION_NAME
// Example: OPERATER / PORV 1 MULTX PORV 1.0e6 1* 1* /
float porvMultiplier = 1.0e6f; // TODO: Make this user-configurable
Opm::DeckKeyword operaterKw = RimKeywordFactory::operaterKeyword( "PORV", operNumRegion, "MULTX", "PORV", porvMultiplier );
// Add OPERATER keyword to EDIT section
if ( !deckFile.replaceKeyword( "EDIT", operaterKw ) )
{
return std::unexpected( "Failed to add OPERATER keyword to EDIT section" );
}
RiaLogging::info( QString( "Added OPERATER keyword to multiply PORV in region %1 by %2" ).arg( operNumRegion ).arg( porvMultiplier ) );
}
// Remove SKIP keywords that were used as placeholders for filtered-out keywords
@@ -1215,3 +1139,84 @@ std::expected<void, QString> RicExportEclipseSectorModelFeature::filterAndUpdate
return {};
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::expected<void, QString> RicExportEclipseSectorModelFeature::addOperNumRegionAndOperater( RimEclipseCase* eclipseCase,
const RicExportEclipseSectorModelUi& exportSettings,
RifOpmFlowDeckFile& deckFile )
{
// Update REGDIMS and add OPERATER keyword for OPERNUM regions
// Get the OPERNUM region number that was assigned to border cells
int maxOperNum = RigEclipseResultTools::findMaxOperNumValue( eclipseCase );
int operNumRegion = maxOperNum + 1; // Border cells use this region number
RiaLogging::info( QString( "Using OPERNUM region %1 for border cells" ).arg( operNumRegion ) );
// Ensure REGDIMS keyword exists
if ( !deckFile.ensureRegdimsKeyword() )
{
return std::unexpected( "Failed to ensure REGDIMS keyword exists in RUNSPEC section" );
}
// Read current REGDIMS values
auto regdimsValues = deckFile.regdims();
if ( regdimsValues.empty() )
{
// TODO: improve this?
// Use defaults if reading failed
regdimsValues = { 1, 1, 0, 0, 0, 1, 0 }; // NTFIP NMFIPR NRFREG NTFREG MAX_ETRACK NTCREG MAX_OPERNUM
}
// Update MAX_OPERNUM (item 7) to the new region number
if ( regdimsValues.size() < 7 )
{
regdimsValues.resize( 7, 0 );
}
regdimsValues[6] = operNumRegion; // Index 6 is item 7 (MAX_OPERNUM)
// Update REGDIMS in deck
if ( !deckFile.setRegdims( regdimsValues[0],
regdimsValues[1],
regdimsValues[2],
regdimsValues[3],
regdimsValues[4],
regdimsValues[5],
regdimsValues[6] ) )
{
return std::unexpected( "Failed to update REGDIMS keyword in deck file" );
}
// Check if OPERNUM keyword already exists in deck
auto opernumKeyword = deckFile.findKeyword( "OPERNUM" );
if ( !opernumKeyword.has_value() )
{
// Add INCLUDE for OPERNUM.GRDECL in REGIONS section
if ( !deckFile.addIncludeKeyword( "REGIONS", "OPERNUM", "OPERNUM.GRDECL" ) )
{
return std::unexpected( "Failed to add INCLUDE for OPERNUM in REGIONS section" );
}
RiaLogging::info( "Added INCLUDE 'OPERNUM.GRDECL' to REGIONS section" );
}
else
{
RiaLogging::info( "OPERNUM keyword already exists in deck, skipping INCLUDE" );
}
// Create OPERATER keyword to multiply pore volume in border region
// OPERATER format: TARGET_ARRAY REGION_NUMBER OPERATION ARRAY_PARAMETER PARAM1 PARAM2 REGION_NAME
// Example: OPERATER / PORV 1 MULTX PORV 1.0e6 1* 1* /
float porvMultiplier = 1.0e6f; // TODO: Make this user-configurable
Opm::DeckKeyword operaterKw = RimKeywordFactory::operaterKeyword( "PORV", operNumRegion, "MULTX", "PORV", porvMultiplier );
// Add OPERATER keyword to EDIT section
if ( !deckFile.replaceKeyword( "EDIT", operaterKw ) )
{
return std::unexpected( "Failed to add OPERATER keyword to EDIT section" );
}
RiaLogging::info( QString( "Added OPERATER keyword to multiply PORV in region %1 by %2" ).arg( operNumRegion ).arg( porvMultiplier ) );
return {};
}
ApplicationLibCode/Commands/ExportCommands/RicExportEclipseSectorModelFeature.h
+12 -8
View File
@@ -56,14 +56,14 @@ protected:
void setupActionLook( QAction* actionToSetup ) override;
private:
RimEclipseView* selectedView() const;
static cvf::ref<cvf::UByteArray> createVisibilityBasedOnBoxSelection( RimEclipseView* view,
const RicExportEclipseSectorModelUi& exportSettings );
static std::expected<void, QString> exportSimulationInput( RimEclipseCase& eclipseCase,
const RicExportEclipseSectorModelUi& exportSettings );
static void exportGrid( RimEclipseView* view, const RicExportEclipseSectorModelUi& exportSettings );
static void exportFaults( RimEclipseView* view, const RicExportEclipseSectorModelUi& exportSettings );
static void exportParameters( RimEclipseView* view, const RicExportEclipseSectorModelUi& exportSettings );
RimEclipseView* selectedView() const;
static cvf::ref<cvf::UByteArray> createVisibilityBasedOnBoxSelection( RimEclipseView* view,
const RicExportEclipseSectorModelUi& exportSettings );
static std::expected<void, QString>
exportSimulationInput( RimEclipseView& view, RimEclipseCase& eclipseCase, const RicExportEclipseSectorModelUi& exportSettings );
static void exportGrid( RimEclipseView* view, const RicExportEclipseSectorModelUi& exportSettings );
static void exportFaults( RimEclipseView* view, const RicExportEclipseSectorModelUi& exportSettings );
static void exportParameters( RimEclipseView* view, const RicExportEclipseSectorModelUi& exportSettings );
static std::expected<void, QString>
addFaultsToDeckFile( RimEclipseCase* eclipseCase, const RicExportEclipseSectorModelUi& exportSettings, RifOpmFlowDeckFile& deckFile );
@@ -84,6 +84,10 @@ private:
const RicExportEclipseSectorModelUi& exportSettings,
RifOpmFlowDeckFile& deckFile );
static std::expected<void, QString> addOperNumRegionAndOperater( RimEclipseCase* eclipseCase,
const RicExportEclipseSectorModelUi& exportSettings,
RifOpmFlowDeckFile& deckFile );
static std::vector<RigSimWellData*> findIntersectingWells( RimEclipseCase* eclipseCase, const cvf::Vec3st& min, const cvf::Vec3st& max );
static std::expected<cvf::Vec3st, QString> transformIjkToSectorCoordinates( const cvf::Vec3st& originalIjk,
ApplicationLibCode/ProjectDataModel/Jobs/RimKeywordFactory.cpp
+2 -2
View File
@@ -582,7 +582,7 @@ Opm::DeckKeyword operaterKeyword( std::string targetProperty,
// Add alpha parameter
if ( alpha.has_value() )
{
recordItems.push_back( RifOpmDeckTools::item( O::PARAM1::itemName, std::to_string( alpha.value() ) ) );
recordItems.push_back( RifOpmDeckTools::item( O::PARAM1::itemName, alpha.value() ) );
}
else
{
@@ -592,7 +592,7 @@ Opm::DeckKeyword operaterKeyword( std::string targetProperty,
// Add beta parameter
if ( beta.has_value() )
{
recordItems.push_back( RifOpmDeckTools::item( O::PARAM2::itemName, std::to_string( beta.value() ) ) );
recordItems.push_back( RifOpmDeckTools::item( O::PARAM2::itemName, beta.value() ) );
}
else
{