diff --git a/ApplicationCode/ReservoirDataModel/Completions/RigWellPathStimplanIntersector.cpp b/ApplicationCode/ReservoirDataModel/Completions/RigWellPathStimplanIntersector.cpp index e09dbb2a59..a3c5ccb0e0 100644 --- a/ApplicationCode/ReservoirDataModel/Completions/RigWellPathStimplanIntersector.cpp +++ b/ApplicationCode/ReservoirDataModel/Completions/RigWellPathStimplanIntersector.cpp @@ -77,7 +77,7 @@ const std::map& wellPathPointsDomainCoords, diff --git a/ApplicationCode/ReservoirDataModel/Completions/RigWellPathStimplanIntersector.h b/ApplicationCode/ReservoirDataModel/Completions/RigWellPathStimplanIntersector.h index 699cabb62c..e85005db8a 100644 --- a/ApplicationCode/ReservoirDataModel/Completions/RigWellPathStimplanIntersector.h +++ b/ApplicationCode/ReservoirDataModel/Completions/RigWellPathStimplanIntersector.h @@ -1,17 +1,17 @@ ///////////////////////////////////////////////////////////////////////////////// // // Copyright (C) 2017- Statoil ASA -// +// // ResInsight is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. -// +// // ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY // WARRANTY; without even the implied warranty of MERCHANTABILITY or // FITNESS FOR A PARTICULAR PURPOSE. -// -// See the GNU General Public License at +// +// See the GNU General Public License at // for more details. // ///////////////////////////////////////////////////////////////////////////////// @@ -28,19 +28,23 @@ class RigWellPath; class RimFracture; class RigWellPathStimplanIntersectorTester; - //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- class RigWellPathStimplanIntersector { public: - struct WellCellIntersection - { - WellCellIntersection():hlength(0.0), vlength(0.0), endpointCount(0) {} - double hlength; - double vlength; - int endpointCount; + struct WellCellIntersection + { + WellCellIntersection() + : hlength(0.0) + , vlength(0.0) + , endpointCount(0) + { + } + double hlength; + double vlength; + int endpointCount; double computeLength() const { @@ -50,35 +54,35 @@ public: RigWellPathStimplanIntersector(const RigWellPath* wellpathGeom, const RimFracture* rimFracture); - const std::map& intersections() const; + const std::map& intersections() const; private: friend class RigWellPathStimplanIntersectorTester; - static void calculate(const cvf::Mat4d& fractureXf, - const std::vector& wellPathPoints, - double wellRadius, - double perforationLength, - const std::vector >& stpCellPolygons, - std::map& stimPlanCellIdxToIntersectionInfoMap); + static void calculate(const cvf::Mat4d& fractureXf, + const std::vector& wellPathPoints, + double wellRadius, + double perforationLength, + const std::vector>& stpCellPolygons, + std::map& stimPlanCellIdxToIntersectionInfoMap); - std::map m_stimPlanCellIdxToIntersectionInfoMap; + std::map m_stimPlanCellIdxToIntersectionInfoMap; }; - //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- class RigWellPathStimplanIntersectorTester { public: - static void testCalculate(const cvf::Mat4d& fractureXf, - const std::vector& wellPathPoints, - double wellRadius, - double perforationLength, - const std::vector >& stpCellPolygons, - std::map& stimPlanCellIdxToIntersectionInfoMap) + static void testCalculate( + const cvf::Mat4d& fractureXf, + const std::vector& wellPathPoints, + double wellRadius, + double perforationLength, + const std::vector>& stpCellPolygons, + std::map& stimPlanCellIdxToIntersectionInfoMap) { - RigWellPathStimplanIntersector::calculate(fractureXf, wellPathPoints, wellRadius, perforationLength, stpCellPolygons, stimPlanCellIdxToIntersectionInfoMap); + RigWellPathStimplanIntersector::calculate( + fractureXf, wellPathPoints, wellRadius, perforationLength, stpCellPolygons, stimPlanCellIdxToIntersectionInfoMap); } - };