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

Clean up export completion data feature

Browse Source
This commit is contained in:
Bjørnar Grip Fjær 2017-05-16 14:50:54 +02:00
parent 829df457ff
commit f4223435f6
3 changed files with 20 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ApplicationCode/Commands/WellPathCommands/RicWellPathExportCompletionDataFeature.cpp
View File

@ -1,7 +1,6 @@
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2015- Statoil ASA // Copyright (C) 2017 Statoil ASA
// Copyright (C) 2015- Ceetron Solutions AS
// //
// ResInsight is free software: you can redistribute it and/or modify // ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by
@ -43,9 +42,7 @@
#include <QFileDialog> #include <QFileDialog>
#include <QMessageBox> #include <QMessageBox>
namespace caf CAF_CMD_SOURCE_INIT(RicWellPathExportCompletionDataFeature, "RicWellPathExportCompletionDataFeature");
{
CAF_CMD_SOURCE_INIT(RicWellPathExportCompletionDataFeature, "RicWellPathExportCompletionDataFeature");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -178,7 +175,10 @@ void RicWellPathExportCompletionDataFeature::exportToFolder(RimWellPath* wellPat
// Add cell indices // Add cell indices
formatter.add(wellPath->name()).addZeroBasedCellIndex(cellRange.i).addZeroBasedCellIndex(cellRange.j).addZeroBasedCellIndex(cellRange.k1).addZeroBasedCellIndex(cellRange.k2); formatter.add(wellPath->name()).addZeroBasedCellIndex(cellRange.i).addZeroBasedCellIndex(cellRange.j).addZeroBasedCellIndex(cellRange.k1).addZeroBasedCellIndex(cellRange.k2);
// Remaining data, to be computed // Remaining data, to be computed
formatter.add("'OPEN'").add("1*").add("1*").add(0.0).add("1*").add("1*").add("1*").add("'Z'").add("1*"); formatter.add("'OPEN'").add("1*").add("1*");
// Diameter (originally in mm) in m
formatter.add(subs->holeRadius() / 1000);
formatter.add("1*").add("1*").add("1*").add("'Z'").add("1*");
formatter.rowCompleted(); formatter.rowCompleted();
} }
} }
@ -236,12 +236,6 @@ std::vector<EclipseCellIndexRange> RicWellPathExportCompletionDataFeature::getCe
eclipseCellIndices.push_back(std::make_tuple(i, j, k)); eclipseCellIndices.push_back(std::make_tuple(i, j, k));
} }
// Remove any duplicate cells
{
std::set<EclipseCellIndex> uniqueCellIndices(eclipseCellIndices.begin(), eclipseCellIndices.end());
eclipseCellIndices.assign(uniqueCellIndices.begin(), uniqueCellIndices.end());
}
// Group cell indices in K-ranges // Group cell indices in K-ranges
std::sort(eclipseCellIndices.begin(), eclipseCellIndices.end(), RicWellPathExportCompletionDataFeature::cellOrdering); std::sort(eclipseCellIndices.begin(), eclipseCellIndices.end(), RicWellPathExportCompletionDataFeature::cellOrdering);
std::vector<EclipseCellIndexRange> eclipseCellRanges; std::vector<EclipseCellIndexRange> eclipseCellRanges;
@ -309,8 +303,8 @@ bool RicWellPathExportCompletionDataFeature::cellOrdering(const EclipseCellIndex
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::vector<size_t> RicWellPathExportCompletionDataFeature::findIntersectingCells(const RigEclipseCaseData* caseData, const std::vector<cvf::Vec3d>& coords) std::vector<size_t> RicWellPathExportCompletionDataFeature::findIntersectingCells(const RigEclipseCaseData* caseData, const std::vector<cvf::Vec3d>& coords)
{ {
const std::vector<cvf::Vec3d>& nodeCoords = caseData->mainGrid()->nodes(); const std::vector<cvf::Vec3d>& nodeCoords = caseData->mainGrid()->nodes();
std::vector<size_t> cells; std::set<size_t> cells;
// Find starting cell // Find starting cell
if (coords.size() > 0) if (coords.size() > 0)
@ -329,7 +323,7 @@ std::vector<size_t> RicWellPathExportCompletionDataFeature::findIntersectingCell
if (RigHexIntersector::isPointInCell(coords[0], hexCorners, closeCell)) if (RigHexIntersector::isPointInCell(coords[0], hexCorners, closeCell))
{ {
cells.push_back(closeCell); cells.insert(closeCell);
break; break;
} }
} }
@ -358,11 +352,15 @@ std::vector<size_t> RicWellPathExportCompletionDataFeature::findIntersectingCell
for (auto intersection : intersections) for (auto intersection : intersections)
{ {
cells.push_back(intersection.m_hexIndex); cells.insert(intersection.m_hexIndex);
} }
} }
std::sort(cells.begin(), cells.end()); // Ensure only unique cells are included
return cells; std::vector<size_t> cellsVector;
cellsVector.assign(cells.begin(), cells.end());
// Sort cells
std::sort(cellsVector.begin(), cellsVector.end());
return cellsVector;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -383,7 +381,7 @@ void RicWellPathExportCompletionDataFeature::setHexCorners(const RigCell& cell,
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::vector<size_t> RicWellPathExportCompletionDataFeature::filterWellPathCells(const std::vector<size_t>& completionCells, const std::vector<size_t>& wellPathCells) std::vector<size_t> RicWellPathExportCompletionDataFeature::filterWellPathCells(const std::vector<size_t>& completionCells, const std::vector<size_t>& wellPathCells)
{ {
@ -410,5 +408,3 @@ void RicWellPathExportCompletionDataFeature::addLateralToCells(std::map<size_t,
} }
} }
} }
} // end namespace caf

