#1996 Rename RimEclipseWell -> RimSimWellInView

ApplicationCode/ProjectDataModel/Completions/RimCompletionCellIntersectionCalc.cpp

@@ -19,19 +19,19 @@
 #include "RimCompletionCellIntersectionCalc.h"
 
 #include "RiaDefines.h"
-#include "RimProject.h"
-#include "RimOilField.h"
-#include "RimWellPathCollection.h"
-#include "RimWellPath.h"
-#include "RimWellPathCompletions.h"
-#include "RimFishbonesCollection.h"
-#include "RimFishbonesMultipleSubs.h"
-#include "RimPerforationCollection.h"
-#include "RimPerforationInterval.h"
 #include "RimEclipseCase.h"
 #include "RimEclipseView.h"
 #include "RimEclipseWellCollection.h"
-#include "RimEclipseWell.h"
+#include "RimFishbonesCollection.h"
+#include "RimFishbonesMultipleSubs.h"
+#include "RimOilField.h"
+#include "RimPerforationCollection.h"
+#include "RimPerforationInterval.h"
+#include "RimProject.h"
+#include "RimSimWellInView.h"
+#include "RimWellPath.h"
+#include "RimWellPathCollection.h"
+#include "RimWellPathCompletions.h"
 
 #include "RigMainGrid.h"
 #include "RigWellPath.h"
