OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#1996 Rename RimEclipseWell -> RimSimWellInView

Browse Source
This commit is contained in:
Rebecca Cox
2017-10-13 09:29:42 +02:00
parent 3e986a63a1
commit d748803159
72 changed files with 329 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/ModelVisualization/RivReservoirSimWellsPartMgr.cpp
View File

@@ -26,8 +26,8 @@
#include "RimEclipseCellColors.h"
#include "RimEclipsePropertyFilterCollection.h"
#include "RimEclipseView.h"
#include "RimEclipseWell.h"
#include "RimEclipseWellCollection.h"
#include "RimSimWellInView.h"
#include "RivWellHeadPartMgr.h"
#include "RivSimWellPipesPartMgr.h"
@@ -139,7 +139,7 @@ void RivReservoirSimWellsPartMgr::appendDynamicGeometryPartsToModel(cvf::ModelBa
{
m_wellSpheresPartMgrs.clear();
for (RimEclipseWell* rimWell : m_reservoirView->wellCollection()->wells())
for (RimSimWellInView* rimWell : m_reservoirView->wellCollection()->wells())
{
RivWellSpheresPartMgr* wppmgr = new RivWellSpheresPartMgr(m_reservoirView, rimWell);
m_wellSpheresPartMgrs.push_back(wppmgr);
@@ -157,7 +157,7 @@ void RivReservoirSimWellsPartMgr::appendDynamicGeometryPartsToModel(cvf::ModelBa
// Well Connection Arrows
if ( m_reservoirView->wellCollection()->showWellCommunicationLines() )
{
for ( RimEclipseWell* rimWell : m_reservoirView->wellCollection()->wells() )
for ( RimSimWellInView* rimWell : m_reservoirView->wellCollection()->wells() )
{
cvf::ref<RivWellConnectionsPartMgr> wppmgr = new RivWellConnectionsPartMgr(m_reservoirView, rimWell);
wppmgr->appendDynamicGeometryPartsToModel(model, frameIndex);

6
ApplicationCode/ModelVisualization/RivSimWellPipeSourceInfo.cpp
View File

@@ -20,14 +20,14 @@
#include "RivSimWellPipeSourceInfo.h"
#include "RimEclipseView.h"
#include "RimEclipseWell.h"
#include "RimEclipseWellCollection.h"
#include "RimSimWellInView.h"
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RivSimWellPipeSourceInfo::RivSimWellPipeSourceInfo(RimEclipseWell* eclipseWell, size_t branchIndex)
RivSimWellPipeSourceInfo::RivSimWellPipeSourceInfo(RimSimWellInView* eclipseWell, size_t branchIndex)
: m_eclipseWell(eclipseWell),
m_branchIndex(branchIndex)
{
@@ -36,7 +36,7 @@ RivSimWellPipeSourceInfo::RivSimWellPipeSourceInfo(RimEclipseWell* eclipseWell,
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimEclipseWell* RivSimWellPipeSourceInfo::well() const
RimSimWellInView* RivSimWellPipeSourceInfo::well() const
{
return m_eclipseWell.p();
}

8
ApplicationCode/ModelVisualization/RivSimWellPipeSourceInfo.h
View File

@@ -23,18 +23,18 @@
#include "cvfObject.h"
#include "cafPdmPointer.h"
class RimEclipseWell;
class RimSimWellInView;
class RivSimWellPipeSourceInfo : public cvf::Object
{
public:
RivSimWellPipeSourceInfo(RimEclipseWell* eclipseWell, size_t branchIndex);
RivSimWellPipeSourceInfo(RimSimWellInView* eclipseWell, size_t branchIndex);
RimEclipseWell* well() const;
RimSimWellInView* well() const;
size_t branchIndex() const;
private:
caf::PdmPointer<RimEclipseWell> m_eclipseWell;
caf::PdmPointer<RimSimWellInView> m_eclipseWell;
size_t m_branchIndex;
};

4
ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.cpp
View File

@@ -32,9 +32,9 @@
#include "RimEclipseCellColors.h"
#include "RimEclipsePropertyFilterCollection.h"
#include "RimEclipseView.h"
#include "RimEclipseWell.h"
#include "RimEclipseWellCollection.h"
#include "RimReservoirCellResultsStorage.h"
#include "RimSimWellInView.h"
#include "RivPipeGeometryGenerator.h"
#include "RivWellPathSourceInfo.h"
@@ -55,7 +55,7 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RivSimWellPipesPartMgr::RivSimWellPipesPartMgr(RimEclipseView* reservoirView, RimEclipseWell* well)
RivSimWellPipesPartMgr::RivSimWellPipesPartMgr(RimEclipseView* reservoirView, RimSimWellInView* well)
{
m_rimReservoirView = reservoirView;
m_rimWell = well;

6
ApplicationCode/ModelVisualization/RivSimWellPipesPartMgr.h
View File

@@ -37,12 +37,12 @@ namespace cvf
class RivPipeGeometryGenerator;
class RimEclipseView;
class RimEclipseWell;
class RimSimWellInView;
class RivSimWellPipesPartMgr : public cvf::Object
{
public:
RivSimWellPipesPartMgr(RimEclipseView* reservoirView, RimEclipseWell* well);
RivSimWellPipesPartMgr(RimEclipseView* reservoirView, RimSimWellInView* well);
~RivSimWellPipesPartMgr();
void setScaleTransform(cvf::Transform * scaleTransform) { m_scaleTransform = scaleTransform; scheduleGeometryRegen();}
@@ -56,7 +56,7 @@ public:
private:
caf::PdmPointer<RimEclipseView> m_rimReservoirView;
caf::PdmPointer<RimEclipseWell> m_rimWell;
caf::PdmPointer<RimSimWellInView> m_rimWell;
cvf::ref<cvf::Transform> m_scaleTransform;
bool m_needsTransformUpdate;

6
ApplicationCode/ModelVisualization/RivWellConnectionsPartMgr.cpp
View File

@@ -20,8 +20,8 @@
#include "RimEclipseResultCase.h"
#include "RimEclipseView.h"
#include "RimEclipseWell.h"
#include "RimEclipseWellCollection.h"
#include "RimSimWellInView.h"
#include "RigSingleWellResultsData.h"
#include "RigFlowDiagResults.h"
@@ -39,7 +39,7 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RivWellConnectionsPartMgr::RivWellConnectionsPartMgr(RimEclipseView* reservoirView, RimEclipseWell* well)
RivWellConnectionsPartMgr::RivWellConnectionsPartMgr(RimEclipseView* reservoirView, RimSimWellInView* well)
{
m_rimReservoirView = reservoirView;
m_rimWell = well;
@@ -126,7 +126,7 @@ void RivWellConnectionsPartMgr::appendDynamicGeometryPartsToModel(cvf::ModelBasi
// 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
for ( RimEclipseWell * otherWell: wellColl->wells )
for ( RimSimWellInView * otherWell: wellColl->wells )
{
if ( otherWell == m_rimWell ) continue;
if ( !otherWell->wellResults()->hasWellResult(frameIndex) ) continue;

10
ApplicationCode/ModelVisualization/RivWellConnectionsPartMgr.h
View File

@@ -36,17 +36,17 @@ namespace cvf
class Part;
}
class RivPipeGeometryGenerator;
class RimEclipseView;
class RimEclipseWell;
class RigWellResultFrame;
class RimEclipseView;
class RimSimWellInView;
class RivPipeGeometryGenerator;
struct RigWellResultPoint;
class RivWellConnectionsPartMgr : public cvf::Object
{
public:
RivWellConnectionsPartMgr(RimEclipseView* reservoirView, RimEclipseWell* well);
RivWellConnectionsPartMgr(RimEclipseView* reservoirView, RimSimWellInView* well);
~RivWellConnectionsPartMgr();
void appendDynamicGeometryPartsToModel(cvf::ModelBasicList* model, size_t frameIndex);
@@ -67,7 +67,7 @@ private:
private:
caf::PdmPointer<RimEclipseView> m_rimReservoirView;
caf::PdmPointer<RimEclipseWell> m_rimWell;
caf::PdmPointer<RimSimWellInView> m_rimWell;
bool m_useCurvedArrows;
};

4
ApplicationCode/ModelVisualization/RivWellFracturePartMgr.cpp
View File

@@ -25,13 +25,13 @@
#include "RigHexIntersectionTools.h"
#include "RigCellGeometryTools.h"
#include "RigFractureCell.h"
#include "RimEclipseView.h"
#include "RimEclipseWell.h"
#include "RimFracture.h"
#include "RimFractureContainment.h"
#include "RimFractureTemplate.h"
#include "RimLegendConfig.h"
#include "RigFractureCell.h"
#include "RimSimWellInView.h"
#include "RimStimPlanColors.h"
#include "RimStimPlanFractureTemplate.h"

6
ApplicationCode/ModelVisualization/RivWellHeadPartMgr.cpp
View File

@@ -32,8 +32,8 @@
#include "RimEclipseCase.h"
#include "RimEclipseView.h"
#include "RimEclipseWell.h"
#include "RimEclipseWellCollection.h"
#include "RimSimWellInView.h"
#include "RivPipeGeometryGenerator.h"
#include "RivPartPriority.h"
@@ -56,7 +56,7 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RivWellHeadPartMgr::RivWellHeadPartMgr(RimEclipseView* reservoirView, RimEclipseWell* well)
RivWellHeadPartMgr::RivWellHeadPartMgr(RimEclipseView* reservoirView, RimSimWellInView* well)
{
m_rimReservoirView = reservoirView;
m_rimWell = well;
@@ -81,7 +81,7 @@ void RivWellHeadPartMgr::buildWellHeadParts(size_t frameIndex)
RigEclipseCaseData* rigReservoir = m_rimReservoirView->eclipseCase()->eclipseCaseData();
RimEclipseWell* well = m_rimWell;
RimSimWellInView* well = m_rimWell;
double characteristicCellSize = rigReservoir->mainGrid()->characteristicIJCellSize();

6
ApplicationCode/ModelVisualization/RivWellHeadPartMgr.h
View File

@@ -31,13 +31,13 @@ namespace cvf
class Font;
}
class RimEclipseWell;
class RimEclipseView;
class RimSimWellInView;
class RivWellHeadPartMgr : public cvf::Object
{
public:
RivWellHeadPartMgr(RimEclipseView* reservoirView, RimEclipseWell* well);
RivWellHeadPartMgr(RimEclipseView* reservoirView, RimSimWellInView* well);
~RivWellHeadPartMgr();
void setScaleTransform(cvf::Transform * scaleTransform) { m_scaleTransform = scaleTransform;}
@@ -52,7 +52,7 @@ private:
private:
caf::PdmPointer<RimEclipseView> m_rimReservoirView;
caf::PdmPointer<RimEclipseWell> m_rimWell;
caf::PdmPointer<RimSimWellInView> m_rimWell;
cvf::ref<cvf::Transform> m_scaleTransform;

4
ApplicationCode/ModelVisualization/RivWellSpheresPartMgr.cpp
View File

@@ -25,8 +25,8 @@
#include "RimEclipseCase.h"
#include "RimEclipseView.h"
#include "RimEclipseWell.h"
#include "RimEclipseWellCollection.h"
#include "RimSimWellInView.h"
#include "RiuViewer.h"
@@ -49,7 +49,7 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RivWellSpheresPartMgr::RivWellSpheresPartMgr(RimEclipseView* reservoirView, RimEclipseWell* well)
RivWellSpheresPartMgr::RivWellSpheresPartMgr(RimEclipseView* reservoirView, RimSimWellInView* well)
{
m_rimReservoirView = reservoirView;
m_rimWell = well;

10
ApplicationCode/ModelVisualization/RivWellSpheresPartMgr.h
View File

@@ -39,17 +39,17 @@ namespace cvf
class Color3f;
}
class RivPipeGeometryGenerator;
class RimEclipseView;
class RimEclipseWell;
class RigWellResultFrame;
class RimEclipseView;
class RimSimWellInView;
class RivPipeGeometryGenerator;
struct RigWellResultPoint;
class RivWellSpheresPartMgr : public cvf::Object
{
public:
RivWellSpheresPartMgr(RimEclipseView* reservoirView, RimEclipseWell* well);
RivWellSpheresPartMgr(RimEclipseView* reservoirView, RimSimWellInView* well);
~RivWellSpheresPartMgr();
void appendDynamicGeometryPartsToModel(cvf::ModelBasicList* model, size_t frameIndex);
@@ -60,5 +60,5 @@ private:
private:
caf::PdmPointer<RimEclipseView> m_rimReservoirView;
caf::PdmPointer<RimEclipseWell> m_rimWell;
caf::PdmPointer<RimSimWellInView> m_rimWell;
};