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

#2529 Fracture : Remove all #ifdef USE_PROTOTYPE_FEATURE_FRACTURES

Browse Source
This commit is contained in:
Magne Sjaastad 2018-02-26 20:54:45 +01:00
parent 2b368fb0b8
commit 72b5f540e5
33 changed files with 16 additions and 212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ApplicationCode/Application/RiaApplication.cpp
View File

@ -93,11 +93,9 @@
#include "RiuWellAllocationPlot.h" #include "RiuWellAllocationPlot.h"
#include "RiuFlowCharacteristicsPlot.h" #include "RiuFlowCharacteristicsPlot.h"
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
#include "RimFractureTemplateCollection.h" #include "RimFractureTemplateCollection.h"
#include "RimWellPathFracture.h" #include "RimWellPathFracture.h"
#include "RimStimPlanColors.h" #include "RimStimPlanColors.h"
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
#include "RicImportInputEclipseCaseFeature.h" #include "RicImportInputEclipseCaseFeature.h"
@ -511,8 +509,6 @@ bool RiaApplication::loadProject(const QString& projectFileName, ProjectLoadActi
rimObservedData->updateMetaData(); rimObservedData->updateMetaData();
} }
} }
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
oilField->fractureDefinitionCollection()->loadAndUpdateData(); oilField->fractureDefinitionCollection()->loadAndUpdateData();
oilField->fractureDefinitionCollection()->setDefaultConductivityResultIfEmpty(); oilField->fractureDefinitionCollection()->setDefaultConductivityResultIfEmpty();
@ -526,7 +522,6 @@ bool RiaApplication::loadProject(const QString& projectFileName, ProjectLoadActi
fracture->loadDataAndUpdate(); fracture->loadDataAndUpdate();
} }
} }
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
} }
@ -572,7 +567,6 @@ bool RiaApplication::loadProject(const QString& projectFileName, ProjectLoadActi
viewProgress.setProgressDescription(riv->name()); viewProgress.setProgressDescription(riv->name());
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
if (m_project->isProjectFileVersionEqualOrOlderThan("2018.1.0.103")) if (m_project->isProjectFileVersionEqualOrOlderThan("2018.1.0.103"))
{ {
std::vector<RimStimPlanColors*> stimPlanColors; std::vector<RimStimPlanColors*> stimPlanColors;
@ -582,7 +576,6 @@ bool RiaApplication::loadProject(const QString& projectFileName, ProjectLoadActi
stimPlanColors[0]->updateConductivityResultName(); stimPlanColors[0]->updateConductivityResultName();
} }
} }
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
riv->loadDataAndUpdate(); riv->loadDataAndUpdate();
this->setActiveReservoirView(riv); this->setActiveReservoirView(riv);

3
ApplicationCode/Commands/ApplicationCommands/RicHelpFeatures.cpp
View File

@ -71,9 +71,6 @@ void RicHelpAboutFeature::onActionTriggered(bool isChecked)
#ifdef USE_HDF5 #ifdef USE_HDF5
activeFeatures += " Souring"; activeFeatures += " Souring";
#endif #endif
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
activeFeatures += " Fractures";
#endif
if (!activeFeatures.isEmpty()) if (!activeFeatures.isEmpty())
{ {

6
ApplicationCode/Commands/CompletionExportCommands/RicExportCompletionDataSettingsUi.cpp
View File

@ -76,9 +76,7 @@ RicExportCompletionDataSettingsUi::RicExportCompletionDataSettingsUi(bool onlyWe
CAF_PDM_InitField(&includePerforations, "IncludePerforations", true, "Include Perforations", "", "", ""); CAF_PDM_InitField(&includePerforations, "IncludePerforations", true, "Include Perforations", "", "", "");
CAF_PDM_InitField(&includeFishbones, "IncludeFishbones", true, "Include Fishbones", "", "", ""); CAF_PDM_InitField(&includeFishbones, "IncludeFishbones", true, "Include Fishbones", "", "", "");
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
CAF_PDM_InitField(&includeFractures, "IncludeFractures", true, "Include Fractures", "", "", ""); CAF_PDM_InitField(&includeFractures, "IncludeFractures", true, "Include Fractures", "", "", "");
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
CAF_PDM_InitField(&excludeMainBoreForFishbones, "ExcludeMainBoreForFishbones", false, "Exclude Main Bore Transmissibility For Fishbones", "", "", ""); CAF_PDM_InitField(&excludeMainBoreForFishbones, "ExcludeMainBoreForFishbones", false, "Exclude Main Bore Transmissibility For Fishbones", "", "", "");
m_onlyWellPathCollectionSelected = onlyWellPathCollectionSelected; m_onlyWellPathCollectionSelected = onlyWellPathCollectionSelected;
@ -114,7 +112,6 @@ void RicExportCompletionDataSettingsUi::showForWellPath()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicExportCompletionDataSettingsUi::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) void RicExportCompletionDataSettingsUi::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
{ {
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
if (changedField == &compdatExport) if (changedField == &compdatExport)
{ {
if (compdatExport == WPIMULT_AND_DEFAULT_CONNECTION_FACTORS) if (compdatExport == WPIMULT_AND_DEFAULT_CONNECTION_FACTORS)
@ -128,7 +125,6 @@ void RicExportCompletionDataSettingsUi::fieldChangedByUi(const caf::PdmFieldHand
includeFractures.uiCapability()->setUiReadOnly(false); includeFractures.uiCapability()->setUiReadOnly(false);
} }
} }
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -210,7 +206,6 @@ void RicExportCompletionDataSettingsUi::defineUiOrdering(QString uiConfigName, c
if (!includePerforations) timeStep.uiCapability()->setUiReadOnly(true); if (!includePerforations) timeStep.uiCapability()->setUiReadOnly(true);
else timeStep.uiCapability()->setUiReadOnly(false); else timeStep.uiCapability()->setUiReadOnly(false);
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
caf::PdmUiGroup* fractureGroup = uiOrdering.addNewGroup("Export of Fracture Completions"); caf::PdmUiGroup* fractureGroup = uiOrdering.addNewGroup("Export of Fracture Completions");
fractureGroup->add(&includeFractures); fractureGroup->add(&includeFractures);
@ -222,7 +217,6 @@ void RicExportCompletionDataSettingsUi::defineUiOrdering(QString uiConfigName, c
{ {
includeFractures.uiCapability()->setUiReadOnly(false); includeFractures.uiCapability()->setUiReadOnly(false);
} }
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
} }
uiOrdering.skipRemainingFields(); uiOrdering.skipRemainingFields();

2
ApplicationCode/Commands/CompletionExportCommands/RicExportCompletionDataSettingsUi.h
View File

@ -63,9 +63,7 @@ public:
caf::PdmField<bool> includePerforations; caf::PdmField<bool> includePerforations;
caf::PdmField<bool> includeFishbones; caf::PdmField<bool> includeFishbones;
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
caf::PdmField<bool> includeFractures; caf::PdmField<bool> includeFractures;
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
caf::PdmField<bool> excludeMainBoreForFishbones; caf::PdmField<bool> excludeMainBoreForFishbones;

6
ApplicationCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.cpp
View File

@ -141,9 +141,7 @@ void RicWellPathExportCompletionDataFeatureImpl::exportCompletions(const std::ve
} }
size_t maxProgress = usedWellPaths.size() * 3 + size_t maxProgress = usedWellPaths.size() * 3 +
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
simWells.size() + simWells.size() +
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
(exportSettings.fileSplit == RicExportCompletionDataSettingsUi::SPLIT_ON_WELL (exportSettings.fileSplit == RicExportCompletionDataSettingsUi::SPLIT_ON_WELL
? usedWellPaths.size() ? usedWellPaths.size()
: exportSettings.fileSplit == RicExportCompletionDataSettingsUi::SPLIT_ON_WELL_AND_COMPLETION_TYPE : exportSettings.fileSplit == RicExportCompletionDataSettingsUi::SPLIT_ON_WELL_AND_COMPLETION_TYPE
@ -175,7 +173,6 @@ void RicWellPathExportCompletionDataFeatureImpl::exportCompletions(const std::ve
} }
progress.incrementProgress(); progress.incrementProgress();
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
if (exportSettings.includeFractures()) if (exportSettings.includeFractures())
{ {
std::vector<RigCompletionData> fractureCompletionData = std::vector<RigCompletionData> fractureCompletionData =
@ -183,11 +180,9 @@ void RicWellPathExportCompletionDataFeatureImpl::exportCompletions(const std::ve
wellPath, exportSettings, fractureTransmissibilityExportInformationStream.get()); wellPath, exportSettings, fractureTransmissibilityExportInformationStream.get());
appendCompletionData(&completionsPerEclipseCell, fractureCompletionData); appendCompletionData(&completionsPerEclipseCell, fractureCompletionData);
} }
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
progress.incrementProgress(); progress.incrementProgress();
} }
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
for (auto simWell : simWells) for (auto simWell : simWells)
{ {
std::vector<RigCompletionData> fractureCompletionData = RicExportFractureCompletionsImpl::generateCompdatValuesForSimWell( std::vector<RigCompletionData> fractureCompletionData = RicExportFractureCompletionsImpl::generateCompdatValuesForSimWell(
@ -195,7 +190,6 @@ void RicWellPathExportCompletionDataFeatureImpl::exportCompletions(const std::ve
appendCompletionData(&completionsPerEclipseCell, fractureCompletionData); appendCompletionData(&completionsPerEclipseCell, fractureCompletionData);
progress.incrementProgress(); progress.incrementProgress();
} }
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
const QString eclipseCaseName = exportSettings.caseToApply->caseUserDescription(); const QString eclipseCaseName = exportSettings.caseToApply->caseUserDescription();

4
ApplicationCode/Commands/OperationsUsingObjReferences/RicCopyReferencesToClipboardFeature.cpp
View File

@ -21,9 +21,7 @@
#include "RimEclipseCase.h" #include "RimEclipseCase.h"
#include "RimEclipseView.h" #include "RimEclipseView.h"
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
#include "RimFractureTemplate.h" #include "RimFractureTemplate.h"
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
#include "RimGeoMechView.h" #include "RimGeoMechView.h"
#include "RimIntersection.h" #include "RimIntersection.h"
#include "RimIntersectionBox.h" #include "RimIntersectionBox.h"
@ -165,12 +163,10 @@ bool RicCopyReferencesToClipboardFeature::isCopyOfObjectSupported(caf::PdmObject
{ {
if (!wellAllocPlot && !rftPlot) return true; if (!wellAllocPlot && !rftPlot) return true;
} }
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
else if (dynamic_cast<RimFractureTemplate*>(pdmObject)) else if (dynamic_cast<RimFractureTemplate*>(pdmObject))
{ {
return true; return true;
} }
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
return false; return false;
} }

4
ApplicationCode/Commands/RicDeleteItemExec.cpp
View File

@ -44,9 +44,7 @@
#include "RiuMainPlotWindow.h" #include "RiuMainPlotWindow.h"
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
#include "RimFractureTemplateCollection.h" #include "RimFractureTemplateCollection.h"
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
#include "cafNotificationCenter.h" #include "cafNotificationCenter.h"
@ -150,7 +148,6 @@ void RicDeleteItemExec::redo()
view->scheduleCreateDisplayModelAndRedraw(); view->scheduleCreateDisplayModelAndRedraw();
} }
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
RimFractureTemplateCollection* fracTemplateColl; RimFractureTemplateCollection* fracTemplateColl;
parentObj->firstAncestorOrThisOfType(fracTemplateColl); parentObj->firstAncestorOrThisOfType(fracTemplateColl);
if (fracTemplateColl) if (fracTemplateColl)
@ -172,7 +169,6 @@ void RicDeleteItemExec::redo()
} }
} }
} }
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
// Well paths // Well paths

