From a13f35f8662720bd5ed36e25f8a6043a78866a7d Mon Sep 17 00:00:00 2001 From: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue, 8 Dec 2020 12:53:15 +0100 Subject: [PATCH] [MaL] Remove old scalarTriple implementation. --- MathLib/Vector3.cpp | 12 ------------ MathLib/Vector3.h | 6 +----- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/MathLib/Vector3.cpp b/MathLib/Vector3.cpp index 040b473a9ab..f9e80edb2cd 100644 --- a/MathLib/Vector3.cpp +++ b/MathLib/Vector3.cpp @@ -12,18 +12,6 @@ namespace MathLib { -double scalarTriple(MathLib::Vector3 const& u, MathLib::Vector3 const& v, - MathLib::Vector3 const& w) -{ - auto const pu = - Eigen::Map<Eigen::Vector3d>(const_cast<double*>(u.getCoords())); - auto const pv = - Eigen::Map<Eigen::Vector3d>(const_cast<double*>(v.getCoords())); - auto const pw = - Eigen::Map<Eigen::Vector3d>(const_cast<double*>(w.getCoords())); - return pu.cross(pv).dot(pw); -} - double scalarTriple(Eigen::Vector3d const& u, Eigen::Vector3d const& v, Eigen::Vector3d const& w) { diff --git a/MathLib/Vector3.h b/MathLib/Vector3.h index d7b35db9a4a..51ccb328613 100644 --- a/MathLib/Vector3.h +++ b/MathLib/Vector3.h @@ -19,8 +19,8 @@ #include <Eigen/Eigen> #include <cmath> -#include "TemplatePoint.h" #include "MathTools.h" +#include "TemplatePoint.h" namespace MathLib { @@ -198,10 +198,6 @@ template <typename T1> TemplateVector3<T1> operator*( using Vector3 = TemplateVector3<double>; /// Calculates the scalar triple (u x v) . w -double scalarTriple(MathLib::Vector3 const& u, MathLib::Vector3 const& v, - MathLib::Vector3 const& w); - -/// Calculates the scalar triple (u x v) . w using Eigen functionality double scalarTriple(Eigen::Vector3d const& u, Eigen::Vector3d const& v, Eigen::Vector3d const& w); } // namespace MathLib -- GitLab