From a8c924a613e5f9484fb61073bf1f845126a62601 Mon Sep 17 00:00:00 2001 From: Dmitrij Naumov <dmitrij@naumov.de> Date: Fri, 23 Aug 2013 12:42:47 +0200 Subject: [PATCH] Move SerialVectorMatrixBuilder into AssemblerLib. --- .../Serial => AssemblerLib}/SerialDenseVectorMatrixBuilder.h | 2 +- .../Serial => AssemblerLib}/SerialLisVectorMatrixBuilder.h | 2 +- .../Serial => AssemblerLib}/SerialVectorMatrixBuilder.h | 0 Tests/VecMatOnMeshLib/TestSerialLinearSolver.cpp | 2 +- Tests/VecMatOnMeshLib/TestSerialVecMat.cpp | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename {VecMatOnMeshLib/Serial => AssemblerLib}/SerialDenseVectorMatrixBuilder.h (94%) rename {VecMatOnMeshLib/Serial => AssemblerLib}/SerialLisVectorMatrixBuilder.h (92%) rename {VecMatOnMeshLib/Serial => AssemblerLib}/SerialVectorMatrixBuilder.h (100%) diff --git a/VecMatOnMeshLib/Serial/SerialDenseVectorMatrixBuilder.h b/AssemblerLib/SerialDenseVectorMatrixBuilder.h similarity index 94% rename from VecMatOnMeshLib/Serial/SerialDenseVectorMatrixBuilder.h rename to AssemblerLib/SerialDenseVectorMatrixBuilder.h index db00a3c015f..db37bfaccd7 100644 --- a/VecMatOnMeshLib/Serial/SerialDenseVectorMatrixBuilder.h +++ b/AssemblerLib/SerialDenseVectorMatrixBuilder.h @@ -13,7 +13,7 @@ #ifndef ASSEMBLERLIB_SERIALDENSEVECTORMATRIXBUILDER_H_ #define ASSEMBLERLIB_SERIALDENSEVECTORMATRIXBUILDER_H_ -#include "VecMatOnMeshLib/Serial/SerialVectorMatrixBuilder.h" +#include "AssemblerLib/SerialVectorMatrixBuilder.h" #include "MathLib/LinAlg/Dense/DenseVector.h" #include "MathLib/LinAlg/Dense/GlobalDenseMatrix.h" diff --git a/VecMatOnMeshLib/Serial/SerialLisVectorMatrixBuilder.h b/AssemblerLib/SerialLisVectorMatrixBuilder.h similarity index 92% rename from VecMatOnMeshLib/Serial/SerialLisVectorMatrixBuilder.h rename to AssemblerLib/SerialLisVectorMatrixBuilder.h index f9891641b47..43d1a1625d2 100644 --- a/VecMatOnMeshLib/Serial/SerialLisVectorMatrixBuilder.h +++ b/AssemblerLib/SerialLisVectorMatrixBuilder.h @@ -13,7 +13,7 @@ #ifndef ASSEMBLERLIB_SERIALLISVECTORMATRIXBUILDER_H_ #define ASSEMBLERLIB_SERIALLISVECTORMATRIXBUILDER_H_ -#include "VecMatOnMeshLib/Serial/SerialVectorMatrixBuilder.h" +#include "AssemblerLib/SerialVectorMatrixBuilder.h" #include "MathLib/LinAlg/Lis/LisMatrix.h" #include "MathLib/LinAlg/Lis/LisVector.h" diff --git a/VecMatOnMeshLib/Serial/SerialVectorMatrixBuilder.h b/AssemblerLib/SerialVectorMatrixBuilder.h similarity index 100% rename from VecMatOnMeshLib/Serial/SerialVectorMatrixBuilder.h rename to AssemblerLib/SerialVectorMatrixBuilder.h diff --git a/Tests/VecMatOnMeshLib/TestSerialLinearSolver.cpp b/Tests/VecMatOnMeshLib/TestSerialLinearSolver.cpp index f5c8274a00b..d516a23853a 100644 --- a/Tests/VecMatOnMeshLib/TestSerialLinearSolver.cpp +++ b/Tests/VecMatOnMeshLib/TestSerialLinearSolver.cpp @@ -19,6 +19,7 @@ #include <gtest/gtest.h> #include "AssemblerLib/MeshComponentMap.h" +#include "AssemblerLib/SerialDenseVectorMatrixBuilder.h" #include "MathLib/LinAlg/Dense/DenseTools.h" #include "MathLib/LinAlg/Solvers/GaussAlgorithm.h" @@ -33,7 +34,6 @@ #include "MeshLib/Node.h" #include "VecMatOnMeshLib/MeshItemWiseTask/LinearSystemAssembler.h" -#include "VecMatOnMeshLib/Serial/SerialDenseVectorMatrixBuilder.h" #include "../TestTools.h" #include "SteadyDiffusion2DExample1.h" diff --git a/Tests/VecMatOnMeshLib/TestSerialVecMat.cpp b/Tests/VecMatOnMeshLib/TestSerialVecMat.cpp index 9b860ea660f..fdcdfba242a 100644 --- a/Tests/VecMatOnMeshLib/TestSerialVecMat.cpp +++ b/Tests/VecMatOnMeshLib/TestSerialVecMat.cpp @@ -21,6 +21,7 @@ #include <gtest/gtest.h> #include "AssemblerLib/MeshComponentMap.h" +#include "AssemblerLib/SerialDenseVectorMatrixBuilder.h" #include "MathLib/LinAlg/Dense/DenseMatrix.h" #include "MathLib/LinAlg/Dense/DenseTools.h" @@ -37,7 +38,6 @@ #include "VecMatOnMeshLib/MeshItemWiseTask/LocalToGlobalIndexMap.h" #include "VecMatOnMeshLib/MeshItemWiseTask/MatrixAssembler.h" #include "VecMatOnMeshLib/MeshItemWiseTask/VectorAssembler.h" -#include "VecMatOnMeshLib/Serial/SerialDenseVectorMatrixBuilder.h" #include "../TestTools.h" -- GitLab