CppCheck : Added copyright header, fixed includes and removed unused variable

This commit is contained in:
Magne Sjaastad
2017-09-07 21:28:40 +02:00
parent 228c8d1f87
commit ad64340b75
2 changed files with 36 additions and 15 deletions

View File

@@ -1,18 +1,38 @@
#include "RigWellPathStimplanIntersector.h" /////////////////////////////////////////////////////////////////////////////////
#include "RigWellPath.h" //
#include "RimFracture.h" // Copyright (C) 2017- Statoil ASA
#include "RigCellGeometryTools.h" //
#include "RimFractureTemplate.h" // ResInsight is free software: you can redistribute it and/or modify
#include "cvfBase.h" // it under the terms of the GNU General Public License as published by
#include "cvfMatrix4.h" // the Free Software Foundation, either version 3 of the License, or
#include "RigFractureCell.h" // (at your option) any later version.
#include "RimStimPlanFractureTemplate.h" //
#include "RigFractureGrid.h" // 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 <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#include "RigWellPathStimplanIntersector.h"
#include "RigCellGeometryTools.h"
#include "RigFractureCell.h"
#include "RigFractureGrid.h"
#include "RigWellPath.h"
#include "RimFracture.h"
#include "RimFractureTemplate.h"
#include "RimSimWellFracture.h"
#include "RimStimPlanFractureTemplate.h"
#include "cvfBase.h"
#include "cvfMath.h" #include "cvfMath.h"
#include "cvfMatrix4.h"
#include <cmath> #include <cmath>
#include "RimSimWellFracture.h"
RigWellPathStimplanIntersector::RigWellPathStimplanIntersector(const RigWellPath* wellpathGeom, RimFracture* rimFracture) RigWellPathStimplanIntersector::RigWellPathStimplanIntersector(const RigWellPath* wellpathGeom, RimFracture* rimFracture)
@@ -20,7 +40,6 @@ RigWellPathStimplanIntersector::RigWellPathStimplanIntersector(const RigWellPath
std::vector<cvf::Vec3d> wellPathPoints = wellpathGeom->wellPathPointsIncludingFractureIntersection(rimFracture->fractureMD()); std::vector<cvf::Vec3d> wellPathPoints = wellpathGeom->wellPathPointsIncludingFractureIntersection(rimFracture->fractureMD());
cvf::Mat4d fractureXf = rimFracture->transformMatrix(); cvf::Mat4d fractureXf = rimFracture->transformMatrix();
double wellRadius = rimFracture->wellRadius(rimFracture->fractureUnit()); double wellRadius = rimFracture->wellRadius(rimFracture->fractureUnit());
std::vector<cvf::Vec3f> fracturePolygonf ;
std::vector<std::vector<cvf::Vec3d> > stpCellPolygons; std::vector<std::vector<cvf::Vec3d> > stpCellPolygons;
{ {
RimFractureTemplate* fractureTemplate = rimFracture->fractureTemplate(); RimFractureTemplate* fractureTemplate = rimFracture->fractureTemplate();

View File

@@ -15,12 +15,14 @@
// for more details. // for more details.
// //
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#pragma once #pragma once
#include "cvfBase.h"
#include "cvfMatrix4.h"
#include <map> #include <map>
#include <vector> #include <vector>
#include "cvfBase.h"
#include "cvfMatrix4.h"
class RigWellPath; class RigWellPath;
class RimFracture; class RimFracture;