diff --git a/GeoLib/AnalyticalGeometry.cpp b/GeoLib/AnalyticalGeometry.cpp
index 996b5e8750bab106a4396818c8f39eb0e211626e..4e0bb2b6973c1c288e6d258ed50b96420323bb37 100644
--- a/GeoLib/AnalyticalGeometry.cpp
+++ b/GeoLib/AnalyticalGeometry.cpp
@@ -263,11 +263,11 @@ bool barycentricPointInTriangle(GeoLib::Point const& p,
if (std::abs(orientation3d(p, a, b, c)) > eps_pnt_out_of_plane)
return false;
- MathLib::Vector3 const pa (p,a);
+ MathLib::Vector3 const pa (p,a);
MathLib::Vector3 const pb (p,b);
MathLib::Vector3 const pc (p,c);
double const area_x_2 (calcTriangleArea(a,b,c) * 2);
-
+
double const alpha ((MathLib::crossProduct(pb,pc).getLength()) / area_x_2);
if (alpha < -eps_pnt_out_of_tri || alpha > 1+eps_pnt_out_of_tri)
return false;
@@ -451,14 +451,14 @@ GeoLib::Point* triangleLineIntersection(GeoLib::Point const& a, GeoLib::Point co
const MathLib::Vector3 pa(p, a);
const MathLib::Vector3 pb(p, b);
const MathLib::Vector3 pc(p, c);
-
+
double u (scalarTriple(pq, pc, pb));
if (u<0) return nullptr;
double v (scalarTriple(pq, pa, pc));
if (v<0) return nullptr;
double w (scalarTriple(pq, pb, pa));
if (w<0) return nullptr;
-
+
const double denom (1.0/(u+v+w));
u*=denom;
v*=denom;
@@ -490,7 +490,7 @@ bool dividedByPlane(const GeoLib::Point& a, const GeoLib::Point& b, const GeoLib
const double abd = (b[x] - a[x])*(d[y] - a[y]) - (b[y] - a[y])*(d[x] - a[x]);
if ((abc>0 && abd<0) || (abc<0 && abd>0))
- return true;
+ return true;
}
return false;
}
diff --git a/GeoLib/AnalyticalGeometry.h b/GeoLib/AnalyticalGeometry.h
index c6bb7e51d91f5032038ec3b70bd05d90a3ab984e..89c6e30770e52e76d483ce6ce926c1d7b4802513 100644
--- a/GeoLib/AnalyticalGeometry.h
+++ b/GeoLib/AnalyticalGeometry.h
@@ -28,12 +28,12 @@ class Polyline;
enum TriangleTest
{
- GAUSS, BARYCENTRIC
+ GAUSS, BARYCENTRIC
};
enum Orientation
{
- CW = 1, CCW = 2, COLLINEAR = 3
+ CW = 1, CCW = 2, COLLINEAR = 3
};
/**
@@ -42,8 +42,8 @@ enum Orientation
* \returns CW (clockwise), CCW (counterclockwise) or COLLINEAR (points are on a line)
*/
Orientation getOrientation (const double& p0_x, const double& p0_y,
- const double& p1_x, const double& p1_y,
- const double& p2_x, const double& p2_y);
+ const double& p1_x, const double& p1_y,
+ const double& p2_x, const double& p2_y);
/**
* wrapper for getOrientation ()
@@ -218,10 +218,10 @@ bool parallel(MathLib::Vector3 v, MathLib::Vector3 w);
* @return true, if the line segments intersect, else false
*/
bool lineSegmentIntersect (const GeoLib::Point& a, const GeoLib::Point& b,
- const GeoLib::Point& c, const GeoLib::Point& d, GeoLib::Point& s);
+ const GeoLib::Point& c, const GeoLib::Point& d, GeoLib::Point& s);
/**
- * Calculates the intersection points of a line PQ and a triangle ABC.
+ * Calculates the intersection points of a line PQ and a triangle ABC.
* This method requires ABC to be counterclockwise and PQ to point downward.
* @return Intersection point or NULL if there is no intersection.
*/
@@ -249,7 +249,7 @@ double orientation3d(GeoLib::Point const& p,
* @param b second point on plane
* @param c first point to test
* @param d second point to test
- * @return true, if such a plane can be found, false otherwise
+ * @return true, if such a plane can be found, false otherwise
*/
bool dividedByPlane(const GeoLib::Point& a, const GeoLib::Point& b,
const GeoLib::Point& c, const GeoLib::Point& d);
@@ -264,9 +264,8 @@ double orientation3d(GeoLib::Point const& p,
* pnt_vec. For each intersection an id is returned. This id is used to split the two
* intersecting straight line segments in four straight line segments.
*/
-void computeAndInsertAllIntersectionPoints(
- GeoLib::PointVec &pnt_vec,
- std::vector<GeoLib::Polyline*> & plys);
+void computeAndInsertAllIntersectionPoints(GeoLib::PointVec &pnt_vec,
+ std::vector<GeoLib::Polyline*> & plys);
} // end namespace GeoLib
diff --git a/GeoLib/GEOObjects.h b/GeoLib/GEOObjects.h
index b5db65c0e6a5767d0c11b75b206964b78a6ad392..83caff2480a2f5229b041e198da842945d2563ce 100644
--- a/GeoLib/GEOObjects.h
+++ b/GeoLib/GEOObjects.h
@@ -1,7 +1,7 @@
/**
* \author Thomas Fischer / Karsten Rink
* \date 2010-01-21
- * \brief Definition of the GeoObjects class.
+ * \brief Definition of the GEOObjects class.
*
* \copyright
* Copyright (c) 2012-2014, OpenGeoSys Community (http://www.opengeosys.org)
diff --git a/MeshLib/MeshSurfaceExtraction.cpp b/MeshLib/MeshSurfaceExtraction.cpp
index 82f4a7863b373407973b4b1262cce871dff30181..7fe8490d4af5b988f2c4676ce5a994440820a02f 100644
--- a/MeshLib/MeshSurfaceExtraction.cpp
+++ b/MeshLib/MeshSurfaceExtraction.cpp
@@ -68,10 +68,10 @@ std::vector<double> MeshSurfaceExtraction::getSurfaceAreaForNodes(const MeshLib:
MeshLib::Mesh* MeshSurfaceExtraction::getMeshSurface(const MeshLib::Mesh &mesh, const MathLib::Vector3 &dir, double angle, bool keepOriginalNodeIds)
{
- if (angle< 0 || angle > 90)
+ if (angle < 0 || angle > 90)
{
- ERR ("Supported angle between 0 and 90 degrees only.");
- return nullptr;
+ ERR ("Supported angle between 0 and 90 degrees only.");
+ return nullptr;
}
INFO ("Extracting mesh surface...");
@@ -141,7 +141,7 @@ void MeshSurfaceExtraction::get2DSurfaceElements(const std::vector<MeshLib::Elem
{
MeshLib::Face* face = static_cast<MeshLib::Face*>(*elem);
if (MathLib::scalarProduct(face->getSurfaceNormal().getNormalizedVector(), norm_dir) > cos_theta)
- continue;
+ continue;
}
sfc_elements.push_back(*elem);
}
diff --git a/MeshLib/Node.h b/MeshLib/Node.h
index b54390bd5437df8a7703279386a1d9d1d64369dc..a78a211afdeb1d0cb325c8b675949a74d3d1376b 100644
--- a/MeshLib/Node.h
+++ b/MeshLib/Node.h
@@ -45,7 +45,6 @@ class Node : public GeoLib::PointWithID
friend class Mesh;
friend class MeshRevision;
-
public:
/// Constructor using a coordinate array
Node(const double coords[3], unsigned id = std::numeric_limits<unsigned>::max());
@@ -95,7 +94,6 @@ protected:
std::vector<Node*> _connected_nodes;
std::vector<Element*> _elements;
-
}; /* class */
} /* namespace */
diff --git a/Tests/GeoLib/TestBoundingSphere.cpp b/Tests/GeoLib/TestBoundingSphere.cpp
index d2416bf7a9a4c0d986a1b46f483087b92bf2ee08..cd6a5e034dba585ead40c07432b2528dfe3639f9 100644
--- a/Tests/GeoLib/TestBoundingSphere.cpp
+++ b/Tests/GeoLib/TestBoundingSphere.cpp
@@ -19,10 +19,6 @@
TEST(GeoLib, TestBoundingSphere)
{
- GeoLib::Point a(0, 0 ,0);
- GeoLib::Point b(2, 0 ,0);
- GeoLib::Point c(1, 0.1 ,0);
- GeoLib::Point d(1, -0.1 ,0);
std::vector<GeoLib::Point*> pnts;
pnts.push_back(new GeoLib::Point(0, 0 , 0));
pnts.push_back(new GeoLib::Point(2, 0 , 0));
@@ -69,7 +65,7 @@ TEST(GeoLib, TestBoundingSphere)
ASSERT_NEAR(-0.3446, center[2], 0.0001);
ASSERT_NEAR(1.0580, s.getRadius(), 0.0001);
}
-
+
pnts[0] = new GeoLib::Point(0, 0, 0);
pnts[1] = new GeoLib::Point(1, 0, 0);
pnts[2] = new GeoLib::Point(1, 1, 0);