Move reduceVector to Eigen helper functions (precice#795)

jianzhou722 · Jul 10, 2020 · e8dee9b · e8dee9b
1 parent f737cee
commit e8dee9b
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 26 deletions.
diff --git a/src/mapping/RadialBasisFctMapping.hpp b/src/mapping/RadialBasisFctMapping.hpp
@@ -8,6 +8,7 @@
 #include "mesh/RTree.hpp"
 #include "utils/Event.hpp"
 #include "utils/MasterSlave.hpp"
+#include "utils/EigenHelperFunctions.hpp"
 #include "mesh/impl/BBUtils.hpp"
 
 #include <Eigen/Core>
@@ -533,28 +534,6 @@ void RadialBasisFctMapping<RADIAL_BASIS_FUNCTION_T>::tagMeshSecondRound()
 }
 
 // ------- Non-Member Functions ---------
-Eigen::VectorXd reduceVector(const Eigen::VectorXd &fullVector, std::vector<bool> deadAxis)
-{
-
-  int dimensions     = deadAxis.size();
-  int deadDimensions = 0;
-  for (int d = 0; d < dimensions; d++) {
-    if (deadAxis[d])
-      deadDimensions += 1;
-  }
-
-  PRECICE_ASSERT(dimensions > deadDimensions, dimensions, deadDimensions);
-  Eigen::VectorXd reducedVector(dimensions - deadDimensions);
-  int             k = 0;
-
-  for (int d = 0; d < dimensions; d++) {
-    if (not deadAxis[d]) {
-      reducedVector[k] = fullVector[d];
-      k++;
-    }
-  }
-  return reducedVector;
-}
 
 template <typename RADIAL_BASIS_FUNCTION_T>
 Eigen::MatrixXd buildMatrixCLU(RADIAL_BASIS_FUNCTION_T basisFunction, const mesh::Mesh &inputMesh, std::vector<bool> deadAxis)
@@ -579,10 +558,10 @@ Eigen::MatrixXd buildMatrixCLU(RADIAL_BASIS_FUNCTION_T basisFunction, const mesh
     for (int j = i; j < inputSize; ++j) {
       const auto &u   = inputMesh.vertices()[i].getCoords();
       const auto &v   = inputMesh.vertices()[j].getCoords();
-      matrixCLU(i, j) = basisFunction.evaluate(reduceVector((u - v), deadAxis).norm());
+      matrixCLU(i, j) = basisFunction.evaluate(utils::reduceVector((u - v), deadAxis).norm());
     }
 
-    const auto reduced = reduceVector(inputMesh.vertices()[i].getCoords(), deadAxis);
+    const auto reduced = utils::reduceVector(inputMesh.vertices()[i].getCoords(), deadAxis);
 
     for (int dim = 0; dim < dimensions - deadDimensions; dim++) {
       matrixCLU(i, inputSize + 1 + dim) = reduced[dim];
@@ -620,10 +599,10 @@ Eigen::MatrixXd buildMatrixA(RADIAL_BASIS_FUNCTION_T basisFunction, const mesh::
     for (int j = 0; j < inputSize; ++j) {
       const auto &u = outputMesh.vertices()[i].getCoords();
       const auto &v = inputMesh.vertices()[j].getCoords();
-      matrixA(i, j) = basisFunction.evaluate(reduceVector((u - v), deadAxis).norm());
+      matrixA(i, j) = basisFunction.evaluate(utils::reduceVector((u - v), deadAxis).norm());
     }
 
-    const auto reduced = reduceVector(outputMesh.vertices()[i].getCoords(), deadAxis);
+    const auto reduced = utils::reduceVector(outputMesh.vertices()[i].getCoords(), deadAxis);
 
     for (int dim = 0; dim < dimensions - deadDimensions; dim++) {
       matrixA(i, inputSize + 1 + dim) = reduced[dim];

diff --git a/src/utils/EigenHelperFunctions.cpp b/src/utils/EigenHelperFunctions.cpp
@@ -55,5 +55,28 @@ void append(
   v(n) = value;
 }
 
+Eigen::VectorXd reduceVector(
+    const Eigen::VectorXd &fullVector,
+    const std::vector<bool>& deadAxis)
+{
+  int deadDimensions = 0;
+  int dimensions = deadAxis.size();
+  for (int d = 0; d < dimensions; d++) {
+    if (deadAxis[d])
+      deadDimensions += 1;
+  }
+  PRECICE_ASSERT(dimensions > deadDimensions, dimensions, deadDimensions);
+  Eigen::VectorXd reducedVector(dimensions - deadDimensions);
+  int             k = 0;
+  for (int d = 0; d < dimensions; d++) {
+    if (not deadAxis[d]) {
+      reducedVector[k] = fullVector[d];
+      k++;
+    }
+  }
+  return reducedVector;
+}
+
+
 } // namespace utils
 } // namespace precice
diff --git a/src/utils/EigenHelperFunctions.hpp b/src/utils/EigenHelperFunctions.hpp
@@ -2,6 +2,7 @@
 
 #include <Eigen/Core>
 #include <iterator>
+#include <vector>
 #include "utils/algorithm.hpp"
 #include "utils/assertion.hpp"
 
@@ -14,6 +15,9 @@ void appendFront(Eigen::MatrixXd &A, Eigen::VectorXd &v);
 
 void removeColumnFromMatrix(Eigen::MatrixXd &A, int col);
 
+/// Deletes all dead directions from fullVector and returns a vector of reduced dimensionality.
+Eigen::VectorXd reduceVector(const Eigen::VectorXd &fullVector, const std::vector<bool> &deadAxis);
+
 void append(Eigen::VectorXd &v, double value);
 
 template <typename Derived1>