5
ApplicationCode/Commands/RicDeleteItemFeature.cpp
View File

@ -50,14 +50,12 @@
#include "RimWellLogRftCurve.h" #include "RimWellLogRftCurve.h"
#include "RimWellRftPlot.h" #include "RimWellRftPlot.h"
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
#include "RimEllipseFractureTemplate.h" #include "RimEllipseFractureTemplate.h"
#include "RimSimWellFracture.h" #include "RimSimWellFracture.h"
#include "RimSimWellFractureCollection.h" #include "RimSimWellFractureCollection.h"
#include "RimStimPlanFractureTemplate.h" #include "RimStimPlanFractureTemplate.h"
#include "RimWellPathFracture.h" #include "RimWellPathFracture.h"
#include "RimWellPathFractureCollection.h" #include "RimWellPathFractureCollection.h"
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
#include "cafCmdExecCommandManager.h" #include "cafCmdExecCommandManager.h"
@ -113,15 +111,12 @@ bool isDeletable(caf::PdmUiItem* uiItem)
if (dynamic_cast<RimFishbonesMultipleSubs*>(uiItem)) return true; if (dynamic_cast<RimFishbonesMultipleSubs*>(uiItem)) return true;
if (dynamic_cast<RimPerforationInterval*>(uiItem)) return true; if (dynamic_cast<RimPerforationInterval*>(uiItem)) return true;
if (dynamic_cast<RimAsciiDataCurve*>(uiItem)) return true; if (dynamic_cast<RimAsciiDataCurve*>(uiItem)) return true;
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
if (dynamic_cast<RimWellPathFractureCollection*>(uiItem)) return true; if (dynamic_cast<RimWellPathFractureCollection*>(uiItem)) return true;
if (dynamic_cast<RimWellPathFracture*>(uiItem)) return true; if (dynamic_cast<RimWellPathFracture*>(uiItem)) return true;
if (dynamic_cast<RimEllipseFractureTemplate*>(uiItem)) return true; if (dynamic_cast<RimEllipseFractureTemplate*>(uiItem)) return true;
if (dynamic_cast<RimStimPlanFractureTemplate*>(uiItem)) return true; if (dynamic_cast<RimStimPlanFractureTemplate*>(uiItem)) return true;
if (dynamic_cast<RimSimWellFractureCollection*>(uiItem)) return true; if (dynamic_cast<RimSimWellFractureCollection*>(uiItem)) return true;
if (dynamic_cast<RimSimWellFracture*>(uiItem)) return true; if (dynamic_cast<RimSimWellFracture*>(uiItem)) return true;
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
return false; return false;
} }

4
ApplicationCode/ModelVisualization/RivWellFracturePartMgr.cpp
View File

@ -248,8 +248,6 @@ const QString RivWellFracturePartMgr::resultInfoText(const RimEclipseView& activ
} }
else if (stimPlanTemplate) else if (stimPlanTemplate)
{ {
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
const RigFractureCell* cell = getFractureCellAtDomainCoord(domainIntersectionPoint); const RigFractureCell* cell = getFractureCellAtDomainCoord(domainIntersectionPoint);
RimStimPlanColors* stimPlanColors = activeView.fractureColors; RimStimPlanColors* stimPlanColors = activeView.fractureColors;
@ -267,8 +265,6 @@ const QString RivWellFracturePartMgr::resultInfoText(const RimEclipseView& activ
// Cell index // Cell index
text.append("Cell Index: "); text.append("Cell Index: ");
text.append(iText + ", " + jText + "\n"); text.append(iText + ", " + jText + "\n");
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
} }
return text; return text;

2
ApplicationCode/ModelVisualization/RivWellPathPartMgr.cpp
View File

@ -82,7 +82,6 @@ RivWellPathPartMgr::~RivWellPathPartMgr()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
void RivWellPathPartMgr::appendStaticFracturePartsToModel(cvf::ModelBasicList* model) void RivWellPathPartMgr::appendStaticFracturePartsToModel(cvf::ModelBasicList* model)
{ {
if (m_rimView.isNull()) return; if (m_rimView.isNull()) return;
@ -99,7 +98,6 @@ void RivWellPathPartMgr::appendStaticFracturePartsToModel(cvf::ModelBasicList* m
f->fracturePartManager()->appendGeometryPartsToModel(model, *eclView); f->fracturePartManager()->appendGeometryPartsToModel(model, *eclView);
} }
} }
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///

2
ApplicationCode/ModelVisualization/RivWellPathPartMgr.h
View File

