Rename and whitespace changes

This commit is contained in:
Jacob Støren
2017-10-06 12:36:21 +02:00
parent f938827523
commit 6f82f0f614
8 changed files with 36 additions and 32 deletions

View File

@@ -44,26 +44,26 @@ public:
virtual ~RigWellLogExtractor();
const std::vector<double>& measuredDepth() { return m_measuredDepth; }
const std::vector<double>& trueVerticalDepth() {return m_trueVerticalDepth;}
const std::vector<double>& trueVerticalDepth() { return m_trueVerticalDepth; }
const RigWellPath* wellPathData() { return m_wellPath.p();}
protected:
static void insertIntersectionsInMap(const std::vector<HexIntersectionInfo> &intersections,
cvf::Vec3d p1,
double md1,
cvf::Vec3d p2,
double md2,
std::map<RigMDCellIdxEnterLeaveKey, HexIntersectionInfo > *uniqueIntersections);
static void insertIntersectionsInMap(const std::vector<HexIntersectionInfo> &intersections,
cvf::Vec3d p1,
double md1,
cvf::Vec3d p2,
double md2,
std::map<RigMDCellIdxEnterLeaveKey, HexIntersectionInfo > *uniqueIntersections);
void populateReturnArrays(std::map<RigMDCellIdxEnterLeaveKey, HexIntersectionInfo > &uniqueIntersections);
void appendIntersectionToArrays(double measuredDepth, const HexIntersectionInfo& intersection);
void populateReturnArrays(std::map<RigMDCellIdxEnterLeaveKey, HexIntersectionInfo > &uniqueIntersections);
void appendIntersectionToArrays(double measuredDepth, const HexIntersectionInfo& intersection);
std::vector<double> m_measuredDepth;
std::vector<double> m_trueVerticalDepth;
std::vector<cvf::Vec3d> m_intersections;
std::vector<size_t> m_intersectedCells;
std::vector<size_t> m_intersectedCellsGlobIdx;
std::vector<cvf::StructGridInterface::FaceType>
m_intersectedCellFaces;