mirror of
https://github.com/OPM/ResInsight.git
synced 2026-10-26 23:20:29 -05:00
Well Event: Emit RPTRST/RPTSCHED as proper mnemonic lists
Schedule-level keywords whose OPM ParserRecord is a single ALL-sized item
(RPTRST, RPTSCHED, ...) are not positional — they take a free-form list
of mnemonic tokens like `BASIC=2 DEN ROCKC NORST=1`. Previously each
`keyword_data` entry became its own DeckItem, and OPM emitted them
either as truncated positional values or as a quoted, space-collapsed
single string.
Detect that schema shape in `RifEventKeywordFormatter::formatKeyword`
and pack the user's entries into one RawString DeckItem of mnemonic
tokens: `KEY` for FLAG items, `KEY=VALUE` otherwise.
To distinguish flag mnemonics (`DEN`) from `KEY=1`-style entries, add a
new `FLAG` value to `RimWellEventKeywordItem::ItemType` plumbed end to
end (Python -> GRPC -> Rimc -> storage -> formatter). The Python API
now maps `bool True` to FLAG and silently drops `bool False`.
For positional keywords (WCONHIST etc.) FLAG items have no value to
emit and are rendered as default markers ("1*").
A `rawStringItem` helper is added to `RifOpmDeckTools` so the
mnemonic-list path can produce DeckItems whose OPM output is not
quoted.
This commit is contained in:
1 parent
9ada4eed09
commit
d2e7bed6b8
12 files changed
+243
-63
No files matched your search
@@ -98,6 +98,17 @@ void RimKeywordEvent::addDoubleItem( const QString& name, double value )
|
||||
m_items.push_back( item );
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimKeywordEvent::addFlagItem( const QString& name )
|
||||
{
|
||||
auto* item = new RimWellEventKeywordItem();
|
||||
item->setItemName( name );
|
||||
item->setFlag();
|
||||
m_items.push_back( item );
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
||||
@@ -46,6 +46,7 @@ public:
|
||||
void addStringItem( const QString& name, const QString& value );
|
||||
void addIntItem( const QString& name, int value );
|
||||
void addDoubleItem( const QString& name, double value );
|
||||
void addFlagItem( const QString& name );
|
||||
|
||||
std::vector<class RimWellEventKeywordItem*> items() const;
|
||||
|
||||
|
||||
@@ -98,6 +98,17 @@ void RimWellEventKeyword::addDoubleItem( const QString& name, double value )
|
||||
m_items.push_back( item );
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimWellEventKeyword::addFlagItem( const QString& name )
|
||||
{
|
||||
auto* item = new RimWellEventKeywordItem();
|
||||
item->setItemName( name );
|
||||
item->setFlag();
|
||||
m_items.push_back( item );
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
||||
@@ -45,6 +45,7 @@ public:
|
||||
void addStringItem( const QString& name, const QString& value );
|
||||
void addIntItem( const QString& name, int value );
|
||||
void addDoubleItem( const QString& name, double value );
|
||||
void addFlagItem( const QString& name );
|
||||
|
||||
std::vector<class RimWellEventKeywordItem*> items() const;
|
||||
|
||||
|
||||
@@ -116,6 +116,14 @@ void RimWellEventKeywordItem::setDoubleValue( double value )
|
||||
m_doubleValue = value;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimWellEventKeywordItem::setFlag()
|
||||
{
|
||||
m_itemType = ItemType::FLAG;
|
||||
}
|
||||
|
||||
namespace caf
|
||||
{
|
||||
template <>
|
||||
@@ -124,6 +132,7 @@ void AppEnum<RimWellEventKeywordItem::ItemType>::setUp()
|
||||
addItem( RimWellEventKeywordItem::ItemType::STRING, "STRING", "String" );
|
||||
addItem( RimWellEventKeywordItem::ItemType::INTEGER, "INTEGER", "Integer" );
|
||||
addItem( RimWellEventKeywordItem::ItemType::DOUBLE, "DOUBLE", "Double" );
|
||||
addItem( RimWellEventKeywordItem::ItemType::FLAG, "FLAG", "Flag" );
|
||||
setDefault( RimWellEventKeywordItem::ItemType::STRING );
|
||||
}
|
||||
} // namespace caf
|
||||
@@ -38,7 +38,8 @@ public:
|
||||
{
|
||||
STRING,
|
||||
INTEGER,
|
||||
DOUBLE
|
||||
DOUBLE,
|
||||
FLAG
|
||||
};
|
||||
|
||||
RimWellEventKeywordItem();
|
||||
@@ -56,6 +57,7 @@ public:
|
||||
void setStringValue( const QString& value );
|
||||
void setIntValue( int value );
|
||||
void setDoubleValue( double value );
|
||||
void setFlag();
|
||||
|
||||
private:
|
||||
caf::PdmField<QString> m_itemName;
|
||||
|
||||
Reference in new issue
Block a user