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

Always compute grid faults

Browse Source
This commit is contained in:
Magne Sjaastad 2014-09-26 08:15:22 +02:00
parent af55878f07
commit a8ce90e404
4 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ApplicationCode/Application/RiaPreferences.cpp
View File

@ -65,10 +65,8 @@ RiaPreferences::RiaPreferences(void)
lastUsedProjectFileName.setUiHidden(true);
CAF_PDM_InitField(&autocomputeDepthRelatedProperties, "autocomputeDepth", true, "DEPTH related properties", "", "DEPTH, DX, DY, DZ, TOP, BOTTOM", "");
CAF_PDM_InitField(&autocomputeGridFaults, "autocomputeGridFaults", true, "Grid faults", "", "Detect all fault faces geometrically", "");
autocomputeDepthRelatedProperties.setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
autocomputeGridFaults.setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
readerSettings = new RifReaderSettings;
CAF_PDM_InitFieldNoDefault(&readerSettings, "readerSettings", "Reader settings", "", "", "");
@ -99,8 +97,7 @@ void RiaPreferences::defineEditorAttribute(const caf::PdmFieldHandle* field, QSt
}
}
else if (field == &octaveShowHeaderInfoWhenExecutingScripts ||
field == &autocomputeDepthRelatedProperties ||
field == &autocomputeGridFaults)
field == &autocomputeDepthRelatedProperties)
{
caf::PdmUiCheckBoxEditorAttribute* myAttr = static_cast<caf::PdmUiCheckBoxEditorAttribute*>(attribute);
if (myAttr)
@ -135,8 +132,6 @@ void RiaPreferences::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
caf::PdmUiGroup* autoComputeGroup = uiOrdering.addNewGroup("Compute when loading new case");
autoComputeGroup->add(&autocomputeDepthRelatedProperties);
autoComputeGroup->add(&autocomputeGridFaults);
caf::PdmUiGroup* readerSettingsGroup = uiOrdering.addNewGroup("Reader settings");
std::vector<caf::PdmFieldHandle*> readerSettingsFields;

1
ApplicationCode/Application/RiaPreferences.h
View File

@ -65,7 +65,6 @@ public: // Pdm Fields
caf::PdmField<QString> lastUsedProjectFileName;
caf::PdmField<bool> autocomputeDepthRelatedProperties;
caf::PdmField<bool> autocomputeGridFaults;
caf::PdmField<RifReaderSettings*> readerSettings;

10
ApplicationCode/ProjectDataModel/RimCase.cpp
View File

@ -307,13 +307,9 @@ void RimCase::computeCachedData()
rigEclipseCase->mainGrid()->computeCachedData();
pInf.incrementProgress();
RiaPreferences* prefs = RiaApplication::instance()->preferences();
if (prefs->autocomputeGridFaults)
{
pInf.setProgressDescription("Calculating faults");
rigEclipseCase->mainGrid()->calculateFaults();
pInf.incrementProgress();
}
pInf.setProgressDescription("Calculating faults");
rigEclipseCase->mainGrid()->calculateFaults();
pInf.incrementProgress();
}
}

2
ApplicationCode/ReservoirDataModel/RigMainGrid.cpp
View File

@ -405,6 +405,8 @@ bool RigMainGrid::isFaceNormalsOutwards() const
//--------------------------------------------------------------------------------------------------
const RigFault* RigMainGrid::findFaultFromCellIndexAndCellFace(size_t reservoirCellIndex, cvf::StructGridInterface::FaceType face) const
{
CVF_ASSERT(m_faultsPrCellAcc.notNull());
int faultIdx = m_faultsPrCellAcc->faultIdx(reservoirCellIndex, face);
if (faultIdx != RigFaultsPrCellAccumulator::NO_FAULT )
{