#1996: Rename RimEclipseWellCollection -> RimSimWellInViewCollection

2025-02-25 18:55:39 -06:00 · 2017-10-13 14:20:47 +02:00 · 2017-10-13 14:20:47 +02:00 · 7da8e3091b
commit 7da8e3091b
parent 44be1bfd6b
41 changed files with 123 additions and 123 deletions
--- a/ApplicationCode/CommandFileInterface/RicfExportSimWellCompletions.cpp
+++ b/ApplicationCode/CommandFileInterface/RicfExportSimWellCompletions.cpp
@ -26,7 +26,7 @@
 #include "RimEclipseCase.h"
 #include "RimEclipseCaseCollection.h"
 #include "RimEclipseView.h"
-#include "RimEclipseWellCollection.h"
+#include "RimSimWellInViewCollection.h"
 #include "RimOilField.h"
 #include "RimProject.h"
 #include "RimSimWellInView.h"
--- a/ApplicationCode/Commands/CompletionCommands/RicWellPathExportCompletionDataFeature.cpp
+++ b/ApplicationCode/Commands/CompletionCommands/RicWellPathExportCompletionDataFeature.cpp
@ -38,7 +38,7 @@
 #include "RigWellPath.h"
 #include "RigWellPathIntersectionTools.h"

-#include "RimEclipseWellCollection.h"
+#include "RimSimWellInViewCollection.h"
 #include "RimFishboneWellPath.h"
 #include "RimFishboneWellPathCollection.h"
 #include "RimFishbonesCollection.h"
@ -204,7 +204,7 @@ std::vector<RimSimWellInView*> RicWellPathExportCompletionDataFeature::selectedS
    std::vector<RimSimWellInView*> simWells;
    caf::SelectionManager::instance()->objectsByType(&simWells);

-    std::vector<RimEclipseWellCollection*> simWellCollections;
+    std::vector<RimSimWellInViewCollection*> simWellCollections;
    caf::SelectionManager::instance()->objectsByType(&simWellCollections);

    for (auto simWellCollection : simWellCollections)
--- a/ApplicationCode/Commands/EclipseCommands/EclipseWell/RicEclipseWellFeatureImpl.cpp
+++ b/ApplicationCode/Commands/EclipseCommands/EclipseWell/RicEclipseWellFeatureImpl.cpp
@ -18,7 +18,7 @@

 #include "RicEclipseWellFeatureImpl.h"

-#include "RimEclipseWellCollection.h"
+#include "RimSimWellInViewCollection.h"
 #include "RimSimWellInView.h"

 #include "cafSelectionManager.h"