@@ -68,7 +68,7 @@ void RimCompletionCellIntersectionCalc::calculateIntersections(const RimProject*
 #ifdef USE_PROTOTYPE_FEATURE_FRACTURES
     for (RimEclipseView* view : eclipseCase->reservoirViews())
     {
-        for (RimEclipseWell* simWell : view->wellCollection()->wells())
+        for (RimSimWellInView* simWell : view->wellCollection()->wells())
         {
             for (RimSimWellFracture* fracture : simWell->simwellFractureCollection()->simwellFractures())
             {

ApplicationCode/ProjectDataModel/Completions/RimFishboneWellPathCollection.cpp

@@ -19,11 +19,11 @@
 
 #include "RimFishboneWellPathCollection.h"
 
-#include "RimEclipseWell.h"
 #include "RimFishboneWellPath.h"
-#include "RimView.h"
-#include "RimProject.h"
 #include "RimFishbonesCollection.h"
+#include "RimProject.h"
+#include "RimSimWellInView.h"
+#include "RimView.h"
 
 #include "RigWellPath.h"
 

ApplicationCode/ProjectDataModel/Completions/RimPerforationCollection.cpp

@@ -19,10 +19,10 @@
 
 #include "RimPerforationCollection.h"
 
-#include "RimEclipseWell.h"
 #include "RimPerforationInterval.h"
-#include "RimView.h"
 #include "RimProject.h"
+#include "RimSimWellInView.h"
+#include "RimView.h"
 
 #include "RigWellPath.h"
 

ApplicationCode/ProjectDataModel/Completions/RimSimWellFracture.cpp

@@ -23,11 +23,11 @@
 #include "RigSingleWellResultsData.h"
 
 #include "RimEclipseView.h"
-#include "RimEclipseWell.h"
 #include "RimEllipseFractureTemplate.h"
 #include "RimFracture.h"
 #include "RimFractureTemplate.h"
 #include "RimProject.h"
+#include "RimSimWellInView.h"
 
 #include "cafPdmUiDoubleSliderEditor.h"
 
@@ -309,7 +309,7 @@ void RimSimWellFracture::setBranchGeometry()
 {
     m_branchCenterLines.clear();
 
-    RimEclipseWell* rimWell = nullptr;
+    RimSimWellInView* rimWell = nullptr;
     this->firstAncestorOrThisOfType(rimWell);
     CVF_ASSERT(rimWell);
 

ApplicationCode/ProjectDataModel/Flow/RimFlowDiagSolution.cpp

@@ -30,8 +30,8 @@
 
 #include "RimEclipseResultCase.h"
 #include "RimEclipseView.h"
-#include "RimEclipseWell.h"
 #include "RimEclipseWellCollection.h"
+#include "RimSimWellInView.h"
 
 CAF_PDM_SOURCE_INIT(RimFlowDiagSolution, "FlowDiagSolution");
 

ApplicationCode/ProjectDataModel/Flow/RimFlowDiagSolution.h

@@ -25,8 +25,8 @@
 #include "cvfObject.h"
 #include "cvfColor3.h"
 
-class RimEclipseWell;
 class RigFlowDiagResults;
+class RimSimWellInView;
 
 //==================================================================================================
 ///  

ApplicationCode/ProjectDataModel/Flow/RimTofAccumulatedPhaseFractionsPlot.cpp

@@ -21,8 +21,8 @@
 #include "RiaApplication.h"
 
 #include "RimEclipseView.h"
-#include "RimEclipseWell.h"
 #include "RimEclipseWellCollection.h"
+#include "RimSimWellInView.h"
 #include "RimWellAllocationPlot.h"
 
 #include "RigSingleWellResultsData.h"

ApplicationCode/ProjectDataModel/Flow/RimTofAccumulatedPhaseFractionsPlot.h

@@ -29,11 +29,11 @@
 
 #include <vector>
 
-class RiuWellAllocationPlot;
-class RimEclipseWell;
+class RimEclipseResultCase;
+class RimSimWellInView;
 class RimWellLogPlot;
 class RiuTofAccumulatedPhaseFractionsPlot;
-class RimEclipseResultCase;
+class RiuWellAllocationPlot;
 
 namespace caf {
     class PdmOptionItemInfo;

ApplicationCode/ProjectDataModel/Flow/RimTotalWellAllocationPlot.cpp

@@ -21,8 +21,8 @@
 #include "RiaApplication.h"
 
 #include "RimEclipseView.h"
-#include "RimEclipseWell.h"
 #include "RimEclipseWellCollection.h"
+#include "RimSimWellInView.h"
 
 #include "RigSingleWellResultsData.h"
 

ApplicationCode/ProjectDataModel/Flow/RimTotalWellAllocationPlot.h

@@ -29,10 +29,10 @@
 
 #include <vector>
 
-class RiuWellAllocationPlot;
-class RimEclipseWell;
+class RimSimWellInView;
 class RimWellLogPlot;
 class RiuNightchartsWidget;
+class RiuWellAllocationPlot;
 
 namespace caf {
     class PdmOptionItemInfo;

ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp

@@ -32,16 +32,16 @@
 #include "RimEclipseCellColors.h"
 #include "RimEclipseResultCase.h"
 #include "RimEclipseView.h"
-#include "RimEclipseWell.h"
 #include "RimEclipseWellCollection.h"
 #include "RimFlowDiagSolution.h"
 #include "RimProject.h"
+#include "RimSimWellInView.h"
+#include "RimTofAccumulatedPhaseFractionsPlot.h"
 #include "RimTotalWellAllocationPlot.h"
+#include "RimWellAllocationPlotLegend.h"
 #include "RimWellFlowRateCurve.h"
 #include "RimWellLogPlot.h"
 #include "RimWellLogTrack.h"
-#include "RimWellAllocationPlotLegend.h"
-#include "RimTofAccumulatedPhaseFractionsPlot.h"
 
 #include "RiuMainPlotWindow.h"
 #include "RiuWellAllocationPlot.h"
@@ -127,7 +127,7 @@ RimWellAllocationPlot::~RimWellAllocationPlot()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimWellAllocationPlot::setFromSimulationWell(RimEclipseWell* simWell)
+void RimWellAllocationPlot::setFromSimulationWell(RimSimWellInView* simWell)
 {
     RimEclipseView* eclView;
     simWell->firstAncestorOrThisOfType(eclView);

ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.h

@@ -27,16 +27,16 @@
 
 #include <QPointer>
 
+class RigSingleWellResultsData;
 class RimEclipseResultCase;
-class RimEclipseWell;
 class RimFlowDiagSolution;
+class RimSimWellInView;
+class RimTofAccumulatedPhaseFractionsPlot;
 class RimTotalWellAllocationPlot;
 class RimWellAllocationPlotLegend;
 class RimWellLogPlot;
-class RiuWellAllocationPlot;
 class RimWellLogTrack;
-class RimTofAccumulatedPhaseFractionsPlot;
-class RigSingleWellResultsData;
+class RiuWellAllocationPlot;
 
 namespace cvf {
     class Color3f;
@@ -61,7 +61,7 @@ public:
     RimWellAllocationPlot();
     virtual ~RimWellAllocationPlot();
 
-    void                                            setFromSimulationWell(RimEclipseWell* simWell);
+    void                                            setFromSimulationWell(RimSimWellInView* simWell);
 
     void                                            setDescription(const QString& description);
     QString                                         description() const;

ApplicationCode/ProjectDataModel/Flow/RimWellRftAddress.h

@@ -29,17 +29,17 @@
 #include <QDate>
 #include <QMetaType>
 
-class RimEclipseResultCase;
-class RimEclipseWell;
-class RimFlowDiagSolution;
-class RimTotalWellAllocationPlot;
-class RimWellLogPlot;
-class RiuWellRftPlot;
-class RimWellLogTrack;
-class RimTofAccumulatedPhaseFractionsPlot;
 class RigSingleWellResultsData;
-class RimWellLogFileChannel;
+class RimEclipseResultCase;
+class RimFlowDiagSolution;
+class RimSimWellInView;
+class RimTofAccumulatedPhaseFractionsPlot;
+class RimTotalWellAllocationPlot;
 class RimWellLogFile;
+class RimWellLogFileChannel;
+class RimWellLogPlot;
+class RimWellLogTrack;
+class RiuWellRftPlot;
 
 
 

ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.h

@@ -33,20 +33,20 @@
 #include <set>
 #include <map>
 
-class RimEclipseResultCase;
-class RimEclipseCase;
-class RimEclipseWell;
-class RimFlowDiagSolution;
-class RimTotalWellAllocationPlot;
-class RimWellLogPlot;
-class RiuWellRftPlot;
-class RimWellLogTrack;
-class RimTofAccumulatedPhaseFractionsPlot;
 class RigSingleWellResultsData;
-class RimWellLogFileChannel;
-class RimWellPath;
-class RimWellLogCurve;
 class RigWellPath;
+class RimEclipseCase;
+class RimEclipseResultCase;
+class RimFlowDiagSolution;
+class RimSimWellInView;
+class RimTofAccumulatedPhaseFractionsPlot;
+class RimTotalWellAllocationPlot;
+class RimWellLogCurve;
+class RimWellLogFileChannel;
+class RimWellLogPlot;
+class RimWellLogTrack;
+class RimWellPath;
+class RiuWellRftPlot;
 
 namespace cvf {
     class Color3f;

ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp

@@ -32,7 +32,6 @@
 #include "RimEclipsePropertyFilterCollection.h"
 #include "RimEclipseStatisticsCase.h"
 #include "RimEclipseView.h"
-#include "RimEclipseWell.h"
 #include "RimEclipseWellCollection.h"
 #include "RimFault.h"
 #include "RimFlowCharacteristicsPlot.h"
@@ -50,6 +49,7 @@
 #include "RimIntersectionCollection.h"
 #include "RimObservedData.h"
 #include "RimScriptCollection.h"
+#include "RimSimWellInView.h"
 #include "RimSummaryCase.h"
 #include "RimSummaryCurve.h"
 #include "RimSummaryCurveCollection.h"
@@ -364,7 +364,7 @@ QStringList RimContextCommandBuilder::commandsFromSelection()
             commandIds << "RicAppendIntersectionFeature";
             commandIds << "RicAppendIntersectionBoxFeature";
         }
-        else if (dynamic_cast<RimEclipseWell*>(uiItem))
+        else if (dynamic_cast<RimSimWellInView*>(uiItem))
         {
             commandIds << "RicNewWellLogCurveExtractionFeature";
             commandIds << "RicNewWellLogRftCurveFeature";
@@ -526,7 +526,7 @@ QStringList RimContextCommandBuilder::commandsFromSelection()
         {
             commandIds << "RicExportFaultsFeature";
         }
-        else if (dynamic_cast<RimEclipseWell*>(uiItem))
+        else if (dynamic_cast<RimSimWellInView*>(uiItem))
         {
             commandIds << "RicPlotProductionRateFeature";
             commandIds << "RicShowContributingWellsFeature";

ApplicationCode/ProjectDataModel/RimEclipseCellColors.cpp

@@ -29,9 +29,9 @@
 #include "RimEclipseCase.h"
 #include "RimEclipseFaultColors.h"
 #include "RimEclipseView.h"
-#include "RimEclipseWell.h"
 #include "RimEclipseWellCollection.h"
 #include "RimLegendConfig.h"
+#include "RimSimWellInView.h"
 #include "RimTernaryLegendConfig.h"
 #include "RimViewController.h"
 #include "RimViewLinker.h"
@@ -316,7 +316,7 @@ void RimEclipseCellColors::updateLegendData(size_t currentTimeStep)
             int tracerIndex = 0;
             for (const auto& tracerName : tracerNames)
             {
-                RimEclipseWell* well = m_reservoirView->wellCollection()->findWell(RimFlowDiagSolution::removeCrossFlowEnding(tracerName));
+                RimSimWellInView* well = m_reservoirView->wellCollection()->findWell(RimFlowDiagSolution::removeCrossFlowEnding(tracerName));
                 cvf::Color3ub color(cvf::Color3::GRAY);
                 if (well) color = cvf::Color3ub(well->wellPipeColor());
 

ApplicationCode/ProjectDataModel/RimEclipseView.cpp

@@ -41,9 +41,9 @@
 #include "RimEclipseFaultColors.h"
 #include "RimEclipsePropertyFilterCollection.h"
 #include "RimEclipseResultDefinition.h"
-#include "RimEclipseWell.h"
 #include "RimEclipseWellCollection.h"
 #include "RimFaultCollection.h"
+#include "RimFlowCharacteristicsPlot.h"
 #include "RimFlowDiagSolution.h"
 #include "RimGridCollection.h"
 #include "RimIntersection.h"
@@ -52,12 +52,12 @@
 #include "RimOilField.h"
 #include "RimProject.h"
 #include "RimReservoirCellResultsStorage.h"
+#include "RimSimWellInView.h"
 #include "RimStimPlanColors.h"
 #include "RimTernaryLegendConfig.h"
 #include "RimViewController.h"
 #include "RimViewLinker.h"
 #include "RimWellPathCollection.h"
-#include "RimFlowCharacteristicsPlot.h"
 
 #include "RiuMainWindow.h"
 #include "RiuSelectionManager.h"
@@ -705,7 +705,7 @@ void RimEclipseView::updateCurrentTimeStep()
                 this->descendantsIncludingThisOfType(fractures);
                 for (RimFracture* f : fractures)
                 {
-                    RimEclipseWell* eclWell = nullptr;
+                    RimSimWellInView* eclWell = nullptr;
                     f->firstAncestorOrThisOfType(eclWell);
                     if (eclWell)
                     {
@@ -1195,12 +1195,12 @@ void RimEclipseView::syncronizeWellsWithResults()
     cvf::Collection<RigSingleWellResultsData> wellResults = m_eclipseCase->eclipseCaseData()->wellResults();
 
  
-    std::vector<caf::PdmPointer<RimEclipseWell> > newWells;
+    std::vector<caf::PdmPointer<RimSimWellInView> > newWells;
 
     // Clear the possible well results data present
     for (size_t wIdx = 0; wIdx < this->wellCollection()->wells().size(); ++wIdx)
     {
-        RimEclipseWell* well = this->wellCollection()->wells()[wIdx];
+        RimSimWellInView* well = this->wellCollection()->wells()[wIdx];
         well->setWellResults(NULL, -1);
     }
 
@@ -1210,11 +1210,11 @@ void RimEclipseView::syncronizeWellsWithResults()
 
     for (size_t wIdx = 0; wIdx < wellResults.size(); ++wIdx)
     {
-        RimEclipseWell* well = this->wellCollection()->findWell(wellResults[wIdx]->m_wellName);
+        RimSimWellInView* well = this->wellCollection()->findWell(wellResults[wIdx]->m_wellName);
 
         if (!well)
         {
-            well = new RimEclipseWell;
+            well = new RimSimWellInView;
             well->name = wellResults[wIdx]->m_wellName;
 
             isAnyWellCreated = true;
@@ -1228,7 +1228,7 @@ void RimEclipseView::syncronizeWellsWithResults()
 
     for (size_t wIdx = 0; wIdx < this->wellCollection()->wells().size(); ++wIdx)
     {
-        RimEclipseWell* well = this->wellCollection()->wells()[wIdx];
+        RimSimWellInView* well = this->wellCollection()->wells()[wIdx];
         RigSingleWellResultsData* wellRes = well->wellResults();
         if (wellRes == NULL)
         {
@@ -1289,7 +1289,7 @@ void RimEclipseView::calculateVisibleWellCellsIncFence(cvf::UByteArray* visibleC
     // Loop over the wells and find their contribution
     for (size_t wIdx = 0; wIdx < this->wellCollection()->wells().size(); ++wIdx)
     {
-        RimEclipseWell* well =  this->wellCollection()->wells()[wIdx];
+        RimSimWellInView* well =  this->wellCollection()->wells()[wIdx];
         if (well->isWellCellsVisible())
         {
             RigSingleWellResultsData* wres = well->wellResults();

ApplicationCode/ProjectDataModel/RimEclipseView.h

@@ -49,11 +49,11 @@ class RimEclipseCellColors;
 class RimEclipseFaultColors;
 class RimEclipsePropertyFilter;
 class RimEclipsePropertyFilterCollection;
-class RimEclipseWell;
 class RimEclipseWellCollection;
 class RimFaultCollection;
 class RimReservoirCellResultsStorage;
 class RimReservoirCellResultsStorage;
+class RimSimWellInView;
 #ifdef USE_PROTOTYPE_FEATURE_FRACTURES
 class RimStimPlanColors;
 #endif // USE_PROTOTYPE_FEATURE_FRACTURES

ApplicationCode/ProjectDataModel/RimEclipseWellCollection.cpp

@@ -29,8 +29,8 @@
 
 #include "RimEclipseCase.h"
 #include "RimEclipseView.h"
-#include "RimEclipseWell.h"
 #include "RimProject.h"
+#include "RimSimWellInView.h"
 #include "RimWellAllocationPlot.h"
 #ifdef USE_PROTOTYPE_FEATURE_FRACTURES
 #include "RimSimWellFracture.h"
@@ -231,7 +231,7 @@ RimEclipseWellCollection::~RimEclipseWellCollection()
 //--------------------------------------------------------------------------------------------------
 void RimEclipseWellCollection::setShowWellCellsState(bool enable)
 {
-    for (RimEclipseWell* w : wells)
+    for (RimSimWellInView* w : wells)
     {
         w->showWellCells = enable;
     }
@@ -263,7 +263,7 @@ bool RimEclipseWellCollection::showWellCells()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimEclipseWell* RimEclipseWellCollection::findWell(QString name)
+RimSimWellInView* RimEclipseWellCollection::findWell(QString name)
 {
     for (size_t i = 0; i < this->wells().size(); ++i)
     {
@@ -286,7 +286,7 @@ bool RimEclipseWellCollection::hasVisibleWellCells()
     bool hasCells = false;
     for (size_t i = 0 ; !hasCells && i < this->wells().size(); ++i)
     {
-        RimEclipseWell* well = this->wells()[i];
+        RimSimWellInView* well = this->wells()[i];
         if ( well && well->wellResults() && ((well->showWell() && well->showWellCells())) )
         {
             for (size_t tIdx = 0; !hasCells &&  tIdx < well->wellResults()->m_wellCellsTimeSteps.size(); ++tIdx )
@@ -330,7 +330,7 @@ void RimEclipseWellCollection::fieldChangedByUi(const caf::PdmFieldHandle* chang
 
     if (&m_showWellLabel == changedField)
     {
-        for (RimEclipseWell* w : wells)
+        for (RimSimWellInView* w : wells)
         {
             w->showWellLabel = !(m_showWellLabel().isFalse());
             w->updateConnectedEditors();
@@ -339,7 +339,7 @@ void RimEclipseWellCollection::fieldChangedByUi(const caf::PdmFieldHandle* chang
 
     if (&m_showWellHead == changedField)
     {
-        for (RimEclipseWell* w : wells)
+        for (RimSimWellInView* w : wells)
         {
             w->showWellHead = !(m_showWellHead().isFalse());
             w->updateConnectedEditors();
@@ -348,7 +348,7 @@ void RimEclipseWellCollection::fieldChangedByUi(const caf::PdmFieldHandle* chang
 
     if (&m_showWellPipe == changedField)
     {
-        for (RimEclipseWell* w : wells)
+        for (RimSimWellInView* w : wells)
         {
             w->showWellPipe = !(m_showWellPipe().isFalse());
             w->updateConnectedEditors();
@@ -357,7 +357,7 @@ void RimEclipseWellCollection::fieldChangedByUi(const caf::PdmFieldHandle* chang
 
     if (&m_showWellSpheres == changedField)
     {
-        for (RimEclipseWell* w : wells)
+        for (RimSimWellInView* w : wells)
         {
             w->showWellSpheres = !(m_showWellSpheres().isFalse());
             w->updateConnectedEditors();
@@ -366,7 +366,7 @@ void RimEclipseWellCollection::fieldChangedByUi(const caf::PdmFieldHandle* chang
 
     if (&m_showWellCells == changedField)
     {
-        for (RimEclipseWell* w : wells)
+        for (RimSimWellInView* w : wells)
         {
             w->showWellCells = !(m_showWellCells().isFalse());
             w->updateConnectedEditors();
@@ -375,7 +375,7 @@ void RimEclipseWellCollection::fieldChangedByUi(const caf::PdmFieldHandle* chang
 
     if (&m_showWellCellFence == changedField)
     {
-        for (RimEclipseWell* w : wells)
+        for (RimSimWellInView* w : wells)
         {
             w->showWellCellFence = !(m_showWellCellFence().isFalse());
             w->updateConnectedEditors();
@@ -464,7 +464,7 @@ void RimEclipseWellCollection::fieldChangedByUi(const caf::PdmFieldHandle* chang
 #ifdef USE_PROTOTYPE_FEATURE_FRACTURES
     if (&wellPipeCoordType == changedField)
     {
-        for (RimEclipseWell* w : wells)
+        for (RimSimWellInView* w : wells)
         {
             for (RimSimWellFracture* frac : w->simwellFractureCollection()->simwellFractures())
             {
@@ -487,7 +487,7 @@ void RimEclipseWellCollection::assignDefaultWellColors()
     
     for (size_t wIdx = 0; wIdx < wells.size(); ++wIdx)
     {
-        RimEclipseWell* well = wells[wIdx];
+        RimSimWellInView* well = wells[wIdx];
         if (well && well->wellResults() )
         {
             well->wellPipeColor = ownerCase->defaultWellColor(well->wellResults()->m_wellName);
@@ -583,7 +583,7 @@ void RimEclipseWellCollection::updateStateForVisibilityCheckboxes()
     size_t showWellCellsCount = 0;
     size_t showWellCellFenceCount = 0;
 
-    for (RimEclipseWell* w : wells)
+    for (RimSimWellInView* w : wells)
     {
         if (w->showWellLabel())     showLabelCount++;
         if (w->showWellHead())      showWellHeadCount++;
@@ -646,7 +646,7 @@ void RimEclipseWellCollection::initAfterRead()
     {
         showWellsIntersectingVisibleCells = false;
 
-        for (RimEclipseWell* w : wells)
+        for (RimSimWellInView* w : wells)
         {
             w->showWellPipe = false;
         }
@@ -655,7 +655,7 @@ void RimEclipseWellCollection::initAfterRead()
     {
         showWellsIntersectingVisibleCells = false;
 
-        for (RimEclipseWell* w : wells)
+        for (RimSimWellInView* w : wells)
         {
             w->showWellPipe = true;
         }
@@ -663,14 +663,14 @@ void RimEclipseWellCollection::initAfterRead()
 
     if (obsoleteField_wellCellsToRangeFilterMode() == RANGE_ADD_NONE)
     {
-        for (RimEclipseWell* w : wells)
+        for (RimSimWellInView* w : wells)
         {
             w->showWellCells = false;
         }
     }
     else if (obsoleteField_wellCellsToRangeFilterMode() == RANGE_ADD_ALL)
     {
-        for (RimEclipseWell* w : wells)
+        for (RimSimWellInView* w : wells)
         {
             w->showWellCells = true;
         }
@@ -678,7 +678,7 @@ void RimEclipseWellCollection::initAfterRead()
 
     if (!obsoleteField_showWellLabel())
     {
-        for (RimEclipseWell* w : wells)
+        for (RimSimWellInView* w : wells)
         {
             w->showWellLabel = false;
         }
@@ -686,7 +686,7 @@ void RimEclipseWellCollection::initAfterRead()
 
     if (!obsoleteField_showWellHead())
     {
-        for (RimEclipseWell* w : wells)
+        for (RimSimWellInView* w : wells)
         {
             w->showWellHead = false;
         }
@@ -694,7 +694,7 @@ void RimEclipseWellCollection::initAfterRead()
 
     if (obsoleteField_showWellCellFence())
     {
-        for (RimEclipseWell* w : wells)
+        for (RimSimWellInView* w : wells)
         {
             w->showWellCellFence = true;
         }
@@ -764,7 +764,7 @@ void RimEclipseWellCollection::calculateWellGeometryVisibility(size_t frameIndex
     if (m_framesOfResultWellPipeVisibilities[frameIndex].size() <= wells().size())
         m_framesOfResultWellPipeVisibilities[frameIndex].resize(wells().size(), false); 
     
-    for (const RimEclipseWell* well : wells())
+    for (const RimSimWellInView* well : wells())
     {
         bool wellPipeVisible = well->isWellPipeVisible(frameIndex);
         bool wellSphereVisible = well->isWellSpheresVisible(frameIndex);
@@ -773,7 +773,7 @@ void RimEclipseWellCollection::calculateWellGeometryVisibility(size_t frameIndex
     }
 }
 
-bool lessEclipseWell(const caf::PdmPointer<RimEclipseWell>& w1,  const caf::PdmPointer<RimEclipseWell>& w2)
+bool lessEclipseWell(const caf::PdmPointer<RimSimWellInView>& w1,  const caf::PdmPointer<RimSimWellInView>& w2)
 {
     if (w1.notNull() && w2.notNull())
         return (w1->name() < w2->name());

ApplicationCode/ProjectDataModel/RimEclipseWellCollection.h

@@ -29,7 +29,7 @@
 #include "cafTristate.h"
 
 class RimEclipseView;
-class RimEclipseWell;
+class RimSimWellInView;
 
 //==================================================================================================
 ///  
@@ -110,9 +110,9 @@ public:
 
     caf::PdmField<bool>                 isAutoDetectingBranches;
 	
-	caf::PdmChildArrayField<RimEclipseWell*>     wells;
+	caf::PdmChildArrayField<RimSimWellInView*>     wells;
 
-    RimEclipseWell*                     findWell(QString name);
+    RimSimWellInView*                     findWell(QString name);
     bool                                hasVisibleWellCells();
     bool                                hasVisibleWellPipes();
     void                                sortWellsByName();

ApplicationCode/ProjectDataModel/RimIntersection.cpp

@@ -26,10 +26,10 @@
 
 #include "RimCase.h"
 #include "RimEclipseView.h"
-#include "RimEclipseWell.h"
 #include "RimEclipseWellCollection.h"
 #include "RimOilField.h"
 #include "RimProject.h"
+#include "RimSimWellInView.h"
 #include "RimTools.h"
 #include "RimView.h"
 #include "RimWellPath.h"
@@ -252,10 +252,10 @@ QList<caf::PdmOptionItemInfo> RimIntersection::calculateValueOptions(const caf::
         RimEclipseWellCollection* coll = simulationWellCollection();
         if (coll)
         {
-            caf::PdmChildArrayField<RimEclipseWell*>& eclWells = coll->wells;
+            caf::PdmChildArrayField<RimSimWellInView*>& eclWells = coll->wells;
 
             QIcon simWellIcon(":/Well.png");
-            for (RimEclipseWell* eclWell : eclWells)
+            for (RimSimWellInView* eclWell : eclWells)
             {
                 options.push_back(caf::PdmOptionItemInfo(eclWell->name(), eclWell, false, simWellIcon));
             }

ApplicationCode/ProjectDataModel/RimIntersection.h

@@ -29,7 +29,7 @@
 #include "cvfObject.h"
 #include "cvfVector3.h"
 
-class RimEclipseWell;
+class RimSimWellInView;
 class RimEclipseWellCollection;
 class RimWellPath;
 class RivIntersectionPartMgr;
@@ -70,7 +70,7 @@ public:
     caf::PdmField< bool >                                showInactiveCells;
 
     caf::PdmPtrField<RimWellPath*>                       wellPath;
-    caf::PdmPtrField<RimEclipseWell*>                    simulationWell;
+    caf::PdmPtrField<RimSimWellInView*>                  simulationWell;
 
     caf::PdmField< bool >                                inputPolyLineFromViewerEnabled;
     caf::PdmField< bool >                                inputExtrusionPointsFromViewerEnabled;

ApplicationCode/ProjectDataModel/RimIntersectionCollection.cpp

@@ -19,9 +19,9 @@
 
 #include "RimIntersectionCollection.h"
 
-#include "RimEclipseWell.h"
 #include "RimIntersection.h"
 #include "RimIntersectionBox.h"
+#include "RimSimWellInView.h"
 #include "RimView.h"
 
 #include "RiuMainWindow.h"
@@ -191,7 +191,7 @@ void RimIntersectionCollection::fieldChangedByUi(const caf::PdmFieldHandle* chan
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-bool RimIntersectionCollection::hasActiveIntersectionForSimulationWell(const RimEclipseWell* eclipseWell) const
+bool RimIntersectionCollection::hasActiveIntersectionForSimulationWell(const RimSimWellInView* eclipseWell) const
 {
     if (!isActive) return false;
 

ApplicationCode/ProjectDataModel/RimIntersectionCollection.h

@@ -26,7 +26,7 @@
 class RimIntersection;
 class RimIntersectionBox;
 class RimEclipseCellColors;
-class RimEclipseWell;
+class RimSimWellInView;
 
 namespace cvf {
     class ModelBasicList;
@@ -51,7 +51,7 @@ public:
     void appendIntersection(RimIntersection* intersection);
     void appendIntersectionBox(RimIntersectionBox* intersectionBox);
 
-    bool hasActiveIntersectionForSimulationWell(const RimEclipseWell* eclipseWell) const;
+    bool hasActiveIntersectionForSimulationWell(const RimSimWellInView* eclipseWell) const;
 
     void updateIntersectionBoxGeometry();
 

ApplicationCode/ProjectDataModel/RimSimWellInView.cpp

@@ -18,7 +18,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////
 
-#include "RimEclipseWell.h"
+#include "RimSimWellInView.h"
 
 #include "RigSimulationWellCenterLineCalculator.h"
 #include "RigSingleWellResultsData.h"
@@ -46,12 +46,12 @@
 #include "RigMainGrid.h"
 #include "RigActiveCellInfo.h"
 
-CAF_PDM_SOURCE_INIT(RimEclipseWell, "Well");
+CAF_PDM_SOURCE_INIT(RimSimWellInView, "Well");
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimEclipseWell::RimEclipseWell()
+RimSimWellInView::RimSimWellInView()
 {
     CAF_PDM_InitObject("Well", ":/Well.png", "", "");
 
@@ -88,7 +88,7 @@ RimEclipseWell::RimEclipseWell()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimEclipseWell::~RimEclipseWell()
+RimSimWellInView::~RimSimWellInView()
 {
 #ifdef USE_PROTOTYPE_FEATURE_FRACTURES
     if (simwellFractureCollection()) delete simwellFractureCollection();
@@ -98,7 +98,7 @@ RimEclipseWell::~RimEclipseWell()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-caf::PdmFieldHandle* RimEclipseWell::userDescriptionField()
+caf::PdmFieldHandle* RimSimWellInView::userDescriptionField()
 {
     return &name;
 }
@@ -106,7 +106,7 @@ caf::PdmFieldHandle* RimEclipseWell::userDescriptionField()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimEclipseWell::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
+void RimSimWellInView::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
 {
     RimEclipseView* reservoirView = nullptr;
     this->firstAncestorOrThisOfType(reservoirView);
@@ -157,7 +157,7 @@ void RimEclipseWell::fieldChangedByUi(const caf::PdmFieldHandle* changedField, c
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-caf::PdmFieldHandle* RimEclipseWell::objectToggleField()
+caf::PdmFieldHandle* RimSimWellInView::objectToggleField()
 {
     return &showWell;
 }
@@ -165,7 +165,7 @@ caf::PdmFieldHandle* RimEclipseWell::objectToggleField()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimEclipseWell::calculateWellPipeStaticCenterLine(std::vector< std::vector <cvf::Vec3d> >& pipeBranchesCLCoords, 
+void RimSimWellInView::calculateWellPipeStaticCenterLine(std::vector< std::vector <cvf::Vec3d> >& pipeBranchesCLCoords, 
                                                        std::vector< std::vector <RigWellResultPoint> >& pipeBranchesCellIds)
 {
     RigSimulationWellCenterLineCalculator::calculateWellPipeStaticCenterline(this, pipeBranchesCLCoords, pipeBranchesCellIds);
@@ -174,7 +174,7 @@ void RimEclipseWell::calculateWellPipeStaticCenterLine(std::vector< std::vector
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimEclipseWell::calculateWellPipeDynamicCenterLine(size_t timeStepIdx, 
+void RimSimWellInView::calculateWellPipeDynamicCenterLine(size_t timeStepIdx, 
                                                  std::vector< std::vector <cvf::Vec3d> >& pipeBranchesCLCoords, 
                                                  std::vector< std::vector <RigWellResultPoint> >& pipeBranchesCellIds) const
 {
@@ -184,7 +184,7 @@ void RimEclipseWell::calculateWellPipeDynamicCenterLine(size_t timeStepIdx,
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimEclipseWell::wellHeadTopBottomPosition(size_t frameIndex, cvf::Vec3d* top, cvf::Vec3d* bottom)
+void RimSimWellInView::wellHeadTopBottomPosition(size_t frameIndex, cvf::Vec3d* top, cvf::Vec3d* bottom)
 {
 
     RimEclipseView* m_rimReservoirView;
@@ -242,7 +242,7 @@ void RimEclipseWell::wellHeadTopBottomPosition(size_t frameIndex, cvf::Vec3d* to
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-double RimEclipseWell::pipeRadius()
+double RimSimWellInView::pipeRadius()
 {
     RimEclipseView* reservoirView;
     firstAncestorOrThisOfTypeAsserted(reservoirView);
@@ -259,7 +259,7 @@ double RimEclipseWell::pipeRadius()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-bool RimEclipseWell::intersectsDynamicWellCellsFilteredCells(size_t frameIndex) const
+bool RimSimWellInView::intersectsDynamicWellCellsFilteredCells(size_t frameIndex) const
 {
     if (this->wellResults() == nullptr) return false;
 
@@ -273,7 +273,7 @@ bool RimEclipseWell::intersectsDynamicWellCellsFilteredCells(size_t frameIndex)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-bool RimEclipseWell::intersectsWellCellsFilteredCells(const RigWellResultFrame &wrsf, size_t frameIndex) const
+bool RimSimWellInView::intersectsWellCellsFilteredCells(const RigWellResultFrame &wrsf, size_t frameIndex) const
 {
     RimEclipseView* reservoirView = nullptr;
     this->firstAncestorOrThisOfType(reservoirView);
@@ -339,7 +339,7 @@ bool RimEclipseWell::intersectsWellCellsFilteredCells(const RigWellResultFrame &
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-bool RimEclipseWell::intersectsStaticWellCellsFilteredCells() const
+bool RimSimWellInView::intersectsStaticWellCellsFilteredCells() const
 {
     if (this->wellResults() == nullptr) return false;
 
@@ -355,7 +355,7 @@ bool RimEclipseWell::intersectsStaticWellCellsFilteredCells() const
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimEclipseWell::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
+void RimSimWellInView::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
 {
     caf::PdmUiGroup* appearanceGroup = uiOrdering.addNewGroup("Visibility");
     appearanceGroup->add(&showWellLabel);
@@ -381,7 +381,7 @@ void RimEclipseWell::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimEclipseWell::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/)
+void RimSimWellInView::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName /*= ""*/)
 {
 #ifdef USE_PROTOTYPE_FEATURE_FRACTURES
     for (RimSimWellFracture* fracture : simwellFractureCollection()->simwellFractures())
@@ -422,7 +422,7 @@ void RimEclipseWell::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-bool RimEclipseWell::isWellCellsVisible() const
+bool RimSimWellInView::isWellCellsVisible() const
 {
     const RimEclipseView* reservoirView = nullptr;
     this->firstAncestorOrThisOfType(reservoirView);
@@ -456,7 +456,7 @@ bool RimEclipseWell::isWellCellsVisible() const
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-bool RimEclipseWell::isWellPipeVisible(size_t frameIndex) const
+bool RimSimWellInView::isWellPipeVisible(size_t frameIndex) const
 {
     const RimEclipseView* reservoirView = nullptr;
     this->firstAncestorOrThisOfType(reservoirView);
@@ -502,7 +502,7 @@ bool RimEclipseWell::isWellPipeVisible(size_t frameIndex) const
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-bool RimEclipseWell::isWellSpheresVisible(size_t frameIndex) const
+bool RimSimWellInView::isWellSpheresVisible(size_t frameIndex) const
 {
     const RimEclipseView* reservoirView = nullptr;
     this->firstAncestorOrThisOfType(reservoirView);
@@ -551,7 +551,7 @@ bool RimEclipseWell::isWellSpheresVisible(size_t frameIndex) const
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-bool RimEclipseWell::isUsingCellCenterForPipe() const
+bool RimSimWellInView::isUsingCellCenterForPipe() const
 {
     const RimEclipseWellCollection* wellColl = nullptr;
     this->firstAncestorOrThisOfType(wellColl);
@@ -562,7 +562,7 @@ bool RimEclipseWell::isUsingCellCenterForPipe() const
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimEclipseWell::setWellResults(RigSingleWellResultsData* wellResults, size_t resultWellIndex)
+void RimSimWellInView::setWellResults(RigSingleWellResultsData* wellResults, size_t resultWellIndex)
 {
     m_wellResults = wellResults;
     m_resultWellIndex = resultWellIndex;
@@ -571,7 +571,7 @@ void RimEclipseWell::setWellResults(RigSingleWellResultsData* wellResults, size_
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RigSingleWellResultsData* RimEclipseWell::wellResults()
+RigSingleWellResultsData* RimSimWellInView::wellResults()
 {
     return m_wellResults.p();
 }
@@ -579,7 +579,7 @@ RigSingleWellResultsData* RimEclipseWell::wellResults()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-const RigSingleWellResultsData* RimEclipseWell::wellResults() const
+const RigSingleWellResultsData* RimSimWellInView::wellResults() const
 {
     return m_wellResults.p();
 }
@@ -587,7 +587,7 @@ const RigSingleWellResultsData* RimEclipseWell::wellResults() const
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-size_t RimEclipseWell::resultWellIndex() const
+size_t RimSimWellInView::resultWellIndex() const
 {
     return m_resultWellIndex;
 }

ApplicationCode/ProjectDataModel/RimSimWellInView.h

@@ -45,13 +45,13 @@ class RimSimWellFractureCollection;
 ///  
 ///  
 //==================================================================================================
-class RimEclipseWell : public caf::PdmObject
+class RimSimWellInView : public caf::PdmObject
 {
     CAF_PDM_HEADER_INIT;
 public:
 
-    RimEclipseWell();
-    virtual ~RimEclipseWell();
+    RimSimWellInView();
+    virtual ~RimSimWellInView();
     
     void                                setWellResults(RigSingleWellResultsData* wellResults, size_t resultWellIndex);
     RigSingleWellResultsData*           wellResults();

ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp

@@ -44,6 +44,7 @@
 #include "RimMainPlotCollection.h"
 #include "RimOilField.h"
 #include "RimProject.h"
+#include "RimSimWellInView.h"
 #include "RimTools.h"
 #include "RimWellLogCurve.h"
 #include "RimWellLogPlot.h"
@@ -59,7 +60,6 @@
 #include "cafUtils.h"
 
 #include <cmath>
-#include "RimEclipseWell.h"
 
 //==================================================================================================
 ///