@ -62,9 +62,7 @@ public:
const cvf::BoundingBox& wellPathClipBoundingBox, const cvf::BoundingBox& wellPathClipBoundingBox,
const caf::DisplayCoordTransform* displayCoordTransform); const caf::DisplayCoordTransform* displayCoordTransform);
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
void appendStaticFracturePartsToModel(cvf::ModelBasicList* model); void appendStaticFracturePartsToModel(cvf::ModelBasicList* model);
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
void appendDynamicGeometryPartsToModel(cvf::ModelBasicList* model, void appendDynamicGeometryPartsToModel(cvf::ModelBasicList* model,
const QDateTime& timeStamp, const QDateTime& timeStamp,

2
ApplicationCode/ModelVisualization/RivWellPathsPartMgr.cpp
View File

@ -57,7 +57,6 @@ void RivWellPathsPartMgr::appendStaticGeometryPartsToModel(cvf::ModelBasicList*
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
void RivWellPathsPartMgr::appendStaticFracturePartsToModel(cvf::ModelBasicList* model) void RivWellPathsPartMgr::appendStaticFracturePartsToModel(cvf::ModelBasicList* model)
{ {
if (!isWellPathVisible()) return; if (!isWellPathVisible()) return;
@ -69,7 +68,6 @@ void RivWellPathsPartMgr::appendStaticFracturePartsToModel(cvf::ModelBasicList*
partMgr->appendStaticFracturePartsToModel(model); partMgr->appendStaticFracturePartsToModel(model);
} }
} }
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///

2
ApplicationCode/ModelVisualization/RivWellPathsPartMgr.h
View File

@ -61,9 +61,7 @@ public:
const cvf::BoundingBox& wellPathClipBoundingBox, const cvf::BoundingBox& wellPathClipBoundingBox,
const caf::DisplayCoordTransform* displayCoordTransform); const caf::DisplayCoordTransform* displayCoordTransform);
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
void appendStaticFracturePartsToModel(cvf::ModelBasicList* model); void appendStaticFracturePartsToModel(cvf::ModelBasicList* model);
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
void appendDynamicGeometryPartsToModel(cvf::ModelBasicList* model, void appendDynamicGeometryPartsToModel(cvf::ModelBasicList* model,
const QDateTime& timeStamp, const QDateTime& timeStamp,

8
ApplicationCode/ProjectDataModel/Completions/RimCompletionCellIntersectionCalc.cpp
View File

@ -38,7 +38,6 @@
#include "RigWellPathIntersectionTools.h" #include "RigWellPathIntersectionTools.h"
#include "RigCellGeometryTools.h" #include "RigCellGeometryTools.h"
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
#include "RimFracture.h" #include "RimFracture.h"
#include "RimWellPathFracture.h" #include "RimWellPathFracture.h"
#include "RimFractureTemplate.h" #include "RimFractureTemplate.h"
@ -47,7 +46,6 @@
#include "RimSimWellFracture.h" #include "RimSimWellFracture.h"
#include "RigFractureGrid.h" #include "RigFractureGrid.h"
#include "RigFractureCell.h" #include "RigFractureCell.h"
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
#include <QDateTime> #include <QDateTime>
@ -70,7 +68,6 @@ void RimCompletionCellIntersectionCalc::calculateCompletionTypeResult(const RimP
} }
} }
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
for (RimEclipseView* view : eclipseCase->reservoirViews()) for (RimEclipseView* view : eclipseCase->reservoirViews())
{ {
for (RimSimWellInView* simWell : view->wellCollection()->wells()) for (RimSimWellInView* simWell : view->wellCollection()->wells())
@ -81,7 +78,6 @@ void RimCompletionCellIntersectionCalc::calculateCompletionTypeResult(const RimP
} }
} }
} }
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -115,7 +111,6 @@ void RimCompletionCellIntersectionCalc::calculateWellPathIntersections(const Rim
} }
} }
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
if (wellPath->fractureCollection()->isChecked()) if (wellPath->fractureCollection()->isChecked())
{ {
for (const RimWellPathFracture* fracture : wellPath->fractureCollection()->fractures()) for (const RimWellPathFracture* fracture : wellPath->fractureCollection()->fractures())
@ -126,7 +121,6 @@ void RimCompletionCellIntersectionCalc::calculateWellPathIntersections(const Rim
} }
} }
} }
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
if (wellPath->perforationIntervalCollection()->isChecked()) if (wellPath->perforationIntervalCollection()->isChecked())
{ {
@ -182,7 +176,6 @@ void RimCompletionCellIntersectionCalc::calculatePerforationIntersections(const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
void RimCompletionCellIntersectionCalc::calculateFractureIntersections(const RigMainGrid* mainGrid, const RimFracture* fracture, std::vector<double>& values) void RimCompletionCellIntersectionCalc::calculateFractureIntersections(const RigMainGrid* mainGrid, const RimFracture* fracture, std::vector<double>& values)
{ {
if (!fracture->fractureTemplate()) return; if (!fracture->fractureTemplate()) return;
@ -251,4 +244,3 @@ void RimCompletionCellIntersectionCalc::calculateFractureIntersections(const Rig
} }
} }
#endif // USE_PROTOTYPE_FEATURE_FRACTURES

16
ApplicationCode/ProjectDataModel/Completions/RimCompletionCellIntersectionCalc.h
View File

@ -20,18 +20,14 @@
#include <vector> #include <vector>
class RigMainGrid;
class RimEclipseCase;
class RimFishbonesMultipleSubs;
class RimFracture;
class RimPerforationInterval;
class RimProject; class RimProject;
class RimWellPath; class RimWellPath;
class RimFishbonesMultipleSubs;
class RimPerforationInterval;
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
class RimFracture;
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
class RimEclipseCase;
class RigMainGrid;
class QDateTime; class QDateTime;
//================================================================================================== //==================================================================================================
@ -51,7 +47,5 @@ private:
static void calculateWellPathIntersections(const RimWellPath* wellPath, const RigMainGrid* grid, std::vector<double>& values, const QDateTime& fromDate); static void calculateWellPathIntersections(const RimWellPath* wellPath, const RigMainGrid* grid, std::vector<double>& values, const QDateTime& fromDate);
static void calculateFishbonesIntersections(const RimFishbonesMultipleSubs* fishbonesSubs, const RigMainGrid* grid, std::vector<double>& values); static void calculateFishbonesIntersections(const RimFishbonesMultipleSubs* fishbonesSubs, const RigMainGrid* grid, std::vector<double>& values);
static void calculatePerforationIntersections(const RimWellPath* wellPath, const RimPerforationInterval* perforationInterval, const RigMainGrid* grid, std::vector<double>& values); static void calculatePerforationIntersections(const RimWellPath* wellPath, const RimPerforationInterval* perforationInterval, const RigMainGrid* grid, std::vector<double>& values);
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
static void calculateFractureIntersections(const RigMainGrid* mainGrid, const RimFracture* fracture, std::vector<double>& values); static void calculateFractureIntersections(const RigMainGrid* mainGrid, const RimFracture* fracture, std::vector<double>& values);
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
}; };

10
ApplicationCode/ProjectDataModel/Completions/RimWellPathCompletions.cpp
View File

