From ac10f3c34b8f3ec633439660e20ddcb84028b0b1 Mon Sep 17 00:00:00 2001
From: Norihiro Watanabe <norihiro.watanabe@ufz.de>
Date: Sat, 21 May 2016 11:12:08 +0200
Subject: [PATCH] remove AssemblerLib dependency by moving DoF related stuff in
 Math/LinAlg to AssemblerLib

---
 Applications/ApplicationsLib/LinearSolverLibrarySetup.h     | 2 +-
 {MathLib/LinAlg => AssemblerLib}/GlobalMatrixProviders.cpp  | 0
 {MathLib/LinAlg => AssemblerLib}/GlobalMatrixProviders.h    | 0
 {MathLib/LinAlg => AssemblerLib}/MatrixProviderUser.h       | 2 +-
 {MathLib/LinAlg => AssemblerLib}/MatrixVectorTraits.cpp     | 0
 {MathLib/LinAlg => AssemblerLib}/MatrixVectorTraits.h       | 0
 .../SimpleMatrixVectorProvider-impl.h                       | 2 +-
 .../LinAlg => AssemblerLib}/SimpleMatrixVectorProvider.h    | 0
 {MathLib/LinAlg => AssemblerLib}/UnifiedMatrixSetters.cpp   | 0
 {MathLib/LinAlg => AssemblerLib}/UnifiedMatrixSetters.h     | 0
 .../LocalLinearLeastSquaresExtrapolator-impl.h              | 2 +-
 NumLib/Extrapolation/LocalLinearLeastSquaresExtrapolator.h  | 2 +-
 NumLib/ODESolver/EquationSystem.h                           | 2 +-
 NumLib/ODESolver/NonlinearSolver-impl.h                     | 2 +-
 NumLib/ODESolver/ODESystem.h                                | 2 +-
 NumLib/ODESolver/TimeDiscretization.h                       | 2 +-
 NumLib/ODESolver/TimeDiscretizedODESystem.h                 | 2 +-
 NumLib/ODESolver/TimeLoopSingleODE.h                        | 2 +-
 Tests/NumLib/ODEs.h                                         | 2 +-
 Tests/NumLib/TestExtrapolation.cpp                          | 6 +++---
 Tests/testrunner.cpp                                        | 2 +-
 21 files changed, 16 insertions(+), 16 deletions(-)
 rename {MathLib/LinAlg => AssemblerLib}/GlobalMatrixProviders.cpp (100%)
 rename {MathLib/LinAlg => AssemblerLib}/GlobalMatrixProviders.h (100%)
 rename {MathLib/LinAlg => AssemblerLib}/MatrixProviderUser.h (99%)
 rename {MathLib/LinAlg => AssemblerLib}/MatrixVectorTraits.cpp (100%)
 rename {MathLib/LinAlg => AssemblerLib}/MatrixVectorTraits.h (100%)
 rename {MathLib/LinAlg => AssemblerLib}/SimpleMatrixVectorProvider-impl.h (99%)
 rename {MathLib/LinAlg => AssemblerLib}/SimpleMatrixVectorProvider.h (100%)
 rename {MathLib/LinAlg => AssemblerLib}/UnifiedMatrixSetters.cpp (100%)
 rename {MathLib/LinAlg => AssemblerLib}/UnifiedMatrixSetters.h (100%)

diff --git a/Applications/ApplicationsLib/LinearSolverLibrarySetup.h b/Applications/ApplicationsLib/LinearSolverLibrarySetup.h
index 65e83055063..f6d6d760554 100644
--- a/Applications/ApplicationsLib/LinearSolverLibrarySetup.h
+++ b/Applications/ApplicationsLib/LinearSolverLibrarySetup.h
@@ -19,7 +19,7 @@
 /// The default implementation is empty providing polymorphic behaviour when
 /// using this class.
 
-#include "MathLib/LinAlg/GlobalMatrixProviders.h"
+#include "AssemblerLib/GlobalMatrixProviders.h"
 
 #if defined(USE_PETSC)
 #include <petsc.h>
