OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-07-31 00:38:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

NNC : Add settings to preferences and compute on demand

Browse Source 
Ported several commits from dev

#5913 Import NNC : Do not compute NNCs if importNNCs is disabled in preferences
#5914 Import faults : Avoid computation of faults if turned off in preferences 
#5925 NNC computations : Add flag in preferences to include inactive cells
Allan : Do not test for cached data in pytest
#5925 Simplify computation of fault data
#5932 NNC data : Compute geometry when NNC data is asked for
Remove obsolete parameters
This commit is contained in:
Magne Sjaastad
2020-05-15 12:51:19 +02:00
parent 72436f0a72
commit 04243dfa64
25 changed files with 219 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationCode/ModelVisualization/RivNNCGeometryGenerator.cpp
+1 -1
View File
@@ -32,7 +32,7 @@
///
//--------------------------------------------------------------------------------------------------
RivNNCGeometryGenerator::RivNNCGeometryGenerator( bool includeAllan,
const RigNNCData* nncData,
RigNNCData* nncData,
const cvf::Vec3d& offset,
const cvf::Array<size_t>* nncIndexes )
: m_includeAllanDiagramGeometry( includeAllan )
ApplicationCode/ModelVisualization/RivNNCGeometryGenerator.h
+2 -2
View File
@@ -43,7 +43,7 @@ class RivNNCGeometryGenerator : public cvf::Object
{
public:
RivNNCGeometryGenerator( bool includeAllan,
const RigNNCData* nncData,
RigNNCData* nncData,
const cvf::Vec3d& offset,
const cvf::Array<size_t>* nncIndexes );
@@ -70,7 +70,7 @@ private:
bool m_includeAllanDiagramGeometry;
// Input
cvf::cref<RigNNCData> m_nncData;
cvf::ref<RigNNCData> m_nncData;
cvf::cref<cvf::Array<size_t>> m_nncIndexes;
cvf::cref<cvf::UByteArray> m_cellVisibility;
cvf::cref<RigGridBase> m_grid;
ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.cpp
+3
View File
@@ -201,6 +201,9 @@ void RivReservoirFaultsPartMgr::appendPartsToModel( cvf::ModelBasicList* model )
if ( showNncs )
{
RigMainGrid* mainGrid = m_reservoirView->mainGrid();
mainGrid->nncData()->ensureConnectionDataIsProcecced();
if ( showCompleteNncGeo )
{
rivFaultPart->appendCompleteNNCFacesToModel( &parts );