@ -53,14 +53,14 @@ std::vector<RimSimWellInView*> RicEclipseWellFeatureImpl::selectedWells()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimEclipseWellCollection* RicEclipseWellFeatureImpl::wellCollectionFromSelection()
+RimSimWellInViewCollection* RicEclipseWellFeatureImpl::wellCollectionFromSelection()
 {
    std::vector<RimSimWellInView*> selection = selectedWells();
    if (selection.size() > 0)
    {
        RimSimWellInView* firstWell = selection[0];

-        RimEclipseWellCollection* wellCollection = nullptr;
+        RimSimWellInViewCollection* wellCollection = nullptr;
        firstWell->firstAncestorOrThisOfType(wellCollection);

        return wellCollection;
--- a/ApplicationCode/Commands/EclipseCommands/EclipseWell/RicEclipseWellFeatureImpl.h
+++ b/ApplicationCode/Commands/EclipseCommands/EclipseWell/RicEclipseWellFeatureImpl.h
@ -20,7 +20,7 @@

 #include <vector>

-class RimEclipseWellCollection;
+class RimSimWellInViewCollection;
 class RimSimWellInView;

 //==================================================================================================
@ -31,5 +31,5 @@ class RicEclipseWellFeatureImpl
 public:
    static bool                           isAnyWellSelected();
    static std::vector<RimSimWellInView*> selectedWells();
-    static RimEclipseWellCollection*      wellCollectionFromSelection();
+    static RimSimWellInViewCollection*      wellCollectionFromSelection();
 };
--- a/ApplicationCode/Commands/EclipseCommands/EclipseWell/RicEclipseWellShowFeatures.cpp
+++ b/ApplicationCode/Commands/EclipseCommands/EclipseWell/RicEclipseWellShowFeatures.cpp
@ -20,7 +20,7 @@

 #include "RicEclipseWellFeatureImpl.h"

-#include "RimEclipseWellCollection.h"
+#include "RimSimWellInViewCollection.h"
 #include "RimSimWellInView.h"

 #include <QAction>
--- a/ApplicationCode/Commands/FlowCommands/RicShowContributingWellsFeatureImpl.cpp
+++ b/ApplicationCode/Commands/FlowCommands/RicShowContributingWellsFeatureImpl.cpp
@ -30,7 +30,7 @@
 #include "RimEclipsePropertyFilterCollection.h"
 #include "RimEclipseResultCase.h"
 #include "RimEclipseView.h"
-#include "RimEclipseWellCollection.h"
+#include "RimSimWellInViewCollection.h"
 #include "RimFaultCollection.h"
 #include "RimFlowDiagSolution.h"
 #include "RimProject.h"
--- a/ApplicationCode/Commands/OperationsUsingObjReferences/RicPasteEclipseViewsFeature.cpp
+++ b/ApplicationCode/Commands/OperationsUsingObjReferences/RicPasteEclipseViewsFeature.cpp
@ -27,7 +27,7 @@

 #include "RimEclipseCase.h"
 #include "RimEclipseView.h"
-#include "RimEclipseWellCollection.h"
+#include "RimSimWellInViewCollection.h"

 #include "cafPdmDocument.h"
 #include "cafPdmObjectGroup.h"
--- a/ApplicationCode/ModelVisualization/RivCellEdgeGeometryUtils.cpp
+++ b/ApplicationCode/ModelVisualization/RivCellEdgeGeometryUtils.cpp
@ -31,7 +31,7 @@
 #include "RimEclipseCase.h"
 #include "RimEclipseCellColors.h"
 #include "RimEclipseView.h"
-#include "RimEclipseWellCollection.h"
+#include "RimSimWellInViewCollection.h"
 #include "RimLegendConfig.h"
 #include "RimTernaryLegendConfig.h"

--- a/ApplicationCode/ModelVisualization/RivGridPartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/RivGridPartMgr.cpp
@ -31,7 +31,7 @@
 #include "RimEclipseCase.h"
 #include "RimEclipseCellColors.h"
 #include "RimEclipseView.h"
-#include "RimEclipseWellCollection.h"
+#include "RimSimWellInViewCollection.h"
 #include "RimLegendConfig.h"
 #include "RimReservoirCellResultsStorage.h"
 #include "RimTernaryLegendConfig.h"
--- a/ApplicationCode/ModelVisualization/RivReservoirSimWellsPartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/RivReservoirSimWellsPartMgr.cpp
@ -26,7 +26,7 @@
 #include "RimEclipseCellColors.h"
 #include "RimEclipsePropertyFilterCollection.h"
 #include "RimEclipseView.h"
-#include "RimEclipseWellCollection.h"
+#include "RimSimWellInViewCollection.h"
 #include "RimSimWellInView.h"

 #include "RivWellHeadPartMgr.h"
--- a/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/RivReservoirViewPartMgr.cpp
@ -37,9 +37,9 @@
 #include "RimEclipsePropertyFilterCollection.h"
 #include "RimEclipseResultDefinition.h"
 #include "RimEclipseView.h"
-#include "RimEclipseWellCollection.h"
 #include "RimFaultCollection.h"
 #include "RimReservoirCellResultsStorage.h"
+#include "RimSimWellInViewCollection.h"
 #include "RimViewController.h"
 #include "RimViewLinker.h"

--- a/ApplicationCode/ModelVisualization/RivSimWellPipeSourceInfo.cpp
+++ b/ApplicationCode/ModelVisualization/RivSimWellPipeSourceInfo.cpp
@ -20,7 +20,7 @@
 #include "RivSimWellPipeSourceInfo.h"

 #include "RimEclipseView.h"
-#include "RimEclipseWellCollection.h"
+#include "RimSimWellInViewCollection.h"
 #include "RimSimWellInView.h"


--- a/ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.cpp
@ -32,9 +32,9 @@
 #include "RimEclipseCellColors.h"
 #include "RimEclipsePropertyFilterCollection.h"
 #include "RimEclipseView.h"
-#include "RimEclipseWellCollection.h"
 #include "RimReservoirCellResultsStorage.h"
 #include "RimSimWellInView.h"
+#include "RimSimWellInViewCollection.h"

 #include "RivPipeGeometryGenerator.h"
 #include "RivWellPathSourceInfo.h"
@ -253,7 +253,7 @@ void RivSimWellPipesPartMgr::updatePipeResultColor(size_t frameIndex)
        wellCellStates.clear();
        wellCellStates.resize(brIt->m_cellIds.size(), closed);

-        RimEclipseWellCollection* wellColl = nullptr;
+        RimSimWellInViewCollection* wellColl = nullptr;
        if (m_rimWell)
        {
            m_rimWell->firstAncestorOrThisOfType(wellColl);
--- a/ApplicationCode/ModelVisualization/RivTernaryTextureCoordsCreator.cpp
+++ b/ApplicationCode/ModelVisualization/RivTernaryTextureCoordsCreator.cpp
@ -26,10 +26,10 @@
 #include "RigTernaryResultAccessor2d.h"

 #include "RimEclipseCase.h"
-#include "RimEclipseView.h"
 #include "RimEclipseCellColors.h"
+#include "RimEclipseView.h"
+#include "RimSimWellInViewCollection.h"
 #include "RimTernaryLegendConfig.h"
-#include "RimEclipseWellCollection.h"

 #include "RivTernaryResultToTextureMapper.h"
 #include "RivTernaryScalarMapper.h"
--- a/ApplicationCode/ModelVisualization/RivTextureCoordsCreator.cpp
+++ b/ApplicationCode/ModelVisualization/RivTextureCoordsCreator.cpp
@ -27,8 +27,8 @@
 #include "RimEclipseCase.h"
 #include "RimEclipseCellColors.h"
 #include "RimEclipseView.h"
-#include "RimEclipseWellCollection.h"
 #include "RimLegendConfig.h"
+#include "RimSimWellInViewCollection.h"

 #include "RivResultToTextureMapper.h"
 #include "RivDefaultResultToTextureMapper.h"
--- a/ApplicationCode/ModelVisualization/RivWellConnectionsPartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/RivWellConnectionsPartMgr.cpp
@ -20,7 +20,7 @@

 #include "RimEclipseResultCase.h"
 #include "RimEclipseView.h"
-#include "RimEclipseWellCollection.h"
+#include "RimSimWellInViewCollection.h"
 #include "RimSimWellInView.h"

 #include "RigSimWellData.h"
@ -121,7 +121,7 @@ void RivWellConnectionsPartMgr::appendDynamicGeometryPartsToModel(cvf::ModelBasi
    }

    bool enableLighting                = !m_rimReservoirView->isLightingDisabled();
-    RimEclipseWellCollection* wellColl = m_rimReservoirView->wellCollection();
+    RimSimWellInViewCollection* wellColl = m_rimReservoirView->wellCollection();

    // Create potentially two the arrows to/from m_rimWell for each of the other wells in the model.
    // One arrow for the "official" state of the well, and one to account for cross flow contributions 
--- a/ApplicationCode/ModelVisualization/RivWellHeadPartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/RivWellHeadPartMgr.cpp
@ -32,7 +32,7 @@

 #include "RimEclipseCase.h"
 #include "RimEclipseView.h"
-#include "RimEclipseWellCollection.h"
+#include "RimSimWellInViewCollection.h"
 #include "RimSimWellInView.h"

 #include "RivPipeGeometryGenerator.h"
@ -235,7 +235,7 @@ void RivWellHeadPartMgr::buildWellHeadParts(size_t frameIndex)

        cvf::Color4f headColor(cvf::Color3::GRAY);

-        RimEclipseWellCollection* wellColl = nullptr;
+        RimSimWellInViewCollection* wellColl = nullptr;
        if (m_rimWell)
        {
            m_rimWell->firstAncestorOrThisOfType(wellColl);
@ -331,7 +331,7 @@ void RivWellHeadPartMgr::appendDynamicGeometryPartsToModel(cvf::ModelBasicList*
    if (m_rimReservoirView.isNull()) return;
    if (m_rimWell.isNull()) return;

-    RimEclipseWellCollection* wellCollection = nullptr;
+    RimSimWellInViewCollection* wellCollection = nullptr;
    m_rimWell->firstAncestorOrThisOfType(wellCollection);
    if (!wellCollection) return;

--- a/ApplicationCode/ModelVisualization/RivWellSpheresPartMgr.cpp
+++ b/ApplicationCode/ModelVisualization/RivWellSpheresPartMgr.cpp
@ -25,7 +25,7 @@

 #include "RimEclipseCase.h"
 #include "RimEclipseView.h"
-#include "RimEclipseWellCollection.h"
+#include "RimSimWellInViewCollection.h"
 #include "RimSimWellInView.h"

 #include "RiuViewer.h"
@ -195,7 +195,7 @@ cvf::Color3f RivWellSpheresPartMgr::wellCellColor(const RigWellResultFrame& well

    cvf::Color3f cellColor(cvf::Color3f::GRAY);

-    RimEclipseWellCollection* wellColl = nullptr;
+    RimSimWellInViewCollection* wellColl = nullptr;
    if (m_rimWell)
    {
        m_rimWell->firstAncestorOrThisOfType(wellColl);
--- a/ApplicationCode/ProjectDataModel/Completions/RimCompletionCellIntersectionCalc.cpp
+++ b/ApplicationCode/ProjectDataModel/Completions/RimCompletionCellIntersectionCalc.cpp
@ -21,7 +21,7 @@
 #include "RiaDefines.h"
 #include "RimEclipseCase.h"
 #include "RimEclipseView.h"
-#include "RimEclipseWellCollection.h"
+#include "RimSimWellInViewCollection.h"
 #include "RimFishbonesCollection.h"
 #include "RimFishbonesMultipleSubs.h"
 #include "RimOilField.h"
--- a/ApplicationCode/ProjectDataModel/Flow/RimFlowDiagSolution.cpp
+++ b/ApplicationCode/ProjectDataModel/Flow/RimFlowDiagSolution.cpp
@ -30,7 +30,7 @@

 #include "RimEclipseResultCase.h"
 #include "RimEclipseView.h"
-#include "RimEclipseWellCollection.h"
+#include "RimSimWellInViewCollection.h"

 CAF_PDM_SOURCE_INIT(RimFlowDiagSolution, "FlowDiagSolution");

--- a/ApplicationCode/ProjectDataModel/Flow/RimTofAccumulatedPhaseFractionsPlot.cpp
+++ b/ApplicationCode/ProjectDataModel/Flow/RimTofAccumulatedPhaseFractionsPlot.cpp
@ -21,7 +21,7 @@
 #include "RiaApplication.h"

 #include "RimEclipseView.h"
-#include "RimEclipseWellCollection.h"
+#include "RimSimWellInViewCollection.h"
 #include "RimWellAllocationPlot.h"

 #include "RigSimWellData.h"
--- a/ApplicationCode/ProjectDataModel/Flow/RimTotalWellAllocationPlot.cpp
+++ b/ApplicationCode/ProjectDataModel/Flow/RimTotalWellAllocationPlot.cpp
@ -21,7 +21,7 @@
 #include "RiaApplication.h"

 #include "RimEclipseView.h"
-#include "RimEclipseWellCollection.h"
+#include "RimSimWellInViewCollection.h"

 #include "RigSimWellData.h"

--- a/ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp
+++ b/ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp
@ -32,7 +32,7 @@
 #include "RimEclipseCellColors.h"
 #include "RimEclipseResultCase.h"
 #include "RimEclipseView.h"
-#include "RimEclipseWellCollection.h"
+#include "RimSimWellInViewCollection.h"
 #include "RimFlowDiagSolution.h"
 #include "RimProject.h"
 #include "RimSimWellInView.h"
--- a/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp
+++ b/ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp
@ -37,7 +37,7 @@
 #include "RimEclipseFaultColors.h"
 #include "RimEclipsePropertyFilterCollection.h"
 #include "RimEclipseView.h"
-#include "RimEclipseWellCollection.h"
+#include "RimSimWellInViewCollection.h"
 #include "RimFaultCollection.h"
 #include "RimGeoMechCase.h"
 #include "RimGeoMechResultDefinition.h"
--- a/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
+++ b/ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
@ -32,7 +32,6 @@
 #include "RimEclipsePropertyFilterCollection.h"
 #include "RimEclipseStatisticsCase.h"
 #include "RimEclipseView.h"
-#include "RimEclipseWellCollection.h"
 #include "RimFault.h"
 #include "RimFlowCharacteristicsPlot.h"
 #include "RimFlowDiagSolution.h"
@ -50,6 +49,7 @@
 #include "RimObservedData.h"
 #include "RimScriptCollection.h"
 #include "RimSimWellInView.h"
+#include "RimSimWellInViewCollection.h"
 #include "RimSummaryCase.h"
 #include "RimSummaryCurve.h"
 #include "RimSummaryCurveCollection.h"
--- a/ApplicationCode/ProjectDataModel/RimEclipseCellColors.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipseCellColors.cpp
@ -29,9 +29,9 @@
 #include "RimEclipseCase.h"
 #include "RimEclipseFaultColors.h"
 #include "RimEclipseView.h"
-#include "RimEclipseWellCollection.h"
 #include "RimLegendConfig.h"
 #include "RimSimWellInView.h"
+#include "RimSimWellInViewCollection.h"
 #include "RimTernaryLegendConfig.h"
 #include "RimViewController.h"
 #include "RimViewLinker.h"
--- a/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipseStatisticsCase.cpp
@ -30,9 +30,9 @@
 #include "RimEclipseCellColors.h"
 #include "RimEclipseStatisticsCaseEvaluator.h"
 #include "RimEclipseView.h"
-#include "RimEclipseWellCollection.h"
 #include "RimIdenticalGridCaseGroup.h"
 #include "RimReservoirCellResultsStorage.h"
+#include "RimSimWellInViewCollection.h"

 #include "RiuMainWindow.h"

--- a/ApplicationCode/ProjectDataModel/RimEclipseView.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipseView.cpp
@ -41,7 +41,6 @@
 #include "RimEclipseFaultColors.h"
 #include "RimEclipsePropertyFilterCollection.h"
 #include "RimEclipseResultDefinition.h"
-#include "RimEclipseWellCollection.h"
 #include "RimFaultCollection.h"
 #include "RimFlowCharacteristicsPlot.h"
 #include "RimFlowDiagSolution.h"
@ -53,6 +52,7 @@
 #include "RimProject.h"
 #include "RimReservoirCellResultsStorage.h"
 #include "RimSimWellInView.h"
+#include "RimSimWellInViewCollection.h"
 #include "RimStimPlanColors.h"
 #include "RimTernaryLegendConfig.h"
 #include "RimViewController.h"
@ -126,7 +126,7 @@ RimEclipseView::RimEclipseView()
 #endif // USE_PROTOTYPE_FEATURE_FRACTURES

    CAF_PDM_InitFieldNoDefault(&wellCollection, "WellCollection", "Simulation Wells", "", "", "");
-    wellCollection = new RimEclipseWellCollection;
+    wellCollection = new RimSimWellInViewCollection;
    wellCollection.uiCapability()->setUiHidden(true);

    CAF_PDM_InitFieldNoDefault(&faultCollection, "FaultCollection", "Faults", "", "", "");
@ -1340,17 +1340,17 @@ void RimEclipseView::calculateVisibleWellCellsIncFence(cvf::UByteArray* visibleC
                                size_t cellCountFenceDirection = 0;
                                size_t fIdx = 0;

-                                if (this->wellCollection()->wellCellFenceType == RimEclipseWellCollection::K_DIRECTION)
+                                if (this->wellCollection()->wellCellFenceType == RimSimWellInViewCollection::K_DIRECTION)
                                {
                                    cellCountFenceDirection = grid->cellCountK();
                                    pK = &fIdx;
                                }
-                                else if (this->wellCollection()->wellCellFenceType == RimEclipseWellCollection::J_DIRECTION)
+                                else if (this->wellCollection()->wellCellFenceType == RimSimWellInViewCollection::J_DIRECTION)
                                {
                                    cellCountFenceDirection = grid->cellCountJ();
                                    pJ = &fIdx;
                                }
-                                else if (this->wellCollection()->wellCellFenceType == RimEclipseWellCollection::I_DIRECTION)
+                                else if (this->wellCollection()->wellCellFenceType == RimSimWellInViewCollection::I_DIRECTION)
                                {
                                    cellCountFenceDirection = grid->cellCountI();
                                    pI = &fIdx;
--- a/ApplicationCode/ProjectDataModel/RimEclipseView.h
+++ b/ApplicationCode/ProjectDataModel/RimEclipseView.h
@ -49,10 +49,10 @@ class RimEclipseCellColors;
 class RimEclipseFaultColors;
 class RimEclipsePropertyFilter;
 class RimEclipsePropertyFilterCollection;
-class RimEclipseWellCollection;
 class RimFaultCollection;
 class RimReservoirCellResultsStorage;
 class RimReservoirCellResultsStorage;
+class RimSimWellInViewCollection;
 #ifdef USE_PROTOTYPE_FEATURE_FRACTURES
 class RimStimPlanColors;
 #endif // USE_PROTOTYPE_FEATURE_FRACTURES
@ -97,7 +97,7 @@ public:
    caf::PdmChildField<RimStimPlanColors*>                  stimPlanColors;
 #endif // USE_PROTOTYPE_FEATURE_FRACTURES

-    caf::PdmChildField<RimEclipseWellCollection*>            wellCollection;
+    caf::PdmChildField<RimSimWellInViewCollection*>            wellCollection;
    caf::PdmChildField<RimFaultCollection*>                  faultCollection;

    // Fields
--- a/ApplicationCode/ProjectDataModel/RimIntersection.cpp
+++ b/ApplicationCode/ProjectDataModel/RimIntersection.cpp
@ -26,10 +26,10 @@

 #include "RimCase.h"
 #include "RimEclipseView.h"
-#include "RimEclipseWellCollection.h"
 #include "RimOilField.h"
 #include "RimProject.h"
 #include "RimSimWellInView.h"
+#include "RimSimWellInViewCollection.h"
 #include "RimTools.h"
 #include "RimView.h"
 #include "RimWellPath.h"
@ -249,7 +249,7 @@ QList<caf::PdmOptionItemInfo> RimIntersection::calculateValueOptions(const caf::
    }
    else if (fieldNeedingOptions == &simulationWell)
    {
-        RimEclipseWellCollection* coll = simulationWellCollection();
+        RimSimWellInViewCollection* coll = simulationWellCollection();
        if (coll)
        {
            caf::PdmChildArrayField<RimSimWellInView*>& simWells = coll->wells;
@ -301,7 +301,7 @@ caf::PdmFieldHandle* RimIntersection::objectToggleField()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimEclipseWellCollection* RimIntersection::simulationWellCollection()
+RimSimWellInViewCollection* RimIntersection::simulationWellCollection()
 {
    RimEclipseView* eclipseView = NULL;
    firstAncestorOrThisOfType(eclipseView);
--- a/ApplicationCode/ProjectDataModel/RimIntersection.h
+++ b/ApplicationCode/ProjectDataModel/RimIntersection.h
@ -29,10 +29,10 @@
 #include "cvfObject.h"
 #include "cvfVector3.h"

-class RimSimWellInView;
-class RimEclipseWellCollection;
 class RimWellPath;
 class RivIntersectionPartMgr;
+class RimSimWellInView;
+class RimSimWellInViewCollection;

 //==================================================================================================
 //
@ -104,7 +104,7 @@ private:
    caf::PdmField< std::vector< cvf::Vec3d> >  m_userPolyline;
    caf::PdmField< std::vector< cvf::Vec3d> >  m_customExtrusionPoints;

-    RimEclipseWellCollection*               simulationWellCollection();
+    RimSimWellInViewCollection*               simulationWellCollection();
    void                                    updateWellCenterline() const;
    void                                    updateWellExtentDefaultValue();
    void                                    addExtents(std::vector<cvf::Vec3d> &polyLine) const;
--- a/ApplicationCode/ProjectDataModel/RimSimWellInView.cpp
+++ b/ApplicationCode/ProjectDataModel/RimSimWellInView.cpp
@ -25,8 +25,8 @@

 #include "RimCellRangeFilterCollection.h"
 #include "RimEclipseView.h"
-#include "RimEclipseWellCollection.h"
 #include "RimIntersectionCollection.h"
+#include "RimSimWellInViewCollection.h"

 #ifdef USE_PROTOTYPE_FEATURE_FRACTURES
 #include "RimSimWellFractureCollection.h"
@ -139,7 +139,7 @@ void RimSimWellInView::fieldChangedByUi(const caf::PdmFieldHandle* changedField,
        }
    }

-    RimEclipseWellCollection* wellColl = nullptr;
+    RimSimWellInViewCollection* wellColl = nullptr;
    this->firstAncestorOrThisOfType(wellColl);
    if (wellColl)
    {
@ -150,7 +150,7 @@ void RimSimWellInView::fieldChangedByUi(const caf::PdmFieldHandle* changedField,

    if (changedField == &wellPipeColor)
    {
-        RimEclipseWellCollection::updateWellAllocationPlots();
+        RimSimWellInViewCollection::updateWellAllocationPlots();
    }
 }

@ -203,7 +203,7 @@ void RimSimWellInView::wellHeadTopBottomPosition(size_t frameIndex, cvf::Vec3d*

    // Compute well head based on the z position of the top of the K column the well head is part of
    (*top) = (*bottom);
-    if ( m_rimReservoirView->wellCollection()->wellHeadPosition() == RimEclipseWellCollection::WELLHEAD_POS_TOP_COLUMN )
+    if ( m_rimReservoirView->wellCollection()->wellHeadPosition() == RimSimWellInViewCollection::WELLHEAD_POS_TOP_COLUMN )
    {
        // Position well head at top active cell of IJ-column

@ -402,7 +402,7 @@ void RimSimWellInView::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrderi
        return;
    }
    
-    const RimEclipseWellCollection* wellColl = nullptr;
+    const RimSimWellInViewCollection* wellColl = nullptr;
    this->firstAncestorOrThisOfType(wellColl);
    if (!wellColl) return;

@ -553,10 +553,10 @@ bool RimSimWellInView::isWellSpheresVisible(size_t frameIndex) const
 //--------------------------------------------------------------------------------------------------
 bool RimSimWellInView::isUsingCellCenterForPipe() const
 {
-    const RimEclipseWellCollection* wellColl = nullptr;
+    const RimSimWellInViewCollection* wellColl = nullptr;
    this->firstAncestorOrThisOfType(wellColl);

-    return (wellColl && wellColl->wellPipeCoordType() == RimEclipseWellCollection::WELLPIPE_CELLCENTER);
+    return (wellColl && wellColl->wellPipeCoordType() == RimSimWellInViewCollection::WELLPIPE_CELLCENTER);
 }

 //--------------------------------------------------------------------------------------------------
--- a/ApplicationCode/ProjectDataModel/RimSimWellInViewCollection.cpp
+++ b/ApplicationCode/ProjectDataModel/RimSimWellInViewCollection.cpp
@ -18,7 +18,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////

-#include "RimEclipseWellCollection.h"
+#include "RimSimWellInViewCollection.h"

 #include "RiaApplication.h"
 #include "RiaColorTables.h"
@ -50,12 +50,12 @@ namespace caf
 {
    // OBSOLETE enum
    template<>
-    void RimEclipseWellCollection::WellVisibilityEnum::setUp()
+    void RimSimWellInViewCollection::WellVisibilityEnum::setUp()
    {
-        addItem(RimEclipseWellCollection::PIPES_FORCE_ALL_OFF,       "FORCE_ALL_OFF",      "All Off");
-        addItem(RimEclipseWellCollection::PIPES_INDIVIDUALLY,        "ALL_ON",             "Individual");
-        addItem(RimEclipseWellCollection::PIPES_OPEN_IN_VISIBLE_CELLS,"OPEN_IN_VISIBLE_CELLS", "Visible cells filtered");
-        addItem(RimEclipseWellCollection::PIPES_FORCE_ALL_ON,        "FORCE_ALL_ON",       "All On");
+        addItem(RimSimWellInViewCollection::PIPES_FORCE_ALL_OFF,       "FORCE_ALL_OFF",      "All Off");
+        addItem(RimSimWellInViewCollection::PIPES_INDIVIDUALLY,        "ALL_ON",             "Individual");
+        addItem(RimSimWellInViewCollection::PIPES_OPEN_IN_VISIBLE_CELLS,"OPEN_IN_VISIBLE_CELLS", "Visible cells filtered");
+        addItem(RimSimWellInViewCollection::PIPES_FORCE_ALL_ON,        "FORCE_ALL_ON",       "All On");
    }
 }

@ -64,54 +64,54 @@ namespace caf
 {
    // OBSOLETE enum
    template<>
-    void RimEclipseWellCollection::WellCellsRangeFilterEnum::setUp()
+    void RimSimWellInViewCollection::WellCellsRangeFilterEnum::setUp()
    {
-        addItem(RimEclipseWellCollection::RANGE_ADD_NONE,       "FORCE_ALL_OFF",      "All Off");
-        addItem(RimEclipseWellCollection::RANGE_ADD_INDIVIDUAL, "ALL_ON",             "Individually");
-        addItem(RimEclipseWellCollection::RANGE_ADD_ALL,        "FORCE_ALL_ON",       "All On");
+        addItem(RimSimWellInViewCollection::RANGE_ADD_NONE,       "FORCE_ALL_OFF",      "All Off");
+        addItem(RimSimWellInViewCollection::RANGE_ADD_INDIVIDUAL, "ALL_ON",             "Individually");
+        addItem(RimSimWellInViewCollection::RANGE_ADD_ALL,        "FORCE_ALL_ON",       "All On");
    }
 }

 namespace caf
 {
    template<>
-    void RimEclipseWellCollection::WellFenceEnum::setUp()
+    void RimSimWellInViewCollection::WellFenceEnum::setUp()
    {
-        addItem(RimEclipseWellCollection::K_DIRECTION, "K_DIRECTION",    "K - Direction");
-        addItem(RimEclipseWellCollection::J_DIRECTION, "J_DIRECTION",    "J - Direction");
-        addItem(RimEclipseWellCollection::I_DIRECTION, "I_DIRECTION",    "I - Direction");
-        setDefault(RimEclipseWellCollection::K_DIRECTION);
+        addItem(RimSimWellInViewCollection::K_DIRECTION, "K_DIRECTION",    "K - Direction");
+        addItem(RimSimWellInViewCollection::J_DIRECTION, "J_DIRECTION",    "J - Direction");
+        addItem(RimSimWellInViewCollection::I_DIRECTION, "I_DIRECTION",    "I - Direction");
+        setDefault(RimSimWellInViewCollection::K_DIRECTION);
    }
 }

 namespace caf
 {
    template<>
-    void RimEclipseWellCollection::WellHeadPositionEnum::setUp()
+    void RimSimWellInViewCollection::WellHeadPositionEnum::setUp()
    {
-        addItem(RimEclipseWellCollection::WELLHEAD_POS_ACTIVE_CELLS_BB,    "WELLHEAD_POS_ACTIVE_CELLS_BB", "Top of Active Cells");
-        addItem(RimEclipseWellCollection::WELLHEAD_POS_TOP_COLUMN,         "WELLHEAD_POS_TOP_COLUMN",      "Top of Active Cell Column");
-        setDefault(RimEclipseWellCollection::WELLHEAD_POS_TOP_COLUMN);
+        addItem(RimSimWellInViewCollection::WELLHEAD_POS_ACTIVE_CELLS_BB,    "WELLHEAD_POS_ACTIVE_CELLS_BB", "Top of Active Cells");
+        addItem(RimSimWellInViewCollection::WELLHEAD_POS_TOP_COLUMN,         "WELLHEAD_POS_TOP_COLUMN",      "Top of Active Cell Column");
+        setDefault(RimSimWellInViewCollection::WELLHEAD_POS_TOP_COLUMN);
    }
 }

 namespace caf
 {
    template<>
-    void RimEclipseWellCollection::WellPipeCoordEnum::setUp()
+    void RimSimWellInViewCollection::WellPipeCoordEnum::setUp()
    {
-        addItem(RimEclipseWellCollection::WELLPIPE_INTERPOLATED,    "WELLPIPE_INTERPOLATED",    "Interpolated");
-        addItem(RimEclipseWellCollection::WELLPIPE_CELLCENTER,      "WELLPIPE_CELLCENTER",      "Cell Centers");
-        setDefault(RimEclipseWellCollection::WELLPIPE_INTERPOLATED);
+        addItem(RimSimWellInViewCollection::WELLPIPE_INTERPOLATED,    "WELLPIPE_INTERPOLATED",    "Interpolated");
+        addItem(RimSimWellInViewCollection::WELLPIPE_CELLCENTER,      "WELLPIPE_CELLCENTER",      "Cell Centers");
+        setDefault(RimSimWellInViewCollection::WELLPIPE_INTERPOLATED);
    }
 }

-CAF_PDM_SOURCE_INIT(RimEclipseWellCollection, "Wells");
+CAF_PDM_SOURCE_INIT(RimSimWellInViewCollection, "Wells");

 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimEclipseWellCollection::RimEclipseWellCollection()
+RimSimWellInViewCollection::RimSimWellInViewCollection()
 {
    CAF_PDM_InitObject("Simulation Wells", ":/WellCollection.png", "", "");

@ -221,7 +221,7 @@ RimEclipseWellCollection::RimEclipseWellCollection()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimEclipseWellCollection::~RimEclipseWellCollection()
+RimSimWellInViewCollection::~RimSimWellInViewCollection()
 {
   wells.deleteAllChildObjects();
 }
@ -229,7 +229,7 @@ RimEclipseWellCollection::~RimEclipseWellCollection()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimEclipseWellCollection::setShowWellCellsState(bool enable)
+void RimSimWellInViewCollection::setShowWellCellsState(bool enable)
 {
    for (RimSimWellInView* w : wells)
    {
@ -248,7 +248,7 @@ void RimEclipseWellCollection::setShowWellCellsState(bool enable)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-bool RimEclipseWellCollection::showWellCells()
+bool RimSimWellInViewCollection::showWellCells()
 {
    if (m_showWellCells().isFalse())
    {
@ -263,7 +263,7 @@ bool RimEclipseWellCollection::showWellCells()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-RimSimWellInView* RimEclipseWellCollection::findWell(QString name)
+RimSimWellInView* RimSimWellInViewCollection::findWell(QString name)
 {
    for (size_t i = 0; i < this->wells().size(); ++i)
    {
@ -278,7 +278,7 @@ RimSimWellInView* RimEclipseWellCollection::findWell(QString name)
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-bool RimEclipseWellCollection::hasVisibleWellCells()
+bool RimSimWellInViewCollection::hasVisibleWellCells()
 {
    if (!this->isActive()) return false;
    if (this->wells().size() == 0 ) return false;
@ -310,7 +310,7 @@ bool RimEclipseWellCollection::hasVisibleWellCells()
 //--------------------------------------------------------------------------------------------------
 /// Used to know if we need animation of time steps due to the wells
 //--------------------------------------------------------------------------------------------------
-bool RimEclipseWellCollection::hasVisibleWellPipes() 
+bool RimSimWellInViewCollection::hasVisibleWellPipes() 
 {
    if (!this->isActive()) return false;
    if (this->wells().size() == 0 ) return false;
@ -321,7 +321,7 @@ bool RimEclipseWellCollection::hasVisibleWellPipes()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimEclipseWellCollection::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
+void RimSimWellInViewCollection::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
 {
    if (&isActive == changedField)
    {
@ -446,7 +446,7 @@ void RimEclipseWellCollection::fieldChangedByUi(const caf::PdmFieldHandle* chang

        if (m_reservoirView) m_reservoirView->scheduleCreateDisplayModelAndRedraw();

-        RimEclipseWellCollection::updateWellAllocationPlots();
+        RimSimWellInViewCollection::updateWellAllocationPlots();

        m_applySingleColorToWells = false;
    }
@ -478,7 +478,7 @@ void RimEclipseWellCollection::fieldChangedByUi(const caf::PdmFieldHandle* chang
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimEclipseWellCollection::assignDefaultWellColors()
+void RimSimWellInViewCollection::assignDefaultWellColors()
 {


@ -494,13 +494,13 @@ void RimEclipseWellCollection::assignDefaultWellColors()
        }
    }

-    RimEclipseWellCollection::updateWellAllocationPlots();
+    RimSimWellInViewCollection::updateWellAllocationPlots();
 }

 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimEclipseWellCollection::updateWellAllocationPlots()
+void RimSimWellInViewCollection::updateWellAllocationPlots()
 {
    RimProject* proj = RiaApplication::instance()->project();

@ -516,7 +516,7 @@ void RimEclipseWellCollection::updateWellAllocationPlots()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimEclipseWellCollection::setReservoirView(RimEclipseView* ownerReservoirView)
+void RimSimWellInViewCollection::setReservoirView(RimEclipseView* ownerReservoirView)
 {
    m_reservoirView = ownerReservoirView;
 }
@ -524,7 +524,7 @@ void RimEclipseWellCollection::setReservoirView(RimEclipseView* ownerReservoirVi
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimEclipseWellCollection::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
+void RimSimWellInViewCollection::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
 {
    updateStateForVisibilityCheckboxes();

@ -574,7 +574,7 @@ void RimEclipseWellCollection::defineUiOrdering(QString uiConfigName, caf::PdmUi
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimEclipseWellCollection::updateStateForVisibilityCheckboxes()
+void RimSimWellInViewCollection::updateStateForVisibilityCheckboxes()
 {
    size_t showLabelCount = 0;
    size_t showWellHeadCount = 0;
@ -604,7 +604,7 @@ void RimEclipseWellCollection::updateStateForVisibilityCheckboxes()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimEclipseWellCollection::updateStateFromEnabledChildCount(size_t enabledChildCount, caf::PdmField<caf::Tristate>* fieldToUpdate)
+void RimSimWellInViewCollection::updateStateFromEnabledChildCount(size_t enabledChildCount, caf::PdmField<caf::Tristate>* fieldToUpdate)
 {
    caf::Tristate tristate;

@ -627,7 +627,7 @@ void RimEclipseWellCollection::updateStateFromEnabledChildCount(size_t enabledCh
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-caf::PdmFieldHandle* RimEclipseWellCollection::objectToggleField()
+caf::PdmFieldHandle* RimSimWellInViewCollection::objectToggleField()
 {
    return &isActive;
 }
@ -636,7 +636,7 @@ caf::PdmFieldHandle* RimEclipseWellCollection::objectToggleField()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimEclipseWellCollection::initAfterRead()
+void RimSimWellInViewCollection::initAfterRead()
 {
    if (obsoleteField_wellPipeVisibility() == PIPES_OPEN_IN_VISIBLE_CELLS)
    {
@ -704,7 +704,7 @@ void RimEclipseWellCollection::initAfterRead()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimEclipseWellCollection::defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute)
+void RimSimWellInViewCollection::defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute)
 {
    if (&m_applyIndividualColorsToWells == field)
    {
@ -737,7 +737,7 @@ void RimEclipseWellCollection::defineEditorAttribute(const caf::PdmFieldHandle*
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-const std::vector<cvf::ubyte>& RimEclipseWellCollection::resultWellGeometryVisibilities(size_t frameIndex)
+const std::vector<cvf::ubyte>& RimSimWellInViewCollection::resultWellGeometryVisibilities(size_t frameIndex)
 {
    calculateWellGeometryVisibility(frameIndex);
    return m_framesOfResultWellPipeVisibilities[frameIndex];
@ -746,7 +746,7 @@ const std::vector<cvf::ubyte>& RimEclipseWellCollection::resultWellGeometryVisib
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimEclipseWellCollection::scheduleIsWellPipesVisibleRecalculation()
+void RimSimWellInViewCollection::scheduleIsWellPipesVisibleRecalculation()
 {
    m_framesOfResultWellPipeVisibilities.clear();
 }
@ -754,7 +754,7 @@ void RimEclipseWellCollection::scheduleIsWellPipesVisibleRecalculation()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimEclipseWellCollection::calculateWellGeometryVisibility(size_t frameIndex)
+void RimSimWellInViewCollection::calculateWellGeometryVisibility(size_t frameIndex)
 {
    if (m_framesOfResultWellPipeVisibilities.size() > frameIndex && m_framesOfResultWellPipeVisibilities[frameIndex].size()) return;

@ -786,7 +786,7 @@ bool lessEclipseWell(const caf::PdmPointer<RimSimWellInView>& w1,  const caf::Pd
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RimEclipseWellCollection::sortWellsByName()
+void RimSimWellInViewCollection::sortWellsByName()
 {
   std::sort(wells.begin(), wells.end(), lessEclipseWell);
 }
--- a/ApplicationCode/ProjectDataModel/RimSimWellInViewCollection.h
+++ b/ApplicationCode/ProjectDataModel/RimSimWellInViewCollection.h
@ -35,13 +35,13 @@ class RimSimWellInView;
 ///  
 ///  
 //==================================================================================================
-class RimEclipseWellCollection : public caf::PdmObject
+class RimSimWellInViewCollection : public caf::PdmObject
 {
    CAF_PDM_HEADER_INIT;
 public:

-    RimEclipseWellCollection();
-    virtual ~RimEclipseWellCollection();
+    RimSimWellInViewCollection();
+    virtual ~RimSimWellInViewCollection();
    
    void                                setReservoirView(RimEclipseView* ownerReservoirView);

@ -52,7 +52,7 @@ public:
        PIPES_OPEN_IN_VISIBLE_CELLS,
        PIPES_FORCE_ALL_ON
    };
-    typedef caf::AppEnum<RimEclipseWellCollection::WellVisibilityType> WellVisibilityEnum;
+    typedef caf::AppEnum<RimSimWellInViewCollection::WellVisibilityType> WellVisibilityEnum;

    enum WellCellsRangeFilterType
    {
@ -60,7 +60,7 @@ public:
        RANGE_ADD_INDIVIDUAL,
        RANGE_ADD_NONE
    };
-    typedef caf::AppEnum<RimEclipseWellCollection::WellCellsRangeFilterType> WellCellsRangeFilterEnum;
+    typedef caf::AppEnum<RimSimWellInViewCollection::WellCellsRangeFilterType> WellCellsRangeFilterEnum;

    enum WellFenceType
    {
@ -68,21 +68,21 @@ public:
        J_DIRECTION,
        I_DIRECTION
    };
-    typedef caf::AppEnum<RimEclipseWellCollection::WellFenceType> WellFenceEnum;
+    typedef caf::AppEnum<RimSimWellInViewCollection::WellFenceType> WellFenceEnum;

    enum WellHeadPositionType
    {
        WELLHEAD_POS_ACTIVE_CELLS_BB, 
        WELLHEAD_POS_TOP_COLUMN
    };
-    typedef caf::AppEnum<RimEclipseWellCollection::WellHeadPositionType> WellHeadPositionEnum;
+    typedef caf::AppEnum<RimSimWellInViewCollection::WellHeadPositionType> WellHeadPositionEnum;

    enum WellPipeCoordType
    {
        WELLPIPE_CELLCENTER,
        WELLPIPE_INTERPOLATED
    };
-    typedef caf::AppEnum<RimEclipseWellCollection::WellPipeCoordType> WellPipeCoordEnum;
+    typedef caf::AppEnum<RimSimWellInViewCollection::WellPipeCoordType> WellPipeCoordEnum;


    caf::PdmField<bool>                 isActive;
--- a/ApplicationCode/ReservoirDataModel/RigSimulationWellCenterLineCalculator.cpp
+++ b/ApplicationCode/ReservoirDataModel/RigSimulationWellCenterLineCalculator.cpp
@ -24,7 +24,7 @@

 #include "RimEclipseCase.h"
 #include "RimEclipseView.h"
-#include "RimEclipseWellCollection.h"
+#include "RimSimWellInViewCollection.h"
 #include "RimSimWellInView.h"

 #include "cvfRay.h"
--- a/ApplicationCode/SocketInterface/RiaCaseInfoCommands.cpp
+++ b/ApplicationCode/SocketInterface/RiaCaseInfoCommands.cpp
@ -41,10 +41,10 @@
 #include "RimEclipseCellColors.h"
 #include "RimEclipsePropertyFilterCollection.h"
 #include "RimEclipseView.h"
-#include "RimEclipseWellCollection.h"
-#include "RimReservoirCellResultsStorage.h"
 #include "RimGeoMechCase.h"
 #include "RimGeoMechView.h"
+#include "RimReservoirCellResultsStorage.h"
+#include "RimSimWellInViewCollection.h"

 #include "RiuSelectionManager.h"

--- a/ApplicationCode/SocketInterface/RiaGeometryCommands.cpp
+++ b/ApplicationCode/SocketInterface/RiaGeometryCommands.cpp
@ -37,8 +37,8 @@
 #include "RimEclipseCellColors.h"
 #include "RimEclipsePropertyFilterCollection.h"
 #include "RimEclipseView.h"
-#include "RimEclipseWellCollection.h"
 #include "RimReservoirCellResultsStorage.h"
+#include "RimSimWellInViewCollection.h"

 #include <QTcpSocket>

--- a/ApplicationCode/SocketInterface/RiaNNCCommands.cpp
+++ b/ApplicationCode/SocketInterface/RiaNNCCommands.cpp
@ -34,13 +34,13 @@
 #include "RimCellRangeFilterCollection.h"
 #include "RimEclipseCase.h"
 #include "RimEclipseCellColors.h"
-#include "RimEclipsePropertyFilterCollection.h"
-#include "RimEclipseView.h"
-#include "RimEclipseWellCollection.h"
-#include "RimReservoirCellResultsStorage.h"
 #include "RimEclipseInputCase.h"
 #include "RimEclipseInputProperty.h"
 #include "RimEclipseInputPropertyCollection.h"
+#include "RimEclipsePropertyFilterCollection.h"
+#include "RimEclipseView.h"
+#include "RimReservoirCellResultsStorage.h"
+#include "RimSimWellInViewCollection.h"

 #include <QTcpSocket>
 #include <QErrorMessage>
--- a/ApplicationCode/SocketInterface/RiaProjectInfoCommands.cpp
+++ b/ApplicationCode/SocketInterface/RiaProjectInfoCommands.cpp
@ -33,12 +33,12 @@
 #include "RimEclipseCellColors.h"
 #include "RimEclipsePropertyFilterCollection.h"
 #include "RimEclipseView.h"
-#include "RimEclipseWellCollection.h"
 #include "RimIdenticalGridCaseGroup.h"
 #include "RimOilField.h"
 #include "RimProject.h"
 #include "RimReservoirCellResultsStorage.h"
 #include "RimScriptCollection.h"
+#include "RimSimWellInViewCollection.h"

 #include "RiuMainWindow.h"

--- a/ApplicationCode/SocketInterface/RiaSocketTools.cpp
+++ b/ApplicationCode/SocketInterface/RiaSocketTools.cpp
@ -35,9 +35,9 @@
 #include "RimEclipseInputPropertyCollection.h"
 #include "RimEclipsePropertyFilterCollection.h"
 #include "RimEclipseView.h"
-#include "RimEclipseWellCollection.h"
 #include "RimIdenticalGridCaseGroup.h"
 #include "RimReservoirCellResultsStorage.h"
+#include "RimSimWellInViewCollection.h"

 #include "cvfTimer.h"

--- a/ApplicationCode/UserInterface/RiuMainWindow.cpp
+++ b/ApplicationCode/UserInterface/RiuMainWindow.cpp
@ -28,11 +28,11 @@
 #include "RimCommandObject.h"
 #include "RimEclipseCase.h"
 #include "RimEclipseView.h"
-#include "RimEclipseWellCollection.h"
 #include "RimFaultCollection.h"
 #include "RimGeoMechCase.h"
 #include "RimGeoMechView.h"
 #include "RimProject.h"
+#include "RimSimWellInViewCollection.h"
 #include "RimView.h"

 #include "RiuDragDrop.h"