mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
#1794 Add flag RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES
This commit is contained in:
@@ -45,7 +45,6 @@
|
||||
#include "RimEclipseWellCollection.h"
|
||||
#include "RimFaultCollection.h"
|
||||
#include "RimFlowDiagSolution.h"
|
||||
#include "RimFracture.h"
|
||||
#include "RimGridCollection.h"
|
||||
#include "RimIntersection.h"
|
||||
#include "RimIntersectionCollection.h"
|
||||
@@ -53,7 +52,6 @@
|
||||
#include "RimOilField.h"
|
||||
#include "RimProject.h"
|
||||
#include "RimReservoirCellResultsStorage.h"
|
||||
#include "RimSimWellFracture.h"
|
||||
#include "RimStimPlanColors.h"
|
||||
#include "RimTernaryLegendConfig.h"
|
||||
#include "RimViewController.h"
|
||||
@@ -68,7 +66,13 @@
|
||||
#include "RivReservoirViewPartMgr.h"
|
||||
#include "RivSingleCellPartGenerator.h"
|
||||
#include "RivTernarySaturationOverlayItem.h"
|
||||
|
||||
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
|
||||
#include "RimFracture.h"
|
||||
#include "RimSimWellFracture.h"
|
||||
#include "RivWellFracturePartMgr.h"
|
||||
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
|
||||
|
||||
|
||||
#include "cafCadNavigation.h"
|
||||
#include "cafCeetronPlusNavigation.h"
|
||||
@@ -114,9 +118,11 @@ RimEclipseView::RimEclipseView()
|
||||
faultResultSettings = new RimEclipseFaultColors();
|
||||
faultResultSettings.uiCapability()->setUiHidden(true);
|
||||
|
||||
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
|
||||
CAF_PDM_InitFieldNoDefault(&stimPlanColors, "StimPlanColors", "Fracture Colors", "", "", "");
|
||||
stimPlanColors = new RimStimPlanColors();
|
||||
stimPlanColors.uiCapability()->setUiHidden(true);
|
||||
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
|
||||
|
||||
CAF_PDM_InitFieldNoDefault(&wellCollection, "WellCollection", "Simulation Wells", "", "", "");
|
||||
wellCollection = new RimEclipseWellCollection;
|
||||
@@ -238,6 +244,7 @@ void RimEclipseView::updateScaleTransform()
|
||||
this->scaleTransform()->setLocalTransform(scale);
|
||||
m_simWellsPartManager->setScaleTransform(this->scaleTransform());
|
||||
|
||||
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
|
||||
// Regenerate fracture geometry
|
||||
std::vector<RimFracture*> fractures;
|
||||
this->descendantsIncludingThisOfType(fractures);
|
||||
@@ -245,6 +252,7 @@ void RimEclipseView::updateScaleTransform()
|
||||
{
|
||||
fracture->clearDisplayGeometryCache();
|
||||
}
|
||||
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
|
||||
|
||||
if (m_viewer) m_viewer->updateCachedValuesInScene();
|
||||
}
|
||||
@@ -443,11 +451,15 @@ void RimEclipseView::createDisplayModel()
|
||||
|
||||
// NB! StimPlan legend colors must be updated before well path geometry is added to the model
|
||||
// as the fracture geometry depends on the StimPlan legend colors
|
||||
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
|
||||
stimPlanColors->updateLegendData();
|
||||
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
|
||||
|
||||
addWellPathsToModel(m_wellPathPipeVizModel.p(), currentActiveCellInfo()->geometryBoundingBox());
|
||||
|
||||
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
|
||||
wellPathsPartManager()->appendStaticFracturePartsToModel(m_wellPathPipeVizModel.p(), this);
|
||||
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
|
||||
m_wellPathPipeVizModel->updateBoundingBoxesRecursive();
|
||||
|
||||
m_viewer->addStaticModelOnce(m_wellPathPipeVizModel.p());
|
||||
@@ -667,6 +679,7 @@ void RimEclipseView::updateCurrentTimeStep()
|
||||
}
|
||||
|
||||
// Sim Well Fractures
|
||||
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
|
||||
{
|
||||
cvf::String name = "SimWellFracturesModel";
|
||||
this->removeModelByName(frameScene, name);
|
||||
@@ -697,6 +710,7 @@ void RimEclipseView::updateCurrentTimeStep()
|
||||
simWellFracturesModelBasicList->updateBoundingBoxesRecursive();
|
||||
frameScene->addModel(simWellFracturesModelBasicList.p());
|
||||
}
|
||||
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
|
||||
}
|
||||
}
|
||||
|
||||
@@ -733,7 +747,9 @@ void RimEclipseView::loadDataAndUpdate()
|
||||
this->cellEdgeResult()->loadResult();
|
||||
|
||||
this->faultResultSettings()->customFaultResult()->loadResult();
|
||||
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
|
||||
this->stimPlanColors->loadDataAndUpdate();
|
||||
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
|
||||
|
||||
updateMdiWindowVisibility();
|
||||
|
||||
@@ -747,6 +763,7 @@ void RimEclipseView::loadDataAndUpdate()
|
||||
|
||||
syncronizeWellsWithResults();
|
||||
|
||||
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
|
||||
{
|
||||
// Update simulation well fractures after well cell results are imported
|
||||
|
||||
@@ -757,6 +774,7 @@ void RimEclipseView::loadDataAndUpdate()
|
||||
fracture->loadDataAndUpdate();
|
||||
}
|
||||
}
|
||||
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
|
||||
|
||||
this->scheduleCreateDisplayModelAndRedraw();
|
||||
}
|
||||
@@ -1038,6 +1056,7 @@ void RimEclipseView::updateLegends()
|
||||
this->cellEdgeResult()->legendConfig()->setAutomaticRanges(cvf::UNDEFINED_DOUBLE, cvf::UNDEFINED_DOUBLE, cvf::UNDEFINED_DOUBLE, cvf::UNDEFINED_DOUBLE);
|
||||
}
|
||||
|
||||
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
|
||||
RimLegendConfig* stimPlanLegend = stimPlanColors()->activeLegend();
|
||||
if (stimPlanLegend)
|
||||
{
|
||||
@@ -1048,6 +1067,7 @@ void RimEclipseView::updateLegends()
|
||||
m_viewer->addColorLegendToBottomLeftCorner(stimPlanLegend->legend());
|
||||
}
|
||||
}
|
||||
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
@@ -1390,7 +1410,9 @@ void RimEclipseView::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering
|
||||
uiTreeOrdering.add(cellResult());
|
||||
uiTreeOrdering.add(cellEdgeResult());
|
||||
uiTreeOrdering.add(faultResultSettings());
|
||||
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
|
||||
uiTreeOrdering.add(stimPlanColors());
|
||||
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
|
||||
|
||||
uiTreeOrdering.add(wellCollection());
|
||||
uiTreeOrdering.add(faultCollection());
|
||||
|
||||
Reference in New Issue
Block a user