diff --git a/MathLib/LinAlg/GlobalMatrixProviders.cpp b/AssemblerLib/GlobalMatrixProviders.cpp
similarity index 100%
rename from MathLib/LinAlg/GlobalMatrixProviders.cpp
rename to AssemblerLib/GlobalMatrixProviders.cpp
diff --git a/MathLib/LinAlg/GlobalMatrixProviders.h b/AssemblerLib/GlobalMatrixProviders.h
similarity index 100%
rename from MathLib/LinAlg/GlobalMatrixProviders.h
rename to AssemblerLib/GlobalMatrixProviders.h
diff --git a/MathLib/LinAlg/MatrixProviderUser.h b/AssemblerLib/MatrixProviderUser.h
similarity index 99%
rename from MathLib/LinAlg/MatrixProviderUser.h
rename to AssemblerLib/MatrixProviderUser.h
index b6d16e1c631..0f0e4b7f0d5 100644
--- a/MathLib/LinAlg/MatrixProviderUser.h
+++ b/AssemblerLib/MatrixProviderUser.h
@@ -12,7 +12,7 @@
 
 #include <cstddef>
 
-#include "SparsityPattern.h"
+#include "MathLib/LinAlg/SparsityPattern.h"
 
 namespace AssemblerLib { class LocalToGlobalIndexMap; }
 namespace MeshLib { class Mesh; }
diff --git a/MathLib/LinAlg/MatrixVectorTraits.cpp b/AssemblerLib/MatrixVectorTraits.cpp
similarity index 100%
rename from MathLib/LinAlg/MatrixVectorTraits.cpp
rename to AssemblerLib/MatrixVectorTraits.cpp
diff --git a/MathLib/LinAlg/MatrixVectorTraits.h b/AssemblerLib/MatrixVectorTraits.h
similarity index 100%
rename from MathLib/LinAlg/MatrixVectorTraits.h
rename to AssemblerLib/MatrixVectorTraits.h
diff --git a/MathLib/LinAlg/SimpleMatrixVectorProvider-impl.h b/AssemblerLib/SimpleMatrixVectorProvider-impl.h
similarity index 99%
rename from MathLib/LinAlg/SimpleMatrixVectorProvider-impl.h
rename to AssemblerLib/SimpleMatrixVectorProvider-impl.h
index 8e1d83690b1..aa7d09b989c 100644
--- a/MathLib/LinAlg/SimpleMatrixVectorProvider-impl.h
+++ b/AssemblerLib/SimpleMatrixVectorProvider-impl.h
@@ -10,7 +10,7 @@
 #include <cassert>
 #include <logog/include/logog.hpp>
 
-#include "BLAS.h"
+#include "MathLib/LinAlg/BLAS.h"
 #include "MatrixVectorTraits.h"
 #include "SimpleMatrixVectorProvider.h"
 
diff --git a/MathLib/LinAlg/SimpleMatrixVectorProvider.h b/AssemblerLib/SimpleMatrixVectorProvider.h
similarity index 100%
rename from MathLib/LinAlg/SimpleMatrixVectorProvider.h
rename to AssemblerLib/SimpleMatrixVectorProvider.h
diff --git a/MathLib/LinAlg/UnifiedMatrixSetters.cpp b/AssemblerLib/UnifiedMatrixSetters.cpp
similarity index 100%
rename from MathLib/LinAlg/UnifiedMatrixSetters.cpp
rename to AssemblerLib/UnifiedMatrixSetters.cpp
diff --git a/MathLib/LinAlg/UnifiedMatrixSetters.h b/AssemblerLib/UnifiedMatrixSetters.h
similarity index 100%
rename from MathLib/LinAlg/UnifiedMatrixSetters.h
rename to AssemblerLib/UnifiedMatrixSetters.h
diff --git a/NumLib/Extrapolation/LocalLinearLeastSquaresExtrapolator-impl.h b/NumLib/Extrapolation/LocalLinearLeastSquaresExtrapolator-impl.h
index c9dcf842115..340ac3ccc6e 100644
--- a/NumLib/Extrapolation/LocalLinearLeastSquaresExtrapolator-impl.h
+++ b/NumLib/Extrapolation/LocalLinearLeastSquaresExtrapolator-impl.h
@@ -12,9 +12,9 @@
 #include <logog/include/logog.hpp>
 #include <Eigen/Core>
 
