From c4936192164131b15824ac741a66e653caeca3c8 Mon Sep 17 00:00:00 2001
From: Christoph Lehmann <christoph.lehmann@ufz.de>
Date: Mon, 6 Jun 2016 12:39:58 +0200
Subject: [PATCH] moved traits and setters back to mathlib

---
 MathLib/LinAlg/MatrixVectorTraits.cpp                         | 4 ++--
 NumLib/DOF/SimpleMatrixVectorProvider-impl.h                  | 2 +-
 .../Extrapolation/LocalLinearLeastSquaresExtrapolator-impl.h  | 2 +-
 NumLib/ODESolver/ODESystem.h                                  | 2 +-
 NumLib/ODESolver/TimeDiscretizedODESystem.h                   | 2 +-
 Tests/NumLib/ODEs.h                                           | 2 +-
 Tests/NumLib/TestExtrapolation.cpp                            | 4 ++--
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/MathLib/LinAlg/MatrixVectorTraits.cpp b/MathLib/LinAlg/MatrixVectorTraits.cpp
index 2cdd4d74e1c..2ea58fb7851 100644
--- a/MathLib/LinAlg/MatrixVectorTraits.cpp
+++ b/MathLib/LinAlg/MatrixVectorTraits.cpp
@@ -7,8 +7,8 @@
  *
  */
 
-#include "LocalToGlobalIndexMap.h"
-#include "MatrixProviderUser.h"
+#include "NumLib/DOF/LocalToGlobalIndexMap.h"
+#include "NumLib/DOF/MatrixProviderUser.h"
 #include "MatrixVectorTraits.h"
 
 #ifdef OGS_USE_EIGEN
diff --git a/NumLib/DOF/SimpleMatrixVectorProvider-impl.h b/NumLib/DOF/SimpleMatrixVectorProvider-impl.h
index aa7d09b989c..f35879c2027 100644
--- a/NumLib/DOF/SimpleMatrixVectorProvider-impl.h
+++ b/NumLib/DOF/SimpleMatrixVectorProvider-impl.h
@@ -11,7 +11,7 @@
 #include <logog/include/logog.hpp>
 
 #include "MathLib/LinAlg/BLAS.h"
-#include "MatrixVectorTraits.h"
+#include "MathLib/LinAlg/MatrixVectorTraits.h"
 #include "SimpleMatrixVectorProvider.h"
 
 namespace detail
diff --git a/NumLib/Extrapolation/LocalLinearLeastSquaresExtrapolator-impl.h b/NumLib/Extrapolation/LocalLinearLeastSquaresExtrapolator-impl.h
index c8c35472679..9215984c16f 100644
--- a/NumLib/Extrapolation/LocalLinearLeastSquaresExtrapolator-impl.h
+++ b/NumLib/Extrapolation/LocalLinearLeastSquaresExtrapolator-impl.h
@@ -14,7 +14,7 @@
 
 #include "MathLib/LinAlg/BLAS.h"
 #include "NumLib/Assembler/SerialExecutor.h"
-#include "NumLib/DOF/MatrixVectorTraits.h"
+#include "MathLib/LinAlg/MatrixVectorTraits.h"
 #include "NumLib/Function/Interpolation.h"
 #include "LocalLinearLeastSquaresExtrapolator.h"
 
diff --git a/NumLib/ODESolver/ODESystem.h b/NumLib/ODESolver/ODESystem.h
index 697e198dc1f..eae54d20ba2 100644
--- a/NumLib/ODESolver/ODESystem.h
+++ b/NumLib/ODESolver/ODESystem.h
@@ -11,7 +11,7 @@
 #define NUMLIB_ODESYSTEM_H
 
 #include "NumLib/IndexValueVector.h"
-#include "NumLib/DOF/MatrixVectorTraits.h"
+#include "MathLib/LinAlg/MatrixVectorTraits.h"
 
 #include "Types.h"
 #include "EquationSystem.h"
diff --git a/NumLib/ODESolver/TimeDiscretizedODESystem.h b/NumLib/ODESolver/TimeDiscretizedODESystem.h
index da9b2e81af2..2fccfcd2580 100644
--- a/NumLib/ODESolver/TimeDiscretizedODESystem.h
+++ b/NumLib/ODESolver/TimeDiscretizedODESystem.h
@@ -13,8 +13,8 @@
 #include <memory>
 
 #include "MathLib/LinAlg/ApplyKnownSolution.h"
+#include "MathLib/LinAlg/UnifiedMatrixSetters.h"
 #include "NumLib/IndexValueVector.h"
-#include "NumLib/DOF/UnifiedMatrixSetters.h"
 
 #include "ODESystem.h"
 #include "NonlinearSystem.h"
diff --git a/Tests/NumLib/ODEs.h b/Tests/NumLib/ODEs.h
index bb3c642e6f9..b693bf6efdb 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 "NumLib/DOF/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 c573d4e70c4..c7afac39d8f 100644
--- a/Tests/NumLib/TestExtrapolation.cpp
+++ b/Tests/NumLib/TestExtrapolation.cpp
@@ -11,8 +11,8 @@
 #include <gtest/gtest.h>
 
 #include "NumLib/DOF/MatrixProviderUser.h"
-#include "NumLib/DOF/MatrixVectorTraits.h"
-#include "NumLib/DOF/UnifiedMatrixSetters.h"
+#include "MathLib/LinAlg/MatrixVectorTraits.h"
+#include "MathLib/LinAlg/UnifiedMatrixSetters.h"
 #include "NumLib/Assembler/VectorMatrixAssembler.h"
 
 #include "MathLib/LinAlg/BLAS.h"
-- 
GitLab