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

BCPROP: add correct number of times to properties table.

Browse Source 
Also improved defaults.
This commit is contained in:
Kristian Bendiksen committed 2025-11-12 08:39:20 +01:00
1 parent b7a4983009
commit ba92dfb825
6 files changed
+100 -59
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/ProjectDataModel/Jobs/RimKeywordBcprop.cpp
+20 -9
View File
@@ -40,7 +40,7 @@ void caf::AppEnum<RimKeywordBcprop::Type>::setUp()
addItem( RimKeywordBcprop::Type::RATE, "RATE", "RATE" );
addItem( RimKeywordBcprop::Type::THERMAL, "THERMAL", "THERMAL" );
addItem( RimKeywordBcprop::Type::NONE, "NONE", "NONE" );
setDefault( RimKeywordBcprop::Type::NONE );
setDefault( RimKeywordBcprop::Type::FREE );
}
template <>
@@ -49,7 +49,7 @@ void caf::AppEnum<RimKeywordBcprop::Component>::setUp()
addItem( RimKeywordBcprop::Component::GAS, "GAS", "GAS" );
addItem( RimKeywordBcprop::Component::OIL, "OIL", "OIL" );
addItem( RimKeywordBcprop::Component::WATER, "WATER", "WATER" );
addItem( RimKeywordBcprop::Component::SOLVET, "SOLVET", "SOLVET" );
addItem( RimKeywordBcprop::Component::SOLVENT, "SOLVENT", "SOLVENT" );
addItem( RimKeywordBcprop::Component::POLYMER, "POLYMER", "POLYMER" );
addItem( RimKeywordBcprop::Component::MICR, "MICR", "MICR" );
addItem( RimKeywordBcprop::Component::OXYG, "OXYG", "OXYG" );
@@ -66,7 +66,7 @@ RimKeywordBcprop::RimKeywordBcprop()
{
CAF_PDM_InitObject( "BCPROP Keyword" );
CAF_PDM_InitField( &m_index, "index", 0, "Index" );
CAF_PDM_InitField( &m_type, "type", caf::AppEnum<Type>( Type::NONE ), "Type" );
CAF_PDM_InitField( &m_type, "type", caf::AppEnum<Type>( Type::FREE ), "Type" );
CAF_PDM_InitField( &m_component, "component", caf::AppEnum<Component>( Component::NONE ), "Component" );
CAF_PDM_InitField( &m_rate, "rate", 0.0, "Rate" );
CAF_PDM_InitFieldNoDefault( &m_press, "press", "Pressure" );
@@ -80,6 +80,14 @@ RimKeywordBcprop::~RimKeywordBcprop()
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimKeywordBcprop::setIndex( int index )
{
m_index = index;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -104,12 +112,15 @@ Opm::DeckKeyword RimKeywordBcprop::keyword()
items.push_back( RifOpmDeckTools::item( B::INDEX::itemName, m_index() ) );
items.push_back( RifOpmDeckTools::item( B::TYPE::itemName, m_type().text().toStdString() ) );
items.push_back( RifOpmDeckTools::item( B::COMPONENT::itemName, m_component().text().toStdString() ) );
items.push_back( RifOpmDeckTools::item( B::RATE::itemName, m_rate() ) );
items.push_back( m_press().has_value() ? RifOpmDeckTools::item( B::PRESSURE::itemName, m_press().value() )
: RifOpmDeckTools::defaultItem( B::PRESSURE::itemName ) );
items.push_back( m_temp().has_value() ? RifOpmDeckTools::item( B::TEMPERATURE::itemName, m_temp().value() )
: RifOpmDeckTools::defaultItem( B::TEMPERATURE::itemName ) );
if ( m_type() != RimKeywordBcprop::Type::FREE )
{
items.push_back( RifOpmDeckTools::item( B::COMPONENT::itemName, m_component().text().toStdString() ) );
items.push_back( RifOpmDeckTools::item( B::RATE::itemName, m_rate() ) );
items.push_back( m_press().has_value() ? RifOpmDeckTools::item( B::PRESSURE::itemName, m_press().value() )
: RifOpmDeckTools::defaultItem( B::PRESSURE::itemName ) );
items.push_back( m_temp().has_value() ? RifOpmDeckTools::item( B::TEMPERATURE::itemName, m_temp().value() )
: RifOpmDeckTools::defaultItem( B::TEMPERATURE::itemName ) );
}
Opm::DeckKeyword kw( ( Opm::ParserKeywords::BCPROP() ) );
kw.addRecord( Opm::DeckRecord{ std::move( items ) } );
ApplicationLibCode/ProjectDataModel/Jobs/RimKeywordBcprop.h
+3 -1
View File
@@ -57,7 +57,7 @@ public:
GAS,
OIL,
WATER,
SOLVET,
SOLVENT,
POLYMER,
MICR,
OXYG,
@@ -68,6 +68,8 @@ public:
RimKeywordBcprop();
~RimKeywordBcprop() override;
void setIndex( int index );
void uiOrdering( caf::PdmUiGroup* uiGroup );
Opm::DeckKeyword keyword();
ApplicationLibCode/ProjectDataModel/Jobs/RimKeywordFactory.cpp
+2 -4
View File
@@ -527,12 +527,10 @@ Opm::DeckKeyword bcpropKeyword( const std::vector<RigEclipseResultTools::BorderC
// Add one entry per boundary condition
for ( const auto& bc : boundaryConditions )
{
if ( bc.boundaryCondition <= 0 ) continue; // Skip entries without a valid boundary condition
// Find the corresponding property record
// The properties vector should be indexed by boundaryCondition - 1
size_t propIndex = static_cast<size_t>( bc.boundaryCondition );
if ( propIndex < boundaryConditionProperties.size() )
int propIndex = bc.boundaryCondition - 1;
if ( propIndex >= 0 && propIndex < static_cast<int>( boundaryConditionProperties.size() ) )
{
const auto& propRecord = boundaryConditionProperties[propIndex];