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

#2564 Compaction. Set default reference layer to topmost layer having valid POR

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2018-03-06 09:33:03 +01:00
parent 44db864846
commit 5e54c58c6d
3 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartGrid.cpp
View File

@@ -182,6 +182,28 @@ void RigFemPartGrid::generateStructGridData()
cvf::Vec3i ijk = m_ijkPrElement[elmIdx];
m_elmIdxPrIJK.at(ijk[0], ijk[1], ijk[2]) = elmIdx;
}
// IJK bounding box
m_reservoirIJKBoundingBox.first = cvf::Vec3st(INT_MAX, INT_MAX, INT_MAX);
m_reservoirIJKBoundingBox.second = cvf::Vec3st(0, 0, 0);
cvf::Vec3st& min = m_reservoirIJKBoundingBox.first;
cvf::Vec3st& max = m_reservoirIJKBoundingBox.second;
for (int elmIdx = 0; elmIdx < m_femPart->elementCount(); ++elmIdx)
{
RigElementType elementType = m_femPart->elementType(elmIdx);
size_t i, j, k;
if (elementType == HEX8P && ijkFromCellIndex(elmIdx, &i, &j, &k))
{
if (i < min.x()) min.x() = i;
if (j < min.y()) min.y() = j;
if (k < min.z()) min.z() = k;
if (i > max.x()) max.x() = i;
if (j > max.y()) max.y() = j;
if (k > max.z()) max.z() = k;
}
}
}
//--------------------------------------------------------------------------------------------------
@@ -287,6 +309,14 @@ cvf::Vec3i RigFemPartGrid::findMainIJKFaces(int elementIndex) const
return ijkMainFaceIndices;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::pair<cvf::Vec3st, cvf::Vec3st> RigFemPartGrid::reservoirIJKBoundingBox() const
{
return m_reservoirIJKBoundingBox;
}
//--------------------------------------------------------------------------------------------------
/// Find the face that is not perpFaceIdx or its opposite, and has normal closest to direction
//--------------------------------------------------------------------------------------------------

4
ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartGrid.h
View File

@@ -39,6 +39,8 @@ public:
cvf::Vec3i findMainIJKFaces(int elementIndex) const;
std::pair<cvf::Vec3st, cvf::Vec3st> reservoirIJKBoundingBox() const;
private:
void generateStructGridData();
int findElmIdxForIJK000();
@@ -93,7 +95,7 @@ private: // Unused, Not implemented
};
IJKArray m_elmIdxPrIJK;
std::pair<cvf::Vec3st, cvf::Vec3st> m_reservoirIJKBoundingBox;
};

7
ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp
View File

@@ -101,7 +101,7 @@ RimGeoMechResultDefinition::RimGeoMechResultDefinition(void)
m_resultVariableUiField.uiCapability()->setUiEditorTypeName(caf::PdmUiListEditor::uiEditorTypeName());
m_resultVariableUiField.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::TOP);
CAF_PDM_InitField(&m_compactionRefLayerUiField, "CompactionRefLayerUi", 0, "Compaction Ref Layer", "", "The compaction is calculated with reference to this layer. Default layer is the topmost layer with POR", "");
CAF_PDM_InitField(&m_compactionRefLayerUiField, "CompactionRefLayerUi", RigFemResultAddress::NO_COMPACTION, "Compaction Ref Layer", "", "The compaction is calculated with reference to this layer. Default layer is the topmost layer with POR", "");
m_compactionRefLayerUiField.xmlCapability()->setIOWritable(false);
m_compactionRefLayerUiField.xmlCapability()->setIOReadable(false);
@@ -136,6 +136,11 @@ void RimGeoMechResultDefinition::defineUiOrdering(QString uiConfigName, caf::Pdm
{
caf::PdmUiGroup * compactionGroup = uiOrdering.addNewGroup("Compaction Options");
compactionGroup->add(&m_compactionRefLayerUiField);
if (m_compactionRefLayerUiField == RigFemResultAddress::NO_COMPACTION)
{
m_compactionRefLayerUiField = (int)m_geomCase->geoMechData()->femParts()->part(0)->structGrid()->reservoirIJKBoundingBox().first.z();
}
}
if (!m_isChangedByField)