+#include "AssemblerLib/MatrixVectorTraits.h"
 #include "AssemblerLib/SerialExecutor.h"
 #include "MathLib/LinAlg/BLAS.h"
-#include "MathLib/LinAlg/MatrixVectorTraits.h"
 #include "NumLib/Function/Interpolation.h"
 #include "LocalLinearLeastSquaresExtrapolator.h"
 
diff --git a/NumLib/Extrapolation/LocalLinearLeastSquaresExtrapolator.h b/NumLib/Extrapolation/LocalLinearLeastSquaresExtrapolator.h
index b1771643049..22a65316e4b 100644
--- a/NumLib/Extrapolation/LocalLinearLeastSquaresExtrapolator.h
+++ b/NumLib/Extrapolation/LocalLinearLeastSquaresExtrapolator.h
@@ -10,7 +10,7 @@
 #ifndef NUMLIB_LOCAL_LLSQ_EXTRAPOLATOR_H
 #define NUMLIB_LOCAL_LLSQ_EXTRAPOLATOR_H
 
-#include "MathLib/LinAlg/GlobalMatrixProviders.h"
+#include "AssemblerLib/GlobalMatrixProviders.h"
 #include "Extrapolator.h"
 
 namespace NumLib
diff --git a/NumLib/ODESolver/EquationSystem.h b/NumLib/ODESolver/EquationSystem.h
index 42635717116..e92d7dbdea5 100644
--- a/NumLib/ODESolver/EquationSystem.h
+++ b/NumLib/ODESolver/EquationSystem.h
@@ -10,7 +10,7 @@
 #ifndef NUMLIB_EQUATIONSYSTEM_H
 #define NUMLIB_EQUATIONSYSTEM_H
 