@ -21,9 +21,7 @@
#include "RimFishbonesCollection.h" #include "RimFishbonesCollection.h"
#include "RimFishboneWellPathCollection.h" #include "RimFishboneWellPathCollection.h"
#include "RimPerforationCollection.h" #include "RimPerforationCollection.h"
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
#include "RimWellPathFractureCollection.h" #include "RimWellPathFractureCollection.h"
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
#include "cvfAssert.h" #include "cvfAssert.h"
@ -47,11 +45,9 @@ RimWellPathCompletions::RimWellPathCompletions()
m_fishbonesCollection = new RimFishbonesCollection; m_fishbonesCollection = new RimFishbonesCollection;
m_fishbonesCollection.uiCapability()->setUiHidden(true); m_fishbonesCollection.uiCapability()->setUiHidden(true);
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
CAF_PDM_InitFieldNoDefault(&m_fractureCollection, "Fractures", "Fractures", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_fractureCollection, "Fractures", "Fractures", "", "", "");
m_fractureCollection = new RimWellPathFractureCollection; m_fractureCollection = new RimWellPathFractureCollection;
m_fractureCollection.uiCapability()->setUiHidden(true); m_fractureCollection.uiCapability()->setUiHidden(true);
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
CAF_PDM_InitField(&m_wellNameForExport, "WellNameForExport", QString(), "Well Name for Completion Export", "", "", ""); CAF_PDM_InitField(&m_wellNameForExport, "WellNameForExport", QString(), "Well Name for Completion Export", "", "", "");
} }
@ -95,26 +91,22 @@ QString RimWellPathCompletions::wellNameForExport() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
RimWellPathFractureCollection* RimWellPathCompletions::fractureCollection() const RimWellPathFractureCollection* RimWellPathCompletions::fractureCollection() const
{ {
CVF_ASSERT(m_fractureCollection); CVF_ASSERT(m_fractureCollection);
return m_fractureCollection; return m_fractureCollection;
} }
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RimWellPathCompletions::hasCompletions() const bool RimWellPathCompletions::hasCompletions() const
{ {
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
if (!fractureCollection()->fractures().empty()) if (!fractureCollection()->fractures().empty())
{ {
return true; return true;
} }
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
return !fishbonesCollection()->fishbonesSubs().empty() || return !fishbonesCollection()->fishbonesSubs().empty() ||
!fishbonesCollection()->wellPathCollection()->wellPaths().empty() || !fishbonesCollection()->wellPathCollection()->wellPaths().empty() ||
@ -147,10 +139,8 @@ void RimWellPathCompletions::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTree
uiTreeOrdering.add(&m_fishbonesCollection); uiTreeOrdering.add(&m_fishbonesCollection);
} }
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
if (!fractureCollection()->fractures().empty()) if (!fractureCollection()->fractures().empty())
{ {
uiTreeOrdering.add(&m_fractureCollection); uiTreeOrdering.add(&m_fractureCollection);
} }
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
} }

6
ApplicationCode/ProjectDataModel/Completions/RimWellPathCompletions.h
View File

@ -24,9 +24,7 @@
class RimFishbonesCollection; class RimFishbonesCollection;
class RimPerforationCollection; class RimPerforationCollection;
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
class RimWellPathFractureCollection; class RimWellPathFractureCollection;
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
//================================================================================================== //==================================================================================================
/// ///
@ -41,9 +39,7 @@ public:
RimFishbonesCollection* fishbonesCollection() const; RimFishbonesCollection* fishbonesCollection() const;
RimPerforationCollection* perforationCollection() const; RimPerforationCollection* perforationCollection() const;
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
RimWellPathFractureCollection* fractureCollection() const; RimWellPathFractureCollection* fractureCollection() const;
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
void setWellNameForExport(const QString& name); void setWellNameForExport(const QString& name);
QString wellNameForExport() const; QString wellNameForExport() const;
@ -57,9 +53,7 @@ protected:
private: private:
caf::PdmChildField<RimFishbonesCollection*> m_fishbonesCollection; caf::PdmChildField<RimFishbonesCollection*> m_fishbonesCollection;
caf::PdmChildField<RimPerforationCollection*> m_perforationCollection; caf::PdmChildField<RimPerforationCollection*> m_perforationCollection;
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
caf::PdmChildField<RimWellPathFractureCollection*> m_fractureCollection; caf::PdmChildField<RimWellPathFractureCollection*> m_fractureCollection;
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
caf::PdmField<QString> m_wellNameForExport; caf::PdmField<QString> m_wellNameForExport;
}; };

10
ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
View File

@ -77,7 +77,6 @@
#include "RimWellPltPlot.h" #include "RimWellPltPlot.h"
#include "RimWellRftPlot.h" #include "RimWellRftPlot.h"
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
#include "RimEllipseFractureTemplate.h" #include "RimEllipseFractureTemplate.h"
#include "RimStimPlanFractureTemplate.h" #include "RimStimPlanFractureTemplate.h"
#include "RimFractureTemplateCollection.h" #include "RimFractureTemplateCollection.h"
@ -85,7 +84,6 @@
#include "RimSimWellFracture.h" #include "RimSimWellFracture.h"
#include "RimWellPathFracture.h" #include "RimWellPathFracture.h"
#include "RimWellPathFractureCollection.h" #include "RimWellPathFractureCollection.h"
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
#include "RiuMainWindow.h" #include "RiuMainWindow.h"
@ -266,10 +264,7 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
menuBuilder.addSeparator(); menuBuilder.addSeparator();
menuBuilder.subMenuStart("Completions", QIcon(":/FishBoneGroup16x16.png")); menuBuilder.subMenuStart("Completions", QIcon(":/FishBoneGroup16x16.png"));
// Fracture commands
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
menuBuilder << "RicNewWellPathFractureFeature"; menuBuilder << "RicNewWellPathFractureFeature";
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
menuBuilder << "RicNewFishbonesSubsFeature"; menuBuilder << "RicNewFishbonesSubsFeature";
menuBuilder << "RicNewPerforationIntervalFeature"; menuBuilder << "RicNewPerforationIntervalFeature";
menuBuilder << "RicEditPerforationCollectionFeature"; menuBuilder << "RicEditPerforationCollectionFeature";
@ -525,7 +520,6 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
{ {
menuBuilder << "RicShowGridStatisticsFeature"; menuBuilder << "RicShowGridStatisticsFeature";
} }
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
else if (dynamic_cast<RimSimWellFracture*>(uiItem)) else if (dynamic_cast<RimSimWellFracture*>(uiItem))
{ {
menuBuilder << "RicNewSimWellFractureFeature"; menuBuilder << "RicNewSimWellFractureFeature";
@ -561,8 +555,6 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
menuBuilder << "Separator"; menuBuilder << "Separator";
menuBuilder << "RicConvertFractureTemplateUnitFeature"; menuBuilder << "RicConvertFractureTemplateUnitFeature";
} }
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
if (dynamic_cast<Rim3dView*>(uiItem)) if (dynamic_cast<Rim3dView*>(uiItem))
{ {
@ -678,10 +670,8 @@ caf::CmdFeatureMenuBuilder RimContextCommandBuilder::commandsFromSelection()
menuBuilder << "RicEclipseWellShowSpheresFeature"; menuBuilder << "RicEclipseWellShowSpheresFeature";
menuBuilder << "RicEclipseWellShowWellCellsFeature"; menuBuilder << "RicEclipseWellShowWellCellsFeature";
menuBuilder << "RicEclipseWellShowWellCellFenceFeature"; menuBuilder << "RicEclipseWellShowWellCellFenceFeature";
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
menuBuilder << "Separator"; menuBuilder << "Separator";
menuBuilder << "RicNewSimWellFractureFeature"; menuBuilder << "RicNewSimWellFractureFeature";
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
} }
menuBuilder.addSeparator(); menuBuilder.addSeparator();
menuBuilder << "RicCopyIntersectionsToAllViewsInCaseFeature"; menuBuilder << "RicCopyIntersectionsToAllViewsInCaseFeature";

3
ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
View File

@ -254,10 +254,7 @@ RimEclipseView* RimEclipseCase::createAndAddReservoirView()
rimEclipseView->cellEdgeResult()->setResultVariable("MULT"); rimEclipseView->cellEdgeResult()->setResultVariable("MULT");
rimEclipseView->cellEdgeResult()->enableCellEdgeColors = false; rimEclipseView->cellEdgeResult()->enableCellEdgeColors = false;
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
rimEclipseView->fractureColors()->setDefaultResultName(); rimEclipseView->fractureColors()->setDefaultResultName();
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
} }
caf::PdmDocument::updateUiIconStateRecursively(rimEclipseView); caf::PdmDocument::updateUiIconStateRecursively(rimEclipseView);

