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

Improve handling of data keywords in deck files. (#13423)

Browse Source 
* Handle data keywords, and use data flag to check if a result with a given name should be added or not to the output file.
This commit is contained in:
JJ authored and GitHub committed 2026-01-14 12:06:59 +01:00
1 parent f06bd7f129
commit 5bb431ef33
3 files changed
+29 -21
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/FileInterface/RifOpmFlowDeckFile.cpp
+14 -8
View File
@@ -1061,7 +1061,7 @@ bool RifOpmFlowDeckFile::stopAtTimeStep( int timeStep )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RifOpmFlowDeckFile::replaceKeywordData( const std::string& keyword, const std::vector<double>& data )
bool RifOpmFlowDeckFile::replaceKeyword( const std::string& keyword, const std::vector<double>& data, bool dataKeyword )
{
try
{
@@ -1073,10 +1073,13 @@ bool RifOpmFlowDeckFile::replaceKeywordData( const std::string& keyword, const s
// Get the existing keyword to preserve location
const auto& existingKw = m_fileDeck->operator[]( keywordIdx.value() );
if ( dataKeyword != existingKw.isDataKeyword() )
{
return false; // Mismatch in data keyword flag
}
// Create a new keyword with the same name and location
Opm::DeckKeyword newKw( existingKw.location(), keyword );
newKw.setDataKeyword( true );
// Create a new keyword with the same settings
Opm::DeckKeyword newKw = existingKw.emptyStructuralCopy();
// Keywords ending with "NUM" should be integers (e.g., SATNUM, PVTNUM, EQLNUM)
bool isIntType = keyword.size() >= 3 && keyword.substr( keyword.size() - 3 ) == "NUM";
@@ -1123,7 +1126,7 @@ bool RifOpmFlowDeckFile::replaceKeywordData( const std::string& keyword, const s
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RifOpmFlowDeckFile::replaceKeywordData( const std::string& keyword, const std::vector<int>& data )
bool RifOpmFlowDeckFile::replaceKeyword( const std::string& keyword, const std::vector<int>& data, bool dataKeyword )
{
try
{
@@ -1135,10 +1138,13 @@ bool RifOpmFlowDeckFile::replaceKeywordData( const std::string& keyword, const s
// Get the existing keyword to preserve location
const auto& existingKw = m_fileDeck->operator[]( keywordIdx.value() );
if ( dataKeyword != existingKw.isDataKeyword() )
{
return false; // Mismatch in data keyword flag
}
// Create a new keyword with the same name and location
Opm::DeckKeyword newKw( existingKw.location(), keyword );
newKw.setDataKeyword( true );
// Create a new keyword with the same settings
Opm::DeckKeyword newKw = existingKw.emptyStructuralCopy();
// Create a record with the new data
Opm::DeckRecord record;