-#include "MathLib/LinAlg/MatrixProviderUser.h"
+#include "AssemblerLib/MatrixProviderUser.h"
 
 namespace NumLib
 {
diff --git a/NumLib/ODESolver/NonlinearSolver-impl.h b/NumLib/ODESolver/NonlinearSolver-impl.h
index 5876ff11b79..b9bcdfc0feb 100644
--- a/NumLib/ODESolver/NonlinearSolver-impl.h
+++ b/NumLib/ODESolver/NonlinearSolver-impl.h
@@ -14,7 +14,7 @@
 
 #include "BaseLib/ConfigTree.h"
 #include "MathLib/LinAlg/BLAS.h"
-#include "MathLib/LinAlg/GlobalMatrixProviders.h"
+#include "AssemblerLib/GlobalMatrixProviders.h"
 
 #include "NonlinearSolver.h"
 
diff --git a/NumLib/ODESolver/ODESystem.h b/NumLib/ODESolver/ODESystem.h
index 1183c5bf112..ee3abeb6629 100644
--- a/NumLib/ODESolver/ODESystem.h
+++ b/NumLib/ODESolver/ODESystem.h
@@ -10,7 +10,7 @@
 #ifndef NUMLIB_ODESYSTEM_H
 #define NUMLIB_ODESYSTEM_H
 
-#include "MathLib/LinAlg/MatrixVectorTraits.h"
+#include "AssemblerLib/MatrixVectorTraits.h"
 
 #include "Types.h"
 #include "EquationSystem.h"
diff --git a/NumLib/ODESolver/TimeDiscretization.h b/NumLib/ODESolver/TimeDiscretization.h
index 63fa996c982..c7da0353e04 100644
--- a/NumLib/ODESolver/TimeDiscretization.h
+++ b/NumLib/ODESolver/TimeDiscretization.h
@@ -13,7 +13,7 @@
 #include <vector>
 
 #include "MathLib/LinAlg/BLAS.h"
-#include "MathLib/LinAlg/GlobalMatrixProviders.h"
+#include "AssemblerLib/GlobalMatrixProviders.h"
 #include "Types.h"
 
 
diff --git a/NumLib/ODESolver/TimeDiscretizedODESystem.h b/NumLib/ODESolver/TimeDiscretizedODESystem.h
index 916851ed999..384b59d2e45 100644
--- a/NumLib/ODESolver/TimeDiscretizedODESystem.h
+++ b/NumLib/ODESolver/TimeDiscretizedODESystem.h
@@ -12,8 +12,8 @@
 
 #include <memory>
 
+#include "AssemblerLib/UnifiedMatrixSetters.h"
 #include "MathLib/LinAlg/ApplyKnownSolution.h"
-#include "MathLib/LinAlg/UnifiedMatrixSetters.h"
 #include "ProcessLib/DirichletBc.h"
 
 #include "ODESystem.h"
diff --git a/NumLib/ODESolver/TimeLoopSingleODE.h b/NumLib/ODESolver/TimeLoopSingleODE.h
index ff8f29d8e08..21344c5e68c 100644
--- a/NumLib/ODESolver/TimeLoopSingleODE.h
+++ b/NumLib/ODESolver/TimeLoopSingleODE.h
@@ -10,7 +10,7 @@
 #ifndef NUMLIB_TIMELOOP_H
 #define NUMLIB_TIMELOOP_H
 
-#include "MathLib/LinAlg/GlobalMatrixProviders.h"
+#include "AssemblerLib/GlobalMatrixProviders.h"
 #include "TimeDiscretizedODESystem.h"
 #include "NonlinearSolver.h"
 
diff --git a/Tests/NumLib/ODEs.h b/Tests/NumLib/ODEs.h
index b693bf6efdb..352cb5f342f 100644
--- a/Tests/NumLib/ODEs.h
+++ b/Tests/NumLib/ODEs.h
@@ -10,8 +10,8 @@
 #ifndef TESTS_NUMLIB_ODES_H
 #define TESTS_NUMLIB_ODES_H
 
+#include "AssemblerLib/UnifiedMatrixSetters.h"
 #include "MathLib/LinAlg/BLAS.h"
-#include "MathLib/LinAlg/UnifiedMatrixSetters.h"
 #include "NumLib/ODESolver/ODESystem.h"
 
 // debug
diff --git a/Tests/NumLib/TestExtrapolation.cpp b/Tests/NumLib/TestExtrapolation.cpp
index c26a3c7ffce..cb2709ab07f 100644
--- a/Tests/NumLib/TestExtrapolation.cpp
+++ b/Tests/NumLib/TestExtrapolation.cpp
@@ -10,12 +10,12 @@
 #include <random>
 #include <gtest/gtest.h>
 
+#include "AssemblerLib/MatrixProviderUser.h"
+#include "AssemblerLib/MatrixVectorTraits.h"
+#include "AssemblerLib/UnifiedMatrixSetters.h"
 #include "AssemblerLib/VectorMatrixAssembler.h"
 
 #include "MathLib/LinAlg/BLAS.h"
-#include "MathLib/LinAlg/MatrixProviderUser.h"
-#include "MathLib/LinAlg/MatrixVectorTraits.h"
-#include "MathLib/LinAlg/UnifiedMatrixSetters.h"
 
 #include "MeshLib/MeshGenerators/MeshGenerator.h"
 
diff --git a/Tests/testrunner.cpp b/Tests/testrunner.cpp
index 0e9991d41d7..c67c2bfd77b 100644
--- a/Tests/testrunner.cpp
+++ b/Tests/testrunner.cpp
@@ -19,9 +19,9 @@
 
 #include "Applications/ApplicationsLib/LogogSetup.h"
 #include "Applications/ApplicationsLib/LinearSolverLibrarySetup.h"
+#include "AssemblerLib/GlobalMatrixProviders.h"
 #include "BaseLib/BuildInfo.h"
 #include "BaseLib/TemplateLogogFormatterSuppressedGCC.h"
-#include "MathLib/LinAlg/GlobalMatrixProviders.h"
 
 #ifdef OGS_BUILD_GUI
 #include <QApplication>
-- 
GitLab