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

Refactor: move opm-flow deck keyword generation to factory.

Browse Source
This commit is contained in:
Kristian Bendiksen committed 2025-10-24 19:33:35 +02:00
1 parent 04dfa4ecba
commit 4e736a8cc0
7 files changed
+216 -227
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/UnitTests/RifOpmFlowDeckFile-Test.cpp
+11 -6
View File
@@ -7,9 +7,12 @@
#include "RigEclipseResultTools.h"
#include "ProjectDataModel/Jobs/RimKeywordFactory.h"
#include "cvfStructGrid.h"
#include "opm/input/eclipse/Deck/DeckItem.hpp"
#include "opm/input/eclipse/Deck/DeckKeyword.hpp"
#include "opm/input/eclipse/Deck/DeckRecord.hpp"
#include "opm/input/eclipse/Parser/ParserKeywords/B.hpp"
@@ -268,11 +271,12 @@ TEST( RifOpmFlowDeckFileTest, AddOperaterKeyword )
ASSERT_TRUE( loadSuccess ) << "Failed to load test deck file";
// Add OPERATER statement to GRID section: PORV 9 MULTX PORV 1.0e6 1* 1*
bool addSuccess = deckFile.addOperaterKeyword( "GRID", "PORV", 9, "MULTX", "PORV", 1.0e6f, std::nullopt );
bool addSuccess = deckFile.replaceKeyword( "GRID", RimKeywordFactory::operaterKeyword( "PORV", 9, "MULTX", "PORV", 1.0e6f, std::nullopt ) );
EXPECT_TRUE( addSuccess ) << "Should successfully add OPERATER statement in GRID section";
// Test adding to non-existent section
bool addFailure = deckFile.addOperaterKeyword( "NONEXISTENT", "PORV", 1, "MULTX", "PORV", std::nullopt, std::nullopt );
bool addFailure = deckFile.replaceKeyword( "NONEXISTENT",
RimKeywordFactory::operaterKeyword( "PORV", 1, "MULTX", "PORV", std::nullopt, std::nullopt ) );
EXPECT_FALSE( addFailure ) << "Should fail when adding to non-existent section";
// Verify the keywords list contains our OPERATER statement
@@ -304,7 +308,7 @@ TEST( RifOpmFlowDeckFileTest, AddOperaterSaveAndReload )
ASSERT_TRUE( loadSuccess ) << "Failed to load test deck file";
// Add OPERATER statement: PORV 9 MULTX PORV 1.0e6 1* 1*
bool addSuccess = deckFile.addOperaterKeyword( "GRID", "PORV", 9, "MULTX", "PORV", 1.0e6f, std::nullopt );
bool addSuccess = deckFile.replaceKeyword( "GRID", RimKeywordFactory::operaterKeyword( "PORV", 9, "MULTX", "PORV", 1.0e6f, std::nullopt ) );
EXPECT_TRUE( addSuccess ) << "Should successfully add OPERATER statement";
// Save the deck to a temporary location
@@ -406,9 +410,10 @@ TEST( RifOpmFlowDeckFileTest, BcpropKeyword )
bcProperties.push_back( Opm::DeckRecord{ std::move( items ) } );
}
// Add BCPROP keyword
bool bcpropAdded = deckFile.addBcpropKeyword( "GRID", boundaryConditions, bcProperties );
ASSERT_TRUE( bcpropAdded ) << "Failed to add BCPROP keyword";
// Create BCPROP keyword using factory and replace in deck
Opm::DeckKeyword bcpropKw = RimKeywordFactory::bcpropKeyword( boundaryConditions, bcProperties );
bool bcpropAdded = deckFile.replaceKeyword( "GRID", bcpropKw );
ASSERT_TRUE( bcpropAdded ) << "Failed to replace BCPROP keyword";
// Save deck and verify format
QString outputDeckPath = tempDir.filePath( "output_bcprop.DATA" );
ApplicationLibCode/UnitTests/RigEclipseResultTools-Test.cpp
+8 -3
View File
@@ -25,6 +25,8 @@
#include "RifReaderEclipseOutput.h"
#include "RigEclipseResultTools.h"
#include "ProjectDataModel/Jobs/RimKeywordFactory.h"
#include "RigActiveCellInfo.h"
#include "RigCaseCellResultsData.h"
#include "RigEclipseCaseData.h"
@@ -32,6 +34,8 @@
#include "RigMainGrid.h"
#include "RimEclipseResultCase.h"
#include "opm/input/eclipse/Deck/DeckKeyword.hpp"
#include <QDir>
#include <QFile>
#include <QTemporaryDir>
@@ -175,9 +179,10 @@ TEST( RigEclipseResultToolsTest, BorderCellBcconGeneration )
bool deckLoaded = deckFile.loadDeck( deckFilePath.toStdString() );
ASSERT_TRUE( deckLoaded ) << "Failed to load deck file";
// Add BCCON keyword
bool bcconAdded = deckFile.addBcconKeyword( "GRID", borderCellFaces );
ASSERT_TRUE( bcconAdded ) << "Failed to add BCCON keyword";
// Create BCCON keyword using factory and replace in deck
Opm::DeckKeyword bcconKw = RimKeywordFactory::bcconKeyword( borderCellFaces );
bool bcconAdded = deckFile.replaceKeyword( "GRID", bcconKw );
ASSERT_TRUE( bcconAdded ) << "Failed to replace BCCON keyword";
// Step 7: Save deck and verify format
QString outputDeckPath = tempDir.filePath( "output_bccon.DATA" );