mirror of
https://github.com/OPM/ResInsight.git
synced 2026-10-25 14:40:26 -05:00
New Sector Model Export user interface (#13247)
* Add sector model export wizard * GUI cleanup * Use job name as deck name for simulation runs * Remove new things from old export GUI * Use radio-buttons for enum dropdowns
This commit is contained in:
37 files changed
+1556
-381
No files matched your search
@@ -27,7 +27,7 @@ RigSimulationInputSettings::RigSimulationInputSettings()
|
||||
: m_min( caf::VecIjk0::ZERO )
|
||||
, m_max( caf::VecIjk0::ZERO )
|
||||
, m_refinement( 1, 1, 1 )
|
||||
, m_boundaryCondition( OPERNUM_OPERATER )
|
||||
, m_boundaryCondition( RiaModelExportDefines::BoundaryCondition::OPERNUM_OPERATER )
|
||||
, m_porvMultiplier( 1.0e6 )
|
||||
{
|
||||
}
|
||||
@@ -99,7 +99,7 @@ void RigSimulationInputSettings::setBcpropKeywords( const std::vector<Opm::DeckR
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RigSimulationInputSettings::BoundaryCondition RigSimulationInputSettings::boundaryCondition() const
|
||||
RiaModelExportDefines::BoundaryCondition RigSimulationInputSettings::boundaryCondition() const
|
||||
{
|
||||
return m_boundaryCondition;
|
||||
}
|
||||
@@ -107,7 +107,7 @@ RigSimulationInputSettings::BoundaryCondition RigSimulationInputSettings::bounda
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RigSimulationInputSettings::setBoundaryCondition( BoundaryCondition value )
|
||||
void RigSimulationInputSettings::setBoundaryCondition( RiaModelExportDefines::BoundaryCondition value )
|
||||
{
|
||||
m_boundaryCondition = value;
|
||||
}
|
||||
|
||||
@@ -18,6 +18,9 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "RiaModelExportDefines.h"
|
||||
|
||||
#include "cafAppEnum.h"
|
||||
#include "cafVecIjk.h"
|
||||
#include "cvfVector3.h"
|
||||
|
||||
@@ -37,11 +40,7 @@ class DeckRecord;
|
||||
class RigSimulationInputSettings
|
||||
{
|
||||
public:
|
||||
enum BoundaryCondition
|
||||
{
|
||||
OPERNUM_OPERATER,
|
||||
BCCON_BCPROP
|
||||
};
|
||||
using BoundaryConditionEnum = caf::AppEnum<RiaModelExportDefines::BoundaryCondition>;
|
||||
|
||||
RigSimulationInputSettings();
|
||||
|
||||
@@ -59,8 +58,8 @@ public:
|
||||
std::vector<Opm::DeckRecord> bcpropKeywords() const;
|
||||
void setBcpropKeywords( const std::vector<Opm::DeckRecord>& keywords );
|
||||
|
||||
BoundaryCondition boundaryCondition() const;
|
||||
void setBoundaryCondition( BoundaryCondition value );
|
||||
RiaModelExportDefines::BoundaryCondition boundaryCondition() const;
|
||||
void setBoundaryCondition( RiaModelExportDefines::BoundaryCondition value );
|
||||
|
||||
double porvMultiplier() const;
|
||||
void setPorvMultiplier( double value );
|
||||
@@ -77,7 +76,7 @@ private:
|
||||
caf::VecIjk0 m_max;
|
||||
cvf::Vec3st m_refinement;
|
||||
std::vector<Opm::DeckRecord> m_bcpropKeywords;
|
||||
BoundaryCondition m_boundaryCondition;
|
||||
BoundaryConditionEnum m_boundaryCondition;
|
||||
double m_porvMultiplier;
|
||||
QString m_inputDeckFileName;
|
||||
QString m_outputDeckFileName;
|
||||
|
||||
@@ -83,12 +83,12 @@ std::expected<void, QString> RigSimulationInputTool::exportSimulationInput( RimE
|
||||
if ( visibility && visibility->size() > 0 )
|
||||
{
|
||||
RigEclipseResultTools::generateBorderResult( &eclipseCase, visibility, RiaResultNames::bordnum() );
|
||||
if ( settings.boundaryCondition() == RigSimulationInputSettings::BoundaryCondition::BCCON_BCPROP )
|
||||
if ( settings.boundaryCondition() == RiaModelExportDefines::BoundaryCondition::BCCON_BCPROP )
|
||||
{
|
||||
// Generate BCCON result to assign values 1-6 based on which face of the box the border cells are on
|
||||
RigEclipseResultTools::generateBcconResult( &eclipseCase, settings.min(), settings.max() );
|
||||
}
|
||||
else if ( settings.boundaryCondition() == RigSimulationInputSettings::BoundaryCondition::OPERNUM_OPERATER )
|
||||
else if ( settings.boundaryCondition() == RiaModelExportDefines::BoundaryCondition::OPERNUM_OPERATER )
|
||||
{
|
||||
// Generate OPERNUM result based on BORDNUM (border cells get max existing OPERNUM + 1)
|
||||
int operNumRegion = RigEclipseResultTools::generateOperNumResult( &eclipseCase );
|
||||
|
||||
Reference in new issue
Block a user