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

#2188 Missing fault faces : Set watertight flag only when needed

Browse Source
This commit is contained in:
Magne Sjaastad
2017-12-06 08:38:37 +01:00
parent 0a38806a4e
commit 3024b19b6f
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@@ -196,12 +196,17 @@ void RimEclipseView::clampCurrentTimestep()
void RimEclipseView::setVisibleGridParts(const std::vector<RivCellSetEnum>& cellSets)
{
m_visibleGridParts = cellSets;
}
// Always make sure visible grid parts are marked as watertight
for (RivCellSetEnum cellSetType : m_visibleGridParts)
{
m_reservoirGridPartManager->forceWatertightGeometryOnForType(cellSetType);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEclipseView::setVisibleGridPartsWatertight()
{
for (RivCellSetEnum cellSetType : m_visibleGridParts)
{
m_reservoirGridPartManager->forceWatertightGeometryOnForType(cellSetType);
}
}
//--------------------------------------------------------------------------------------------------
@@ -408,6 +413,8 @@ void RimEclipseView::createDisplayModel()
if (faultCollection()->showFaultsOutsideFilters() || !this->eclipsePropertyFilterCollection()->hasActiveFilters() )
{
setVisibleGridPartsWatertight();
std::set<RivCellSetEnum> faultGeometryTypesToAppend = allVisibleFaultGeometryTypes();
RivCellSetEnum faultLabelType = m_reservoirGridPartManager->geometryTypeForFaultLabels(faultGeometryTypesToAppend, faultCollection()->showFaultsOutsideFilters());
@@ -546,6 +553,7 @@ void RimEclipseView::updateCurrentTimeStep()
m_reservoirGridPartManager->appendDynamicGeometryPartsToModel(frameParts.p(), PROPERTY_FILTERED_WELL_CELLS, m_currentTimeStep, gridIndices);
setVisibleGridParts(geometriesToRecolor);
setVisibleGridPartsWatertight();
std::set<RivCellSetEnum> faultGeometryTypesToAppend = allVisibleFaultGeometryTypes();
for (RivCellSetEnum geometryType : faultGeometryTypesToAppend)
@@ -570,7 +578,6 @@ void RimEclipseView::updateCurrentTimeStep()
m_reservoirGridPartManager->appendFaultLabelsStaticGeometryPartsToModel(frameParts.p(), faultLabelType);
}
// Set the transparency on all the Wellcell parts before setting the result color
float opacity = static_cast< float> (1 - cvf::Math::clamp(this->wellCollection()->wellCellTransparencyLevel(), 0.0, 1.0));
m_reservoirGridPartManager->updateCellColor(PROPERTY_FILTERED_WELL_CELLS, m_currentTimeStep, cvf::Color4f(cvf::Color3f(cvf::Color3::WHITE), opacity));

1
ApplicationCode/ProjectDataModel/RimEclipseView.h
View File

@@ -180,6 +180,7 @@ private:
void clampCurrentTimestep() override;
void setVisibleGridParts(const std::vector<RivCellSetEnum>& cellSets);
void setVisibleGridPartsWatertight();
private:
caf::PdmChildField<RimEclipsePropertyFilterCollection*> m_propertyFilterCollection;