19
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@ -71,12 +71,10 @@
#include "RivTernarySaturationOverlayItem.h" #include "RivTernarySaturationOverlayItem.h"
#include "RivWellPathsPartMgr.h" #include "RivWellPathsPartMgr.h"
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
#include "RimFracture.h" #include "RimFracture.h"
#include "RimFractureTemplateCollection.h" #include "RimFractureTemplateCollection.h"
#include "RimSimWellFracture.h" #include "RimSimWellFracture.h"
#include "RivWellFracturePartMgr.h" #include "RivWellFracturePartMgr.h"
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
#include "cafCadNavigation.h" #include "cafCadNavigation.h"
@ -123,11 +121,9 @@ RimEclipseView::RimEclipseView()
faultResultSettings = new RimEclipseFaultColors(); faultResultSettings = new RimEclipseFaultColors();
faultResultSettings.uiCapability()->setUiHidden(true); faultResultSettings.uiCapability()->setUiHidden(true);
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
CAF_PDM_InitFieldNoDefault(&fractureColors, "StimPlanColors", "Fracture", "", "", ""); CAF_PDM_InitFieldNoDefault(&fractureColors, "StimPlanColors", "Fracture", "", "", "");
fractureColors = new RimStimPlanColors(); fractureColors = new RimStimPlanColors();
fractureColors.uiCapability()->setUiHidden(true); fractureColors.uiCapability()->setUiHidden(true);
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
CAF_PDM_InitFieldNoDefault(&wellCollection, "WellCollection", "Simulation Wells", "", "", ""); CAF_PDM_InitFieldNoDefault(&wellCollection, "WellCollection", "Simulation Wells", "", "", "");
wellCollection = new RimSimWellInViewCollection; wellCollection = new RimSimWellInViewCollection;
@ -462,15 +458,11 @@ void RimEclipseView::createDisplayModel()
// NB! StimPlan legend colors must be updated before well path geometry is added to the model // 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 // as the fracture geometry depends on the StimPlan legend colors
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
fractureColors->updateLegendData(); fractureColors->updateLegendData();
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
addWellPathsToModel(m_wellPathPipeVizModel.p(), currentActiveCellInfo()->geometryBoundingBox()); addWellPathsToModel(m_wellPathPipeVizModel.p(), currentActiveCellInfo()->geometryBoundingBox());
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
m_wellPathsPartManager->appendStaticFracturePartsToModel(m_wellPathPipeVizModel.p()); m_wellPathsPartManager->appendStaticFracturePartsToModel(m_wellPathPipeVizModel.p());
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
m_wellPathPipeVizModel->updateBoundingBoxesRecursive(); m_wellPathPipeVizModel->updateBoundingBoxesRecursive();
m_viewer->addStaticModelOnce(m_wellPathPipeVizModel.p()); m_viewer->addStaticModelOnce(m_wellPathPipeVizModel.p());
@ -702,7 +694,6 @@ void RimEclipseView::updateCurrentTimeStep()
} }
// Sim Well Fractures // Sim Well Fractures
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
{ {
cvf::String name = "SimWellFracturesModel"; cvf::String name = "SimWellFracturesModel";
this->removeModelByName(frameScene, name); this->removeModelByName(frameScene, name);
@ -733,7 +724,6 @@ void RimEclipseView::updateCurrentTimeStep()
simWellFracturesModelBasicList->updateBoundingBoxesRecursive(); simWellFracturesModelBasicList->updateBoundingBoxesRecursive();
frameScene->addModel(simWellFracturesModelBasicList.p()); frameScene->addModel(simWellFracturesModelBasicList.p());
} }
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
} }
} }
@ -770,9 +760,7 @@ void RimEclipseView::onLoadDataAndUpdate()
this->cellEdgeResult()->loadResult(); this->cellEdgeResult()->loadResult();
this->faultResultSettings()->customFaultResult()->loadResult(); this->faultResultSettings()->customFaultResult()->loadResult();
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
this->fractureColors->loadDataAndUpdate(); this->fractureColors->loadDataAndUpdate();
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
updateMdiWindowVisibility(); updateMdiWindowVisibility();
@ -786,7 +774,6 @@ void RimEclipseView::onLoadDataAndUpdate()
syncronizeWellsWithResults(); syncronizeWellsWithResults();
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
{ {
// Update simulation well fractures after well cell results are imported // Update simulation well fractures after well cell results are imported
@ -797,7 +784,6 @@ void RimEclipseView::onLoadDataAndUpdate()
fracture->loadDataAndUpdate(); fracture->loadDataAndUpdate();
} }
} }
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
this->scheduleCreateDisplayModelAndRedraw(); this->scheduleCreateDisplayModelAndRedraw();
} }
@ -1046,7 +1032,6 @@ void RimEclipseView::updateLegends()
this->cellEdgeResult()->legendConfig()->setAutomaticRanges(cvf::UNDEFINED_DOUBLE, cvf::UNDEFINED_DOUBLE, cvf::UNDEFINED_DOUBLE, cvf::UNDEFINED_DOUBLE); this->cellEdgeResult()->legendConfig()->setAutomaticRanges(cvf::UNDEFINED_DOUBLE, cvf::UNDEFINED_DOUBLE, cvf::UNDEFINED_DOUBLE, cvf::UNDEFINED_DOUBLE);
} }
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
RimLegendConfig* stimPlanLegend = fractureColors()->activeLegend(); RimLegendConfig* stimPlanLegend = fractureColors()->activeLegend();
if (stimPlanLegend) if (stimPlanLegend)
{ {
@ -1057,7 +1042,6 @@ void RimEclipseView::updateLegends()
m_viewer->addColorLegendToBottomLeftCorner(stimPlanLegend->legend()); m_viewer->addColorLegendToBottomLeftCorner(stimPlanLegend->legend());
} }
} }
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -1395,8 +1379,6 @@ void RimEclipseView::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering
uiTreeOrdering.add(faultResultSettings()); uiTreeOrdering.add(faultResultSettings());
uiTreeOrdering.add(wellCollection()); uiTreeOrdering.add(wellCollection());
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
RimProject* project = RiaApplication::instance()->project(); RimProject* project = RiaApplication::instance()->project();
CVF_ASSERT(project); CVF_ASSERT(project);
RimOilField* oilfield = project->activeOilField(); RimOilField* oilfield = project->activeOilField();
@ -1408,7 +1390,6 @@ void RimEclipseView::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering
uiTreeOrdering.add(fractureColors()); uiTreeOrdering.add(fractureColors());
} }
} }
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
uiTreeOrdering.add(faultCollection()); uiTreeOrdering.add(faultCollection());
uiTreeOrdering.add(m_crossSectionCollection()); uiTreeOrdering.add(m_crossSectionCollection());

4
ApplicationCode/ProjectDataModel/RimEclipseView.h
View File

@ -53,9 +53,7 @@ class RimFaultInViewCollection;
class RimReservoirCellResultsStorage; class RimReservoirCellResultsStorage;
class RimReservoirCellResultsStorage; class RimReservoirCellResultsStorage;
class RimSimWellInViewCollection; class RimSimWellInViewCollection;
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
class RimStimPlanColors; class RimStimPlanColors;
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
class RiuViewer; class RiuViewer;
class RivReservoirSimWellsPartMgr; class RivReservoirSimWellsPartMgr;
class RivIntersectionPartMgr; class RivIntersectionPartMgr;
@ -85,9 +83,7 @@ public:
caf::PdmChildField<RimEclipseCellColors*> cellResult; caf::PdmChildField<RimEclipseCellColors*> cellResult;
caf::PdmChildField<RimCellEdgeColors*> cellEdgeResult; caf::PdmChildField<RimCellEdgeColors*> cellEdgeResult;
caf::PdmChildField<RimEclipseFaultColors*> faultResultSettings; caf::PdmChildField<RimEclipseFaultColors*> faultResultSettings;
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
caf::PdmChildField<RimStimPlanColors*> fractureColors; caf::PdmChildField<RimStimPlanColors*> fractureColors;
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
caf::PdmChildField<RimSimWellInViewCollection*> wellCollection; caf::PdmChildField<RimSimWellInViewCollection*> wellCollection;
caf::PdmChildField<RimFaultInViewCollection*> faultCollection; caf::PdmChildField<RimFaultInViewCollection*> faultCollection;

9
ApplicationCode/ProjectDataModel/RimLegendConfig.cpp
View File

