#2529 Fracture : Remove all #ifdef USE_PROTOTYPE_FEATURE_FRACTURES

ApplicationCode/ProjectDataModel/Completions/RimCompletionCellIntersectionCalc.cpp

@@ -38,7 +38,6 @@
 #include "RigWellPathIntersectionTools.h"
 #include "RigCellGeometryTools.h"
 
-#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
 #include "RimFracture.h"
 #include "RimWellPathFracture.h"
 #include "RimFractureTemplate.h"
@@ -47,7 +46,6 @@
 #include "RimSimWellFracture.h"
 #include "RigFractureGrid.h"
 #include "RigFractureCell.h"
-#endif // USE_PROTOTYPE_FEATURE_FRACTURES
 
 
 #include <QDateTime>
@@ -70,7 +68,6 @@ void RimCompletionCellIntersectionCalc::calculateCompletionTypeResult(const RimP
         }
     }
 
-#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
     for (RimEclipseView* view : eclipseCase->reservoirViews())
     {
         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())
     {
         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())
     {
@@ -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)
 {
     if (!fracture->fractureTemplate()) return;
@@ -251,4 +244,3 @@ void RimCompletionCellIntersectionCalc::calculateFractureIntersections(const Rig
 
     }
 }
-#endif // USE_PROTOTYPE_FEATURE_FRACTURES

ApplicationCode/ProjectDataModel/Completions/RimCompletionCellIntersectionCalc.h

@@ -20,18 +20,14 @@
 
 #include <vector>
 
+class RigMainGrid;
+class RimEclipseCase;
+class RimFishbonesMultipleSubs;
+class RimFracture;
+class RimPerforationInterval;
 class RimProject;
 class RimWellPath;
-class RimFishbonesMultipleSubs;
-class RimPerforationInterval;
 
-#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
-class RimFracture;
-#endif // USE_PROTOTYPE_FEATURE_FRACTURES
-
-class RimEclipseCase;
-
-class RigMainGrid;
 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                     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);
-#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
     static void                     calculateFractureIntersections(const RigMainGrid* mainGrid, const RimFracture* fracture, std::vector<double>& values);
-#endif // USE_PROTOTYPE_FEATURE_FRACTURES
 };

ApplicationCode/ProjectDataModel/Completions/RimWellPathCompletions.cpp

@@ -21,9 +21,7 @@
 #include "RimFishbonesCollection.h"
 #include "RimFishboneWellPathCollection.h"
 #include "RimPerforationCollection.h"
-#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
 #include "RimWellPathFractureCollection.h"
-#endif // USE_PROTOTYPE_FEATURE_FRACTURES
 
 #include "cvfAssert.h"
 
@@ -47,11 +45,9 @@ RimWellPathCompletions::RimWellPathCompletions()
     m_fishbonesCollection = new RimFishbonesCollection;
     m_fishbonesCollection.uiCapability()->setUiHidden(true);
 
-#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
     CAF_PDM_InitFieldNoDefault(&m_fractureCollection, "Fractures", "Fractures", "", "", "");
     m_fractureCollection = new RimWellPathFractureCollection;
     m_fractureCollection.uiCapability()->setUiHidden(true);
-#endif // USE_PROTOTYPE_FEATURE_FRACTURES
 
     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
 {
     CVF_ASSERT(m_fractureCollection);
 
     return m_fractureCollection;
 }
-#endif // USE_PROTOTYPE_FEATURE_FRACTURES
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
 bool RimWellPathCompletions::hasCompletions() const
 {
-#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
     if (!fractureCollection()->fractures().empty())
     {
         return true;
     }
-#endif // USE_PROTOTYPE_FEATURE_FRACTURES
 
     return !fishbonesCollection()->fishbonesSubs().empty() ||
            !fishbonesCollection()->wellPathCollection()->wellPaths().empty() ||
@@ -147,10 +139,8 @@ void RimWellPathCompletions::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTree
         uiTreeOrdering.add(&m_fishbonesCollection);
     }
 
-#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
     if (!fractureCollection()->fractures().empty())
     {
         uiTreeOrdering.add(&m_fractureCollection);
     }
-#endif // USE_PROTOTYPE_FEATURE_FRACTURES
 }

ApplicationCode/ProjectDataModel/Completions/RimWellPathCompletions.h

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

ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp

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

ApplicationCode/ProjectDataModel/RimEclipseCase.cpp

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

ApplicationCode/ProjectDataModel/RimEclipseView.cpp

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

ApplicationCode/ProjectDataModel/RimEclipseView.h

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

ApplicationCode/ProjectDataModel/RimLegendConfig.cpp

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

ApplicationCode/ProjectDataModel/RimOilField.cpp

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

ApplicationCode/ProjectDataModel/RimProject.cpp

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

ApplicationCode/ProjectDataModel/RimProject.h

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

ApplicationCode/ProjectDataModel/RimSimWellInView.cpp

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

ApplicationCode/ProjectDataModel/RimSimWellInView.h

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

ApplicationCode/ProjectDataModel/RimSimWellInViewCollection.cpp

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

ApplicationCode/ProjectDataModel/RimWellPath.cpp

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

ApplicationCode/ProjectDataModel/RimWellPath.h

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