OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-20 21:43:20 -06:00
Code Issues Packages Projects Releases Wiki Activity

Move default por/perm to fracture model template.

Browse Source
This commit is contained in:
Kristian Bendiksen 2020-09-24 11:50:37 +02:00
parent 48bc8ce117
commit cf5cd36062
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ApplicationCode/ProjectDataModel/Completions/RimFractureModel.cpp
View File

@ -134,9 +134,6 @@ RimFractureModel::RimFractureModel()
CAF_PDM_InitScriptableField( &m_boundingBoxHorizontal, "BoundingBoxHorizontal", 50.0, "Bounding Box Horizontal", "", "", "" );
CAF_PDM_InitScriptableField( &m_boundingBoxVertical, "BoundingBoxVertical", 100.0, "Bounding Box Vertical", "", "", "" );
CAF_PDM_InitScriptableField( &m_defaultPorosity, "DefaultPorosity", 0.0, "Default Porosity", "", "", "" );
CAF_PDM_InitScriptableField( &m_defaultPermeability, "DefaultPermeability", 10.0e-6, "Default Permeability", "", "", "" );
// Stress unit: bar
// Stress gradient unit: bar/m
// Depth is meter
@ -899,7 +896,7 @@ void RimFractureModel::loadDataAndUpdate()
//--------------------------------------------------------------------------------------------------
double RimFractureModel::defaultPorosity() const
{
return m_defaultPorosity();
return m_fractureModelTemplate() ? m_fractureModelTemplate()->defaultPorosity() : 0.0;
}
//--------------------------------------------------------------------------------------------------
@ -907,7 +904,7 @@ double RimFractureModel::defaultPorosity() const
//--------------------------------------------------------------------------------------------------
double RimFractureModel::defaultPermeability() const
{
return m_defaultPermeability();
return m_fractureModelTemplate() ? m_fractureModelTemplate()->defaultPermeability() : 0.0;
}
//--------------------------------------------------------------------------------------------------

2
ApplicationCode/ProjectDataModel/Completions/RimFractureModel.h
View File

@ -187,8 +187,6 @@ protected:
caf::PdmField<double> m_boundingBoxVertical;
caf::PdmField<double> m_boundingBoxHorizontal;
caf::PdmPtrField<RimModeledWellPath*> m_thicknessDirectionWellPath;
caf::PdmField<double> m_defaultPorosity;
caf::PdmField<double> m_defaultPermeability;
caf::PdmField<double> m_verticalStress;
caf::PdmField<double> m_verticalStressGradient;
caf::PdmField<double> m_stressDepth;