12
ApplicationCode/Commands/WellPathCommands/RicWellPathExportCompletionDataFeature.h
View File

@ -1,7 +1,6 @@
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2015- Statoil ASA // Copyright (C) 2017 Statoil ASA
// Copyright (C) 2015- Ceetron Solutions AS
// //
// ResInsight is free software: you can redistribute it and/or modify // ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by // it under the terms of the GNU General Public License as published by
@ -30,9 +29,6 @@ class RigEclipseCaseData;
class RigMainGrid; class RigMainGrid;
class RigCell; class RigCell;
namespace caf
{
struct EclipseCellIndexRange { struct EclipseCellIndexRange {
size_t i; size_t i;
size_t j; size_t j;
@ -45,7 +41,7 @@ typedef std::tuple<size_t, size_t, size_t> EclipseCellIndex;
//================================================================================================== //==================================================================================================
/// ///
//================================================================================================== //==================================================================================================
class RicWellPathExportCompletionDataFeature : public CmdFeature class RicWellPathExportCompletionDataFeature : public caf::CmdFeature
{ {
CAF_CMD_HEADER_INIT; CAF_CMD_HEADER_INIT;
protected: protected:
@ -65,7 +61,3 @@ private:
static std::vector<size_t> filterWellPathCells(const std::vector<size_t>& completionCells, const std::vector<size_t>& wellPathCells); static std::vector<size_t> filterWellPathCells(const std::vector<size_t>& completionCells, const std::vector<size_t>& wellPathCells);
static void addLateralToCells(std::map<size_t, double>* lateralsPerCell, const std::vector<size_t>& lateralCells); static void addLateralToCells(std::map<size_t, double>* lateralsPerCell, const std::vector<size_t>& lateralCells);
}; };
} // end namespace caf

1
ApplicationCode/ProjectDataModel/Fishbones/RimFishbonesMultipleSubs.h
View File

@ -63,6 +63,7 @@ public:
double buildAngle() const; double buildAngle() const;
double tubingRadius() const; double tubingRadius() const;
double holeRadius() const { return m_lateralHoleRadius(); }
double lateralCountPerSub() const; double lateralCountPerSub() const;
std::vector<double> lateralLengths() const; std::vector<double> lateralLengths() const;