From d2ce5f3b8fbca460f74c9b76dcaac2152c291c91 Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <dmitri.naumov@ufz.de>
Date: Thu, 24 Sep 2015 16:49:46 +0200
Subject: [PATCH] Add IndexType to global matrix and vector types.
Check for equality of the types
---
MathLib/LinAlg/Dense/DenseVector.h | 1 +
MathLib/LinAlg/Dense/GlobalDenseMatrix.h | 1 +
MathLib/LinAlg/Eigen/EigenMatrix.h | 1 +
MathLib/LinAlg/Eigen/EigenVector.h | 6 ++++++
MathLib/LinAlg/Lis/LisMatrix.h | 2 ++
MathLib/LinAlg/Lis/LisVector.h | 2 ++
MathLib/LinAlg/PETSc/PETScMatrix.h | 3 +++
MathLib/LinAlg/PETSc/PETScVector.h | 3 +++
ProcessLib/NumericsConfig.h | 15 ++++++++++++++-
9 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/MathLib/LinAlg/Dense/DenseVector.h b/MathLib/LinAlg/Dense/DenseVector.h
index e924b15564b..e630ddf9807 100644
--- a/MathLib/LinAlg/Dense/DenseVector.h
+++ b/MathLib/LinAlg/Dense/DenseVector.h
@@ -31,6 +31,7 @@ class DenseVector : public std::valarray<T>
{
public:
typedef T FP_T;
+ using IndexType = std::size_t; // The type of valarray indices.
public:
using std::valarray<T>::operator=;
diff --git a/MathLib/LinAlg/Dense/GlobalDenseMatrix.h b/MathLib/LinAlg/Dense/GlobalDenseMatrix.h
index 46f13c7e50d..60e97121c7d 100644
--- a/MathLib/LinAlg/Dense/GlobalDenseMatrix.h
+++ b/MathLib/LinAlg/Dense/GlobalDenseMatrix.h
@@ -30,6 +30,7 @@ class GlobalDenseMatrix: public DenseMatrix<FP_TYPE, IDX_TYPE>
{
public:
typedef FP_TYPE FP_T;
+ using IndexType = IDX_TYPE;
public:
/// Dense square matrix constructor.
diff --git a/MathLib/LinAlg/Eigen/EigenMatrix.h b/MathLib/LinAlg/Eigen/EigenMatrix.h
index ad5758afc24..2aaa665f0a1 100644
--- a/MathLib/LinAlg/Eigen/EigenMatrix.h
+++ b/MathLib/LinAlg/Eigen/EigenMatrix.h
@@ -33,6 +33,7 @@ class EigenMatrix final
{
public:
using RawMatrixType = Eigen::SparseMatrix<double, Eigen::RowMajor>;
+ using IndexType = RawMatrixType::Index;
/**
* constructor
diff --git a/MathLib/LinAlg/Eigen/EigenVector.h b/MathLib/LinAlg/Eigen/EigenVector.h
index 0c27be96407..5f34625010b 100644
--- a/MathLib/LinAlg/Eigen/EigenVector.h
+++ b/MathLib/LinAlg/Eigen/EigenVector.h
@@ -17,6 +17,7 @@
#endif
#include <Eigen/Eigen>
+#include <Eigen/Sparse>
namespace MathLib
{
@@ -27,6 +28,11 @@ class EigenVector final
public:
using RawVectorType = Eigen::VectorXd;
+ // The Index type of the Eigen::VectorXd class differs from the
+ // Eigen::SparseMatrix<double> index type. Maybe an Eigen::SparseVector is a
+ // more appropriate RawVectorType for the global vectors.
+ using IndexType = Eigen::SparseMatrix<double>::Index;
+
/// Constructor for initialization of the number of rows
/// @param length number of rows
explicit EigenVector(std::size_t length) : _vec(length) {}
diff --git a/MathLib/LinAlg/Lis/LisMatrix.h b/MathLib/LinAlg/Lis/LisMatrix.h
index 4d9d725c694..1166d2cfff2 100644
--- a/MathLib/LinAlg/Lis/LisMatrix.h
+++ b/MathLib/LinAlg/Lis/LisMatrix.h
@@ -44,6 +44,8 @@ struct SetMatrixSparsity<LisMatrix, SPARSITY_PATTERN>;
*/
class LisMatrix
{
+public:
+ using IndexType = LIS_INT;
public:
/**
* constructor
diff --git a/MathLib/LinAlg/Lis/LisVector.h b/MathLib/LinAlg/Lis/LisVector.h
index 33346c6e019..9fbbd3e0cd7 100644
--- a/MathLib/LinAlg/Lis/LisVector.h
+++ b/MathLib/LinAlg/Lis/LisVector.h
@@ -27,6 +27,8 @@ namespace MathLib
*/
class LisVector
{
+public:
+ using IndexType = LIS_INT;
public:
/**
* Constructor for initialization of the number of rows
diff --git a/MathLib/LinAlg/PETSc/PETScMatrix.h b/MathLib/LinAlg/PETSc/PETScMatrix.h
index 43706b87305..4f830e865bb 100644
--- a/MathLib/LinAlg/PETSc/PETScMatrix.h
+++ b/MathLib/LinAlg/PETSc/PETScMatrix.h
@@ -33,6 +33,9 @@ namespace MathLib
*/
class PETScMatrix
{
+ public:
+ using IndexType = PetscInt;
+
public:
/*!
\brief Constructor for a square matrix partitioning with more options
diff --git a/MathLib/LinAlg/PETSc/PETScVector.h b/MathLib/LinAlg/PETSc/PETScVector.h
index b940d0d861b..ee7d4482829 100644
--- a/MathLib/LinAlg/PETSc/PETScVector.h
+++ b/MathLib/LinAlg/PETSc/PETScVector.h
@@ -34,6 +34,9 @@ namespace MathLib
*/
class PETScVector
{
+ public:
+ using IndexType = PetscInt;
+
public:
/*!
diff --git a/ProcessLib/NumericsConfig.h b/ProcessLib/NumericsConfig.h
index 3bc349a6380..2b4fcaf86ee 100644
--- a/ProcessLib/NumericsConfig.h
+++ b/ProcessLib/NumericsConfig.h
@@ -103,5 +103,18 @@ using GlobalSetupType =
// Check the configuration
//
static_assert(std::is_class<GlobalSetupType>::value,
- "GlobalSetupType was not defined.");
+ "GlobalSetupType was not defined.");
+static_assert(std::is_integral<detail::GlobalMatrixType::IndexType>::value,
+ "The index type for global matrices is not an integral type.");
+static_assert(std::is_integral<detail::GlobalVectorType::IndexType>::value,
+ "The index type for global vectors is not an integral type.");
+static_assert(std::is_same<detail::GlobalMatrixType::IndexType,
+ detail::GlobalVectorType::IndexType>::value,
+ "The global matrix and vector index types do not match.");
+// Both types are integral types and equal, define a single GlobalIndexType.
+
+/// A type used for indexing of global vectors and matrices. It is equal to the
+/// GlobalMatrixType::IndexType and the GlobalVectorType::IndexType.
+using GlobalIndexType = detail::GlobalMatrixType::IndexType;
+
#endif // APPLICATIONS_NUMERICSCONFIG_H_
--
GitLab