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

Simulation Input: Move boundary condition enum to RigSimulationInput.

Browse Source
This commit is contained in:
Kristian Bendiksen committed 2025-11-19 16:47:27 +01:00
1 parent eadfb4846d
commit 3c2301c56b
4 files changed
+20 -17
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/Commands/ExportCommands/RicExportEclipseSectorModelUi.cpp
+5 -5
View File
@@ -81,10 +81,10 @@ void RicExportEclipseSectorModelUi::GridBoxSelectionEnum::setUp()
template <>
void RicExportEclipseSectorModelUi::BoundaryConditionEnum::setUp()
{
addItem( RicExportEclipseSectorModelUi::OPERNUM_OPERATER, "OPERNUM_OPERATER", "OPERNUM + OPERATER" );
addItem( RicExportEclipseSectorModelUi::BCCON_BCPROP, "BCCON_BCPROP", "BCCON + BCPROP" );
addItem( RigSimulationInputSettings::OPERNUM_OPERATER, "OPERNUM_OPERATER", "OPERNUM + OPERATER" );
addItem( RigSimulationInputSettings::BCCON_BCPROP, "BCCON_BCPROP", "BCCON + BCPROP" );
setDefault( RicExportEclipseSectorModelUi::OPERNUM_OPERATER );
setDefault( RigSimulationInputSettings::OPERNUM_OPERATER );
}
} // namespace caf
@@ -470,11 +470,11 @@ void RicExportEclipseSectorModelUi::defineUiOrdering( QString uiConfigName, caf:
caf::PdmUiGroup* bcGroup = uiOrdering.addNewGroup( "Boundary Conditions" );
bcGroup->add( &m_boundaryCondition );
if ( m_boundaryCondition() == OPERNUM_OPERATER )
if ( m_boundaryCondition() == RigSimulationInputSettings::OPERNUM_OPERATER )
{
bcGroup->add( &m_porvMultiplier );
}
else if ( m_boundaryCondition() == BCCON_BCPROP )
else if ( m_boundaryCondition() == RigSimulationInputSettings::BCCON_BCPROP )
{
m_bcpropKeywords.uiCapability()->setUiEditorTypeName( caf::PdmUiTableViewEditor::uiEditorTypeName() );
bcGroup->add( &m_bcpropKeywords );
ApplicationLibCode/Commands/ExportCommands/RicExportEclipseSectorModelUi.h
+3 -6
View File
@@ -18,6 +18,8 @@
#pragma once
#include "RigSimulationInputSettings.h"
#include "cafAppEnum.h"
#include "cafPdmChildArrayField.h"
#include "cafPdmField.h"
@@ -63,12 +65,7 @@ class RicExportEclipseSectorModelUi : public caf::PdmObject
};
using GridBoxSelectionEnum = caf::AppEnum<GridBoxSelection>;
enum BoundaryCondition
{
OPERNUM_OPERATER,
BCCON_BCPROP
};
using BoundaryConditionEnum = caf::AppEnum<BoundaryCondition>;
using BoundaryConditionEnum = caf::AppEnum<RigSimulationInputSettings::BoundaryCondition>;
public:
RicExportEclipseSectorModelUi();