OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-13 17:02:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

#1996 Rename RimEclipseWell -> RimSimWellInView

Browse Source
This commit is contained in:
Rebecca Cox committed 2017-10-17 09:52:31 +02:00
1 parent 3e986a63a1
commit d748803159
72 files changed
+329 -328
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationCode/Commands/CompletionCommands/RicExportFractureCompletionsImpl.cpp
+7 -7
View File
@@ -23,14 +23,14 @@
#include "RicExportCompletionDataSettingsUi.h"
#include "RimEclipseCase.h"
#include "RimFracture.h"
#include "RimWellPath.h"
#include "RimFractureTemplate.h"
#include "RimEclipseView.h"
#include "RimEclipseWell.h"
#include "RimSimWellFractureCollection.h"
#include "RimStimPlanFractureTemplate.h"
#include "RimFracture.h"
#include "RimFractureTemplate.h"
#include "RimSimWellFracture.h"
#include "RimSimWellFractureCollection.h"
#include "RimSimWellInView.h"
#include "RimStimPlanFractureTemplate.h"
#include "RimWellPath.h"
#include "RimWellPathCompletions.h"
#include "RigEclipseCaseData.h"
@@ -70,7 +70,7 @@ std::vector<RigCompletionData> RicExportFractureCompletionsImpl::generateCompdat
///
//--------------------------------------------------------------------------------------------------
std::vector<RigCompletionData> RicExportFractureCompletionsImpl::generateCompdatValuesForSimWell(RimEclipseCase* eclipseCase,
const RimEclipseWell* well,
const RimSimWellInView* well,
QTextStream* outputStreamForIntermediateResultsText)
{
std::vector<RigCompletionData> completionData;
ApplicationCode/Commands/CompletionCommands/RicExportFractureCompletionsImpl.h
+2 -2
View File
@@ -29,8 +29,8 @@ class RicExportCompletionDataSettingsUi;
class QTextStream;
class RigWellPath;
class RimEclipseCase;
class RimEclipseWell;
class RimFracture;
class RimSimWellInView;
//--------------------------------------------------------------------------------------------------
///
@@ -43,7 +43,7 @@ public:
QTextStream* outputStreamForIntermediateResultsText);
static std::vector<RigCompletionData> generateCompdatValuesForSimWell(RimEclipseCase* eclipseCase,
const RimEclipseWell* well,
const RimSimWellInView* well,
QTextStream* outputStreamForIntermediateResultsText);
private:
ApplicationCode/Commands/CompletionCommands/RicWellPathExportCompletionDataFeature.cpp
+9 -9
View File
@@ -38,6 +38,7 @@
#include "RigWellPath.h"
#include "RigWellPathIntersectionTools.h"
#include "RimEclipseWellCollection.h"
#include "RimFishboneWellPath.h"
#include "RimFishboneWellPathCollection.h"
#include "RimFishbonesCollection.h"
@@ -45,8 +46,7 @@
#include "RimPerforationCollection.h"
#include "RimPerforationInterval.h"
#include "RimProject.h"
#include "RimEclipseWell.h"
#include "RimEclipseWellCollection.h"
#include "RimSimWellInView.h"
#include "RimWellPath.h"
#include "RimWellPathCollection.h"
#include "RimWellPathCompletions.h"
@@ -71,7 +71,7 @@ CAF_CMD_SOURCE_INIT(RicWellPathExportCompletionDataFeature, "RicWellPathExportCo
bool RicWellPathExportCompletionDataFeature::isCommandEnabled()
{
std::vector<RimWellPath*> wellPaths = selectedWellPaths();
std::vector<RimEclipseWell*> simWells = selectedSimWells();
std::vector<RimSimWellInView*> simWells = selectedSimWells();
if (wellPaths.empty() && simWells.empty())
{
@@ -104,7 +104,7 @@ bool RicWellPathExportCompletionDataFeature::isCommandEnabled()
void RicWellPathExportCompletionDataFeature::onActionTriggered(bool isChecked)
{
std::vector<RimWellPath*> wellPaths = selectedWellPaths();
std::vector<RimEclipseWell*> simWells = selectedSimWells();
std::vector<RimSimWellInView*> simWells = selectedSimWells();
CVF_ASSERT(wellPaths.size() > 0 || simWells.size() > 0);
@@ -199,9 +199,9 @@ bool RicWellPathExportCompletionDataFeature::noWellPathsSelectedDirectly()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimEclipseWell*> RicWellPathExportCompletionDataFeature::selectedSimWells()
std::vector<RimSimWellInView*> RicWellPathExportCompletionDataFeature::selectedSimWells()
{
std::vector<RimEclipseWell*> simWells;
std::vector<RimSimWellInView*> simWells;
caf::SelectionManager::instance()->objectsByType(&simWells);
std::vector<RimEclipseWellCollection*> simWellCollections;
@@ -215,7 +215,7 @@ std::vector<RimEclipseWell*> RicWellPathExportCompletionDataFeature::selectedSim
}
}
std::set<RimEclipseWell*> uniqueSimWells(simWells.begin(), simWells.end());
std::set<RimSimWellInView*> uniqueSimWells(simWells.begin(), simWells.end());
simWells.assign(uniqueSimWells.begin(), uniqueSimWells.end());
return simWells;
@@ -225,7 +225,7 @@ std::vector<RimEclipseWell*> RicWellPathExportCompletionDataFeature::selectedSim
///
//--------------------------------------------------------------------------------------------------
void RicWellPathExportCompletionDataFeature::exportCompletions(const std::vector<RimWellPath*>& wellPaths,
const std::vector<RimEclipseWell*>& simWells,
const std::vector<RimSimWellInView*>& simWells,
const RicExportCompletionDataSettingsUi& exportSettings)
{
@@ -262,7 +262,7 @@ void RicWellPathExportCompletionDataFeature::exportCompletions(const std::vector
break;
}
}
for (const RimEclipseWell* simWell : simWells)
for (const RimSimWellInView* simWell : simWells)
{
RimEclipseCase* eclipseCase;
simWell->firstAncestorOrThisOfType(eclipseCase);
ApplicationCode/Commands/CompletionCommands/RicWellPathExportCompletionDataFeature.h
+6 -6
View File
@@ -31,13 +31,13 @@
#include "cvfBoundingBox.h"
class RimWellPath;
class RimEclipseCase;
class RimEclipseWell;
class RigCell;
class RigEclipseCaseData;
class RigMainGrid;
class RigCell;
class RimEclipseCase;
class RimFishbonesMultipleSubs;
class RimSimWellInView;
class RimWellPath;
//==================================================================================================
///
@@ -129,7 +129,7 @@ protected:
virtual void setupActionLook(QAction* actionToSetup) override;
std::vector<RimWellPath*> selectedWellPaths();
std::vector<RimEclipseWell*> selectedSimWells();
std::vector<RimSimWellInView*> selectedSimWells();
bool noWellPathsSelectedDirectly();
@@ -156,7 +156,7 @@ public:
double wellRadius,
size_t cellIndex,
CellDirection direction);
static void exportCompletions(const std::vector<RimWellPath*>& wellPaths, const std::vector<RimEclipseWell*>& simWells, const RicExportCompletionDataSettingsUi& exportSettings);
static void exportCompletions(const std::vector<RimWellPath*>& wellPaths, const std::vector<RimSimWellInView*>& simWells, const RicExportCompletionDataSettingsUi& exportSettings);
private:
static RigCompletionData combineEclipseCellCompletions(const std::vector<RigCompletionData>& completions,