OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#6086 Add porosity, porosity change and permeability calculation.

Browse Source
This commit is contained in:
Kristian Bendiksen
2020-06-22 23:20:03 +02:00
parent 52815742bb
commit 1c86cf4e33
7 changed files with 523 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

124
ApplicationCode/ProjectDataModel/RimGeoMechCase.cpp
View File

@@ -80,6 +80,18 @@ void caf::AppEnum<RimGeoMechCase::BiotCoefficientType>::setUp()
setDefault( RimGeoMechCase::BiotCoefficientType::BIOT_NONE );
}
template <>
void caf::AppEnum<RimGeoMechCase::InitialPermeabilityType>::setUp()
{
addItem( RimGeoMechCase::InitialPermeabilityType::INITIAL_PERMEABILITY_FIXED,
"INITIAL_PERMEABILITY_FIXED",
"Fixed initial permeability" );
addItem( RimGeoMechCase::InitialPermeabilityType::INITIAL_PERMEABILITY_PER_ELEMENT,
"INITIAL_PERMEABILITY_PER_ELEMENT",
"Initial permeability from element properties" );
setDefault( RimGeoMechCase::InitialPermeabilityType::INITIAL_PERMEABILITY_FIXED );
}
} // End namespace caf
//--------------------------------------------------------------------------------------------------
@@ -140,6 +152,24 @@ RimGeoMechCase::RimGeoMechCase( void )
CAF_PDM_InitField( &m_biotResultAddress, "BiotResultAddress", QString( "" ), "Value", "", "", "" );
m_biotResultAddress.uiCapability()->setUiEditorTypeName( caf::PdmUiListEditor::uiEditorTypeName() );
caf::AppEnum<InitialPermeabilityType> defaultInitialPermeabilityType =
RimGeoMechCase::InitialPermeabilityType::INITIAL_PERMEABILITY_FIXED;
CAF_PDM_InitField( &m_initialPermeabilityType,
"InitialPermeabilityType",
defaultInitialPermeabilityType,
"Initial Permeability",
"",
"",
"" );
CAF_PDM_InitField( &m_initialPermeabilityFixed, "InitialPermeabilityFixed", 1.0, "Fixed Initial Permeability", "", "", "" );
m_initialPermeabilityFixed.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleValueEditor::uiEditorTypeName() );
CAF_PDM_InitField( &m_initialPermeabilityResultAddress, "InitialPermeabilityAddress", QString( "" ), "Value", "", "", "" );
m_initialPermeabilityResultAddress.uiCapability()->setUiEditorTypeName( caf::PdmUiListEditor::uiEditorTypeName() );
CAF_PDM_InitField( &m_permeabilityExponent, "PermeabilityExponent", 1.0, "Permeability Exponent", "", "", "" );
m_permeabilityExponent.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleValueEditor::uiEditorTypeName() );
CAF_PDM_InitFieldNoDefault( &m_contourMapCollection, "ContourMaps", "2d Contour Maps", "", "", "" );
m_contourMapCollection = new RimGeoMechContourMapViewCollection;
m_contourMapCollection.uiCapability()->setUiTreeHidden( true );
@@ -616,6 +646,38 @@ QString RimGeoMechCase::biotResultAddress() const
return m_biotResultAddress;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimGeoMechCase::InitialPermeabilityType RimGeoMechCase::initialPermeabilityType() const
{
return m_initialPermeabilityType();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RimGeoMechCase::initialPermeabilityFixed() const
{
return m_initialPermeabilityFixed;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimGeoMechCase::initialPermeabilityAddress() const
{
return m_initialPermeabilityResultAddress;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RimGeoMechCase::permeabilityExponent() const
{
return m_permeabilityExponent;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -739,6 +801,56 @@ void RimGeoMechCase::fieldChangedByUi( const caf::PdmFieldHandle* changedField,
updateConnectedViews();
}
else if ( changedField == &m_initialPermeabilityFixed || changedField == &m_initialPermeabilityType ||
changedField == &m_initialPermeabilityResultAddress || changedField == &m_permeabilityExponent )
{
RigGeoMechCaseData* rigCaseData = geoMechData();
if ( rigCaseData && rigCaseData->femPartResults() )
{
if ( m_initialPermeabilityType() == RimGeoMechCase::InitialPermeabilityType::INITIAL_PERMEABILITY_FIXED )
{
rigCaseData->femPartResults()->setPermeabilityParameters( initialPermeabilityFixed(),
"",
permeabilityExponent() );
}
else if ( m_initialPermeabilityType() ==
RimGeoMechCase::InitialPermeabilityType::INITIAL_PERMEABILITY_PER_ELEMENT )
{
if ( changedField == &m_initialPermeabilityType )
{
// Show info message to user when selecting "from file" option before
// an element property has been imported
std::vector<std::string> elementProperties = possibleElementPropertyFieldNames();
if ( elementProperties.empty() )
{
QString importMessage =
QString( "Please import initial permeability from file (typically called perm.inp) by "
"selecting 'Import Element Property Table' on the Geomechanical Model." );
RiaLogging::info( importMessage );
// Set back to default value
m_initialPermeabilityType = RimGeoMechCase::InitialPermeabilityType::INITIAL_PERMEABILITY_FIXED;
return;
}
}
if ( initialPermeabilityAddress().isEmpty() )
{
// Automatically select the first available property element if empty
std::vector<std::string> elementProperties = possibleElementPropertyFieldNames();
if ( !elementProperties.empty() )
{
m_initialPermeabilityResultAddress = QString::fromStdString( elementProperties[0] );
}
}
rigCaseData->femPartResults()->setPermeabilityParameters( initialPermeabilityFixed(),
initialPermeabilityAddress(),
permeabilityExponent() );
}
}
updateConnectedViews();
}
else if ( changedField == &m_reloadElementPropertyFileCommand )
{
m_reloadElementPropertyFileCommand = false;
@@ -977,6 +1089,16 @@ void RimGeoMechCase::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering&
m_biotResultAddress.uiCapability()->setUiHidden( m_biotCoefficientType !=
RimGeoMechCase::BiotCoefficientType::BIOT_PER_ELEMENT );
caf::PdmUiGroup* permeabilityGroup = uiOrdering.addNewGroup( "Permeability" );
permeabilityGroup->add( &m_initialPermeabilityType );
permeabilityGroup->add( &m_initialPermeabilityFixed );
permeabilityGroup->add( &m_initialPermeabilityResultAddress );
m_initialPermeabilityFixed.uiCapability()->setUiHidden(
m_initialPermeabilityType != RimGeoMechCase::InitialPermeabilityType::INITIAL_PERMEABILITY_FIXED );
m_initialPermeabilityResultAddress.uiCapability()->setUiHidden(
m_initialPermeabilityType != RimGeoMechCase::InitialPermeabilityType::INITIAL_PERMEABILITY_PER_ELEMENT );
permeabilityGroup->add( &m_permeabilityExponent );
caf::PdmUiGroup* timeStepFilterGroup = uiOrdering.addNewGroup( "Time Step Filter" );
timeStepFilterGroup->setCollapsedByDefault( true );
m_timeStepFilter->uiOrdering( uiConfigName, *timeStepFilterGroup );
@@ -1030,7 +1152,7 @@ QList<caf::PdmOptionItemInfo> RimGeoMechCase::calculateValueOptions( const caf::
options.push_back( caf::PdmOptionItemInfo( m_elementPropertyFileNames.v().at( i ).path(), (int)i, true ) );
}
}
else if ( fieldNeedingOptions == &m_biotResultAddress )
else if ( fieldNeedingOptions == &m_biotResultAddress || fieldNeedingOptions == &m_initialPermeabilityResultAddress )
{
std::vector<std::string> elementProperties = possibleElementPropertyFieldNames();

16
ApplicationCode/ProjectDataModel/RimGeoMechCase.h
View File

@@ -60,6 +60,12 @@ public:
BIOT_PER_ELEMENT
};
enum class InitialPermeabilityType
{
INITIAL_PERMEABILITY_FIXED = 0,
INITIAL_PERMEABILITY_PER_ELEMENT
};
RimGeoMechCase( void );
~RimGeoMechCase( void ) override;
@@ -100,6 +106,11 @@ public:
double biotFixedCoefficient() const;
QString biotResultAddress() const;
InitialPermeabilityType initialPermeabilityType() const;
double initialPermeabilityFixed() const;
QString initialPermeabilityAddress() const;
double permeabilityExponent() const;
private:
cvf::Vec3d displayModelOffset() const override;
static std::vector<QDateTime> vectorOfValidDateTimesFromTimeStepStrings( const QStringList& timeStepStrings );
@@ -143,6 +154,11 @@ private:
caf::PdmField<double> m_biotFixedCoefficient;
caf::PdmField<QString> m_biotResultAddress;
caf::PdmField<caf::AppEnum<InitialPermeabilityType>> m_initialPermeabilityType;
caf::PdmField<double> m_initialPermeabilityFixed;
caf::PdmField<QString> m_initialPermeabilityResultAddress;
caf::PdmField<double> m_permeabilityExponent;
caf::PdmChildField<RimGeoMechContourMapViewCollection*> m_contourMapCollection;
bool m_applyTimeFilter;