@ -27,11 +27,7 @@
#include "RimEclipseCellColors.h" #include "RimEclipseCellColors.h"
#include "RimEclipseView.h" #include "RimEclipseView.h"
#include "RimGeoMechResultDefinition.h" #include "RimGeoMechResultDefinition.h"
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
#include "RimStimPlanColors.h" #include "RimStimPlanColors.h"
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
#include "RimViewLinker.h" #include "RimViewLinker.h"
#include "cafCategoryLegend.h" #include "cafCategoryLegend.h"
@ -208,8 +204,6 @@ void RimLegendConfig::fieldChangedByUi(const caf::PdmFieldHandle* changedField,
view->crossSectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews(); view->crossSectionCollection()->scheduleCreateDisplayModelAndRedraw2dIntersectionViews();
} }
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
// Update stim plan templates if relevant // Update stim plan templates if relevant
RimStimPlanColors* stimPlanColors; RimStimPlanColors* stimPlanColors;
firstAncestorOrThisOfType(stimPlanColors); firstAncestorOrThisOfType(stimPlanColors);
@ -217,7 +211,6 @@ void RimLegendConfig::fieldChangedByUi(const caf::PdmFieldHandle* changedField,
{ {
stimPlanColors->updateStimPlanTemplates(); stimPlanColors->updateStimPlanTemplates();
} }
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -775,11 +768,9 @@ QList<caf::PdmOptionItemInfo> RimLegendConfig::calculateValueOptions(const caf::
{ {
bool hasStimPlanParent = false; bool hasStimPlanParent = false;
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
RimStimPlanColors* stimPlanColors = nullptr; RimStimPlanColors* stimPlanColors = nullptr;
this->firstAncestorOrThisOfType(stimPlanColors); this->firstAncestorOrThisOfType(stimPlanColors);
if (stimPlanColors) hasStimPlanParent = true; if (stimPlanColors) hasStimPlanParent = true;
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
bool isCategoryResult = false; bool isCategoryResult = false;
{ {

12
ApplicationCode/ProjectDataModel/RimOilField.cpp
View File

@ -22,11 +22,7 @@
#include "RimEclipseCaseCollection.h" #include "RimEclipseCaseCollection.h"
#include "RimFormationNamesCollection.h" #include "RimFormationNamesCollection.h"
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
#include "RimFractureTemplateCollection.h" #include "RimFractureTemplateCollection.h"
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
#include "RimGeoMechModels.h" #include "RimGeoMechModels.h"
#include "RimObservedData.h" #include "RimObservedData.h"
#include "RimObservedDataCollection.h" #include "RimObservedDataCollection.h"
@ -47,18 +43,13 @@ RimOilField::RimOilField(void)
CAF_PDM_InitFieldNoDefault(&geoMechModels, "GeoMechModels", "Geo Mech Models", ":/GridModels.png", "", ""); CAF_PDM_InitFieldNoDefault(&geoMechModels, "GeoMechModels", "Geo Mech Models", ":/GridModels.png", "", "");
CAF_PDM_InitFieldNoDefault(&wellPathCollection, "WellPathCollection", "Well Paths", ":/WellCollection.png", "", ""); CAF_PDM_InitFieldNoDefault(&wellPathCollection, "WellPathCollection", "Well Paths", ":/WellCollection.png", "", "");
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
CAF_PDM_InitFieldNoDefault(&fractureDefinitionCollection, "FractureDefinitionCollection", "Defenition of Fractures", "", "", ""); CAF_PDM_InitFieldNoDefault(&fractureDefinitionCollection, "FractureDefinitionCollection", "Defenition of Fractures", "", "", "");
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
CAF_PDM_InitFieldNoDefault(&summaryCaseMainCollection,"SummaryCaseCollection","Summary Cases",":/GridModels.png","",""); CAF_PDM_InitFieldNoDefault(&summaryCaseMainCollection,"SummaryCaseCollection","Summary Cases",":/GridModels.png","","");
CAF_PDM_InitFieldNoDefault(&formationNamesCollection,"FormationNamesCollection","Formations","","",""); CAF_PDM_InitFieldNoDefault(&formationNamesCollection,"FormationNamesCollection","Formations","","","");
CAF_PDM_InitFieldNoDefault(&observedDataCollection, "ObservedDataCollection", "Observed Data", ":/Cases16x16.png", "", ""); CAF_PDM_InitFieldNoDefault(&observedDataCollection, "ObservedDataCollection", "Observed Data", ":/Cases16x16.png", "", "");
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
fractureDefinitionCollection = new RimFractureTemplateCollection(); fractureDefinitionCollection = new RimFractureTemplateCollection();
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
analysisModels = new RimEclipseCaseCollection(); analysisModels = new RimEclipseCaseCollection();
wellPathCollection = new RimWellPathCollection(); wellPathCollection = new RimWellPathCollection();
summaryCaseMainCollection = new RimSummaryCaseMainCollection(); summaryCaseMainCollection = new RimSummaryCaseMainCollection();
@ -73,10 +64,7 @@ RimOilField::~RimOilField(void)
{ {
if (wellPathCollection()) delete wellPathCollection(); if (wellPathCollection()) delete wellPathCollection();
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
if (fractureDefinitionCollection()) delete fractureDefinitionCollection(); if (fractureDefinitionCollection()) delete fractureDefinitionCollection();
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
if (geoMechModels()) delete geoMechModels(); if (geoMechModels()) delete geoMechModels();
if (analysisModels()) delete analysisModels(); if (analysisModels()) delete analysisModels();
if (summaryCaseMainCollection()) delete summaryCaseMainCollection(); if (summaryCaseMainCollection()) delete summaryCaseMainCollection();

15
ApplicationCode/ProjectDataModel/RimProject.cpp
View File

@ -37,13 +37,8 @@
#include "RimEclipseCaseCollection.h" #include "RimEclipseCaseCollection.h"
#include "RimFlowPlotCollection.h" #include "RimFlowPlotCollection.h"
#include "RimFormationNamesCollection.h" #include "RimFormationNamesCollection.h"
#include "RimSummaryCalculationCollection.h"
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
#include "RimFractureTemplateCollection.h"
#include "RimFractureTemplate.h" #include "RimFractureTemplate.h"
#endif // USE_PROTOTYPE_FEATURE_FRACTURES #include "RimFractureTemplateCollection.h"
#include "RimGeoMechCase.h" #include "RimGeoMechCase.h"
#include "RimGeoMechModels.h" #include "RimGeoMechModels.h"
#include "RimGridSummaryCase.h" #include "RimGridSummaryCase.h"
@ -56,6 +51,7 @@
#include "RimPltPlotCollection.h" #include "RimPltPlotCollection.h"
#include "RimRftPlotCollection.h" #include "RimRftPlotCollection.h"
#include "RimScriptCollection.h" #include "RimScriptCollection.h"
#include "RimSummaryCalculationCollection.h"
#include "RimSummaryCaseMainCollection.h" #include "RimSummaryCaseMainCollection.h"
#include "RimSummaryCrossPlotCollection.h" #include "RimSummaryCrossPlotCollection.h"
#include "RimSummaryPlotCollection.h" #include "RimSummaryPlotCollection.h"
@ -484,10 +480,8 @@ void RimProject::setProjectFileNameAndUpdateDependencies(const QString& fileName
oilField->summaryCaseMainCollection()->updateFilePathsFromProjectPath(newProjectPath, oldProjectPath); oilField->summaryCaseMainCollection()->updateFilePathsFromProjectPath(newProjectPath, oldProjectPath);
} }
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
CVF_ASSERT(oilField->fractureDefinitionCollection()); CVF_ASSERT(oilField->fractureDefinitionCollection());
oilField->fractureDefinitionCollection()->updateFilePathsFromProjectPath(newProjectPath, oldProjectPath); oilField->fractureDefinitionCollection()->updateFilePathsFromProjectPath(newProjectPath, oldProjectPath);
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
} }
{ {
@ -937,7 +931,6 @@ std::vector<RimGeoMechCase*> RimProject::geoMechCases() const
return cases; return cases;
} }
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
@ -973,7 +966,6 @@ std::vector<RimFractureTemplate*> RimProject::allFractureTemplates() const
} }
return templates; return templates;
} }
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
@ -1058,10 +1050,7 @@ void RimProject::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QS
if (oilField->geoMechModels()) uiTreeOrdering.add(oilField->geoMechModels()); if (oilField->geoMechModels()) uiTreeOrdering.add(oilField->geoMechModels());
if (oilField->wellPathCollection()) uiTreeOrdering.add(oilField->wellPathCollection()); if (oilField->wellPathCollection()) uiTreeOrdering.add(oilField->wellPathCollection());
if (oilField->formationNamesCollection()) uiTreeOrdering.add(oilField->formationNamesCollection()); if (oilField->formationNamesCollection()) uiTreeOrdering.add(oilField->formationNamesCollection());
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
if (oilField->fractureDefinitionCollection()) uiTreeOrdering.add(oilField->fractureDefinitionCollection()); if (oilField->fractureDefinitionCollection()) uiTreeOrdering.add(oilField->fractureDefinitionCollection());
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
} }
uiTreeOrdering.add(scriptCollection()); uiTreeOrdering.add(scriptCollection());

