Whitespace

This commit is contained in:
Magne Sjaastad
2018-09-14 11:41:30 +02:00
parent 044dbb14a7
commit a7f14a0cb5
2 changed files with 35 additions and 31 deletions

View File

@@ -77,7 +77,7 @@ const std::map<size_t, RigWellPathStimplanIntersector::RigWellPathStimplanInters
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// Todo: Use only the perforated parts of the well path ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RigWellPathStimplanIntersector::calculate(const cvf::Mat4d& fractureXf, void RigWellPathStimplanIntersector::calculate(const cvf::Mat4d& fractureXf,
const std::vector<cvf::Vec3d>& wellPathPointsDomainCoords, const std::vector<cvf::Vec3d>& wellPathPointsDomainCoords,

View File

@@ -1,17 +1,17 @@
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
// //
// Copyright (C) 2017- Statoil ASA // Copyright (C) 2017- Statoil ASA
// //
// 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
// the Free Software Foundation, either version 3 of the License, or // the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version. // (at your option) any later version.
// //
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY // ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or // WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE. // FITNESS FOR A PARTICULAR PURPOSE.
// //
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html> // See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details. // for more details.
// //
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
@@ -28,19 +28,23 @@ class RigWellPath;
class RimFracture; class RimFracture;
class RigWellPathStimplanIntersectorTester; class RigWellPathStimplanIntersectorTester;
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
class RigWellPathStimplanIntersector class RigWellPathStimplanIntersector
{ {
public: public:
struct WellCellIntersection struct WellCellIntersection
{ {
WellCellIntersection():hlength(0.0), vlength(0.0), endpointCount(0) {} WellCellIntersection()
double hlength; : hlength(0.0)
double vlength; , vlength(0.0)
int endpointCount; , endpointCount(0)
{
}
double hlength;
double vlength;
int endpointCount;
double computeLength() const double computeLength() const
{ {
@@ -50,35 +54,35 @@ public:
RigWellPathStimplanIntersector(const RigWellPath* wellpathGeom, const RimFracture* rimFracture); RigWellPathStimplanIntersector(const RigWellPath* wellpathGeom, const RimFracture* rimFracture);
const std::map<size_t, WellCellIntersection >& intersections() const; const std::map<size_t, WellCellIntersection>& intersections() const;
private: private:
friend class RigWellPathStimplanIntersectorTester; friend class RigWellPathStimplanIntersectorTester;
static void calculate(const cvf::Mat4d& fractureXf, static void calculate(const cvf::Mat4d& fractureXf,
const std::vector<cvf::Vec3d>& wellPathPoints, const std::vector<cvf::Vec3d>& wellPathPoints,
double wellRadius, double wellRadius,
double perforationLength, double perforationLength,
const std::vector<std::vector<cvf::Vec3d> >& stpCellPolygons, const std::vector<std::vector<cvf::Vec3d>>& stpCellPolygons,
std::map<size_t, WellCellIntersection>& stimPlanCellIdxToIntersectionInfoMap); std::map<size_t, WellCellIntersection>& stimPlanCellIdxToIntersectionInfoMap);
std::map<size_t, WellCellIntersection > m_stimPlanCellIdxToIntersectionInfoMap; std::map<size_t, WellCellIntersection> m_stimPlanCellIdxToIntersectionInfoMap;
}; };
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
class RigWellPathStimplanIntersectorTester class RigWellPathStimplanIntersectorTester
{ {
public: public:
static void testCalculate(const cvf::Mat4d& fractureXf, static void testCalculate(
const std::vector<cvf::Vec3d>& wellPathPoints, const cvf::Mat4d& fractureXf,
double wellRadius, const std::vector<cvf::Vec3d>& wellPathPoints,
double perforationLength, double wellRadius,
const std::vector<std::vector<cvf::Vec3d> >& stpCellPolygons, double perforationLength,
std::map<size_t, RigWellPathStimplanIntersector::WellCellIntersection>& stimPlanCellIdxToIntersectionInfoMap) const std::vector<std::vector<cvf::Vec3d>>& stpCellPolygons,
std::map<size_t, RigWellPathStimplanIntersector::WellCellIntersection>& stimPlanCellIdxToIntersectionInfoMap)
{ {
RigWellPathStimplanIntersector::calculate(fractureXf, wellPathPoints, wellRadius, perforationLength, stpCellPolygons, stimPlanCellIdxToIntersectionInfoMap); RigWellPathStimplanIntersector::calculate(
fractureXf, wellPathPoints, wellRadius, perforationLength, stpCellPolygons, stimPlanCellIdxToIntersectionInfoMap);
} }
}; };