From a84134cc7d5eaebcbc9c5d8557ff3c26e3324820 Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Tue, 8 Dec 2020 10:33:12 +0100
Subject: [PATCH] [Mat] Substitute scalarTriple impl. by Eigen.
---
MathLib/Vector3.cpp | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/MathLib/Vector3.cpp b/MathLib/Vector3.cpp
index a810a64a53b..b4a12364a2a 100644
--- a/MathLib/Vector3.cpp
+++ b/MathLib/Vector3.cpp
@@ -15,8 +15,19 @@ namespace MathLib
double scalarTriple(MathLib::Vector3 const& u, MathLib::Vector3 const& v,
MathLib::Vector3 const& w)
{
- MathLib::Vector3 const cross(MathLib::crossProduct(u, v));
- return MathLib::scalarProduct(cross,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(EigenLib::Vector3d const& u, EigenLib::Vector3d const& v,
+// EigenLib::Vector3d const& w)
+//{
+// return (u.cross(v).dot(w))(0,0);
+//}
+
} // end namespace MathLib
--
GitLab