2
ApplicationCode/ProjectDataModel/RimProject.h
View File

@ -138,10 +138,8 @@ public:
std::vector<RimGeoMechCase*> geoMechCases() const; std::vector<RimGeoMechCase*> geoMechCases() const;
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
std::vector<RimFractureTemplateCollection*> allFractureTemplateCollections() const; std::vector<RimFractureTemplateCollection*> allFractureTemplateCollections() const;
std::vector<RimFractureTemplate*> allFractureTemplates() const; std::vector<RimFractureTemplate*> allFractureTemplates() const;
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
protected: protected:
// Overridden methods // Overridden methods

30
ApplicationCode/ProjectDataModel/RimSimWellInView.cpp
View File

@ -20,32 +20,28 @@
#include "RimSimWellInView.h" #include "RimSimWellInView.h"
#include "RigSimulationWellCenterLineCalculator.h" #include "RigActiveCellInfo.h"
#include "RigCell.h"
#include "RigEclipseCaseData.h"
#include "RigMainGrid.h"
#include "RigSimWellData.h" #include "RigSimWellData.h"
#include "RigSimulationWellCenterLineCalculator.h"
#include "RimCellRangeFilterCollection.h" #include "RimCellRangeFilterCollection.h"
#include "RimEclipseCase.h"
#include "RimEclipseView.h" #include "RimEclipseView.h"
#include "RimIntersectionCollection.h" #include "RimIntersectionCollection.h"
#include "RimSimWellInViewCollection.h" #include "RimPropertyFilterCollection.h"
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
#include "RimSimWellFractureCollection.h"
#include "RimSimWellFracture.h" #include "RimSimWellFracture.h"
#endif // USE_PROTOTYPE_FEATURE_FRACTURES #include "RimSimWellFractureCollection.h"
#include "RimSimWellInViewCollection.h"
#include "RiuMainWindow.h" #include "RiuMainWindow.h"
#include "RivReservoirViewPartMgr.h" #include "RivReservoirViewPartMgr.h"
#include "cafPdmUiTreeOrdering.h" #include "cafPdmUiTreeOrdering.h"
#include "cvfMath.h" #include "cvfMath.h"
#include "RigCell.h"
#include "RimEclipseCase.h"
#include "RigEclipseCaseData.h"
#include "RigMainGrid.h"
#include "RigActiveCellInfo.h"
#include "RimPropertyFilterCollection.h"
CAF_PDM_SOURCE_INIT(RimSimWellInView, "Well"); CAF_PDM_SOURCE_INIT(RimSimWellInView, "Well");
@ -72,18 +68,14 @@ RimSimWellInView::RimSimWellInView()
CAF_PDM_InitField(&showWellCells, "ShowWellCells", false, "Well Cells", "", "", ""); CAF_PDM_InitField(&showWellCells, "ShowWellCells", false, "Well Cells", "", "", "");
CAF_PDM_InitField(&showWellCellFence, "ShowWellCellFence", false, "Well Cell Fence", "", "", ""); CAF_PDM_InitField(&showWellCellFence, "ShowWellCellFence", false, "Well Cell Fence", "", "", "");
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
CAF_PDM_InitFieldNoDefault(&simwellFractureCollection, "FractureCollection", "Fractures", "", "", ""); CAF_PDM_InitFieldNoDefault(&simwellFractureCollection, "FractureCollection", "Fractures", "", "", "");
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
name.uiCapability()->setUiHidden(true); name.uiCapability()->setUiHidden(true);
name.uiCapability()->setUiReadOnly(true); name.uiCapability()->setUiReadOnly(true);
m_resultWellIndex = cvf::UNDEFINED_SIZE_T; m_resultWellIndex = cvf::UNDEFINED_SIZE_T;
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
simwellFractureCollection= new RimSimWellFractureCollection(); simwellFractureCollection= new RimSimWellFractureCollection();
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -91,9 +83,7 @@ RimSimWellInView::RimSimWellInView()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimSimWellInView::~RimSimWellInView() RimSimWellInView::~RimSimWellInView()
{ {
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
if (simwellFractureCollection()) delete simwellFractureCollection(); if (simwellFractureCollection()) delete simwellFractureCollection();
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -389,13 +379,11 @@ void RimSimWellInView::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimSimWellInView::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/) void RimSimWellInView::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/)
{ {
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
for (RimSimWellFracture* fracture : simwellFractureCollection()->simwellFractures()) for (RimSimWellFracture* fracture : simwellFractureCollection()->simwellFractures())
{ {
uiTreeOrdering.add(fracture); uiTreeOrdering.add(fracture);
} }
uiTreeOrdering.skipRemainingChildren(true); uiTreeOrdering.skipRemainingChildren(true);
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
const RimEclipseView* reservoirView = nullptr; const RimEclipseView* reservoirView = nullptr;
this->firstAncestorOrThisOfType(reservoirView); this->firstAncestorOrThisOfType(reservoirView);

5
ApplicationCode/ProjectDataModel/RimSimWellInView.h
View File

@ -36,10 +36,7 @@ class RigSimWellData;
class RigWellResultFrame; class RigWellResultFrame;
struct RigWellResultPoint; struct RigWellResultPoint;
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
class RimSimWellFractureCollection; class RimSimWellFractureCollection;
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
//================================================================================================== //==================================================================================================
/// ///
@ -93,9 +90,7 @@ public:
caf::PdmField<bool> showWellCells; caf::PdmField<bool> showWellCells;
caf::PdmField<bool> showWellCellFence; caf::PdmField<bool> showWellCellFence;
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
caf::PdmChildField<RimSimWellFractureCollection*> simwellFractureCollection; caf::PdmChildField<RimSimWellFractureCollection*> simwellFractureCollection;
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
protected: protected:

4
ApplicationCode/ProjectDataModel/RimSimWellInViewCollection.cpp
View File

@ -32,10 +32,8 @@
#include "RimProject.h" #include "RimProject.h"
#include "RimSimWellInView.h" #include "RimSimWellInView.h"
#include "RimWellAllocationPlot.h" #include "RimWellAllocationPlot.h"
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
#include "RimSimWellFracture.h" #include "RimSimWellFracture.h"
#include "RimSimWellFractureCollection.h" #include "RimSimWellFractureCollection.h"
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
#include "RiuMainWindow.h" #include "RiuMainWindow.h"
@ -462,7 +460,6 @@ void RimSimWellInViewCollection::fieldChangedByUi(const caf::PdmFieldHandle* cha
if (m_reservoirView) m_reservoirView->scheduleCreateDisplayModelAndRedraw(); if (m_reservoirView) m_reservoirView->scheduleCreateDisplayModelAndRedraw();
} }
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
if (&wellPipeCoordType == changedField) if (&wellPipeCoordType == changedField)
{ {
for (RimSimWellInView* w : wells) for (RimSimWellInView* w : wells)
@ -473,7 +470,6 @@ void RimSimWellInViewCollection::fieldChangedByUi(const caf::PdmFieldHandle* cha
} }
} }
} }
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

4
ApplicationCode/ProjectDataModel/RimWellPath.cpp
View File

@ -261,26 +261,22 @@ const RimWellPathCompletions* RimWellPath::completions() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
RimWellPathFractureCollection* RimWellPath::fractureCollection() RimWellPathFractureCollection* RimWellPath::fractureCollection()
{ {
CVF_ASSERT(m_completions); CVF_ASSERT(m_completions);
return m_completions->fractureCollection(); return m_completions->fractureCollection();
} }
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
const RimWellPathFractureCollection * RimWellPath::fractureCollection() const const RimWellPathFractureCollection * RimWellPath::fractureCollection() const
{ {
CVF_ASSERT(m_completions); CVF_ASSERT(m_completions);
return m_completions->fractureCollection(); return m_completions->fractureCollection();
} }
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///

4
ApplicationCode/ProjectDataModel/RimWellPath.h
View File

@ -48,9 +48,7 @@ class RimPerforationCollection;
class RimWellPathCompletions; class RimWellPathCompletions;
class RigWellPathFormations; class RigWellPathFormations;
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
class RimWellPathFractureCollection; class RimWellPathFractureCollection;
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
//================================================================================================== //==================================================================================================
/// ///
@ -110,10 +108,8 @@ public:
const RimPerforationCollection* perforationIntervalCollection() const; const RimPerforationCollection* perforationIntervalCollection() const;
const RimWellPathCompletions* completions() const; const RimWellPathCompletions* completions() const;
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
RimWellPathFractureCollection* fractureCollection(); RimWellPathFractureCollection* fractureCollection();
const RimWellPathFractureCollection* fractureCollection() const; const RimWellPathFractureCollection* fractureCollection() const;
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
RigWellPath* wellPathGeometry(); RigWellPath* wellPathGeometry();
const RigWellPath* wellPathGeometry() const; const RigWellPath* wellPathGeometry() const;

10
ApplicationCode/ReservoirDataModel/RigCellGeometryTools.cpp
View File

@ -24,9 +24,7 @@
#include "cafHexGridIntersectionTools/cafHexGridIntersectionTools.h" #include "cafHexGridIntersectionTools/cafHexGridIntersectionTools.h"
#include "cvfBoundingBox.h" #include "cvfBoundingBox.h"
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
#include "clipper/clipper.hpp" #include "clipper/clipper.hpp"
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
#include <vector> #include <vector>
@ -222,7 +220,6 @@ double RigCellGeometryTools::polygonLengthInLocalXdirWeightedByArea(std::vector<
return areaWeightedLength; return areaWeightedLength;
} }
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
double clipperConversionFactor = 10000; //For transform to clipper int double clipperConversionFactor = 10000; //For transform to clipper int
@ -249,7 +246,6 @@ cvf::Vec3d fromClipperPoint(const ClipperLib::IntPoint& clipPoint)
return cvf::Vec3d (clipPoint.X, clipPoint.Y, zDValue ) /clipperConversionFactor; return cvf::Vec3d (clipPoint.X, clipPoint.Y, zDValue ) /clipperConversionFactor;
} }
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
@ -258,7 +254,6 @@ std::vector<std::vector<cvf::Vec3d> > RigCellGeometryTools::intersectPolygons(st
{ {
std::vector<std::vector<cvf::Vec3d> > clippedPolygons; std::vector<std::vector<cvf::Vec3d> > clippedPolygons;
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
// Convert to int for clipper library and store as clipper "path" // Convert to int for clipper library and store as clipper "path"
ClipperLib::Path polygon1path; ClipperLib::Path polygon1path;
for (cvf::Vec3d& v : polygon1) for (cvf::Vec3d& v : polygon1)
@ -289,7 +284,6 @@ std::vector<std::vector<cvf::Vec3d> > RigCellGeometryTools::intersectPolygons(st
} }
clippedPolygons.push_back(clippedPolygon); clippedPolygons.push_back(clippedPolygon);
} }
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
return clippedPolygons; return clippedPolygons;
} }
@ -297,7 +291,6 @@ std::vector<std::vector<cvf::Vec3d> > RigCellGeometryTools::intersectPolygons(st
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
void fillInterpolatedSubjectZ(ClipperLib::IntPoint& e1bot, void fillInterpolatedSubjectZ(ClipperLib::IntPoint& e1bot,
ClipperLib::IntPoint& e1top, ClipperLib::IntPoint& e1top,
ClipperLib::IntPoint& e2bot, ClipperLib::IntPoint& e2bot,
@ -350,7 +343,6 @@ void fillUndefinedZ(ClipperLib::IntPoint& e1bot,
{ {
pt.Z = std::numeric_limits<int>::max(); pt.Z = std::numeric_limits<int>::max();
} }
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// Assumes x.y plane polygon. Polyline might have a Z, and the returned Z is the polyline Z, interpolated if it is clipped. /// Assumes x.y plane polygon. Polyline might have a Z, and the returned Z is the polyline Z, interpolated if it is clipped.
@ -361,7 +353,6 @@ std::vector<std::vector<cvf::Vec3d> > RigCellGeometryTools::clipPolylineByPolygo
{ {
std::vector<std::vector<cvf::Vec3d> > clippedPolyline; std::vector<std::vector<cvf::Vec3d> > clippedPolyline;
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
//Adjusting polygon to avoid clipper issue with interpolating z-values when lines crosses though polygon vertecies //Adjusting polygon to avoid clipper issue with interpolating z-values when lines crosses though polygon vertecies
std::vector<cvf::Vec3d> adjustedPolygon = ajustPolygonToAvoidIntersectionsAtVertex(polyLine, polygon); std::vector<cvf::Vec3d> adjustedPolygon = ajustPolygonToAvoidIntersectionsAtVertex(polyLine, polygon);
@ -410,7 +401,6 @@ std::vector<std::vector<cvf::Vec3d> > RigCellGeometryTools::clipPolylineByPolygo
} }
clippedPolyline.push_back(clippedPolygon); clippedPolyline.push_back(clippedPolygon);
} }
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
return clippedPolyline; return clippedPolyline;
} }

2
ApplicationCode/UnitTests/RigCellGeometryTools-Test.cpp
View File

@ -142,7 +142,6 @@ TEST(RigCellGeometryTools, findCellAverageZTest)
} }
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
@ -414,4 +413,3 @@ TEST(RigWellPathStimplanIntersector, intersection)
} }
#endif // USE_PROTOTYPE_FEATURE_FRACTURES

6
ApplicationCode/UserInterface/RiuViewerCommands.cpp
View File

@ -357,9 +357,7 @@ void RiuViewerCommands::displayContextMenu(QMouseEvent* event)
menuBuilder.subMenuStart("Completions", QIcon(":/FishBoneGroup16x16.png")); menuBuilder.subMenuStart("Completions", QIcon(":/FishBoneGroup16x16.png"));
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
menuBuilder << "RicNewWellPathFractureAtPosFeature"; menuBuilder << "RicNewWellPathFractureAtPosFeature";
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
menuBuilder << "RicNewFishbonesSubsAtMeasuredDepthFeature"; menuBuilder << "RicNewFishbonesSubsAtMeasuredDepthFeature";
menuBuilder << "RicNewPerforationIntervalAtMeasuredDepthFeature"; menuBuilder << "RicNewPerforationIntervalAtMeasuredDepthFeature";
@ -402,9 +400,7 @@ void RiuViewerCommands::displayContextMenu(QMouseEvent* event)
menuBuilder.addSeparator(); menuBuilder.addSeparator();
menuBuilder << "RicShowContributingWellsFeature"; menuBuilder << "RicShowContributingWellsFeature";
menuBuilder.addSeparator(); menuBuilder.addSeparator();
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
menuBuilder << "RicNewSimWellFractureAtPosFeature"; menuBuilder << "RicNewSimWellFractureAtPosFeature";
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
menuBuilder.addSeparator(); menuBuilder.addSeparator();
menuBuilder << "RicNewSimWellIntersectionFeature"; menuBuilder << "RicNewSimWellIntersectionFeature";
} }
@ -500,7 +496,6 @@ void RiuViewerCommands::handlePickAction(int winPosX, int winPosY, Qt::KeyboardM
if (rivObjectSourceInfo) if (rivObjectSourceInfo)
{ {
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
RimFracture* fracture = dynamic_cast<RimFracture*>(rivObjectSourceInfo->object()); RimFracture* fracture = dynamic_cast<RimFracture*>(rivObjectSourceInfo->object());
{ {
bool blockSelectionOfFracture = false; bool blockSelectionOfFracture = false;
@ -550,7 +545,6 @@ void RiuViewerCommands::handlePickAction(int winPosX, int winPosY, Qt::KeyboardM
// Display result info text // Display result info text
RiuMainWindow::instance()->setResultInfo(resultInfoText); RiuMainWindow::instance()->setResultInfo(resultInfoText);
} }
#endif //USE_PROTOTYPE_FEATURE_FRACTURES
} }
if (rivSourceInfo) if (rivSourceInfo)