From 02e65afb60423eaeacd9d8734a1cad8591755b55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Max=20L=C3=BCbke?= Date: Fri, 12 Aug 2022 15:04:43 +0200 Subject: [PATCH] Move includes --- include/diffusion/BTCSDiffusion.hpp | 2 +- include/{diffusion => grid}/BTCSBoundaryCondition.hpp | 0 src/BTCSBoundaryCondition.cpp | 4 ++-- src/BTCSDiffusion.cpp | 2 +- src/CMakeLists.txt | 7 +++++-- test/testBoundaryCondition.cpp | 2 +- test/testDiffusion.cpp | 2 +- 7 files changed, 11 insertions(+), 8 deletions(-) rename include/{diffusion => grid}/BTCSBoundaryCondition.hpp (100%) diff --git a/include/diffusion/BTCSDiffusion.hpp b/include/diffusion/BTCSDiffusion.hpp index bda244f..1245dcd 100644 --- a/include/diffusion/BTCSDiffusion.hpp +++ b/include/diffusion/BTCSDiffusion.hpp @@ -1,7 +1,7 @@ #ifndef BTCSDIFFUSION_H_ #define BTCSDIFFUSION_H_ -#include "diffusion/BTCSBoundaryCondition.hpp" +#include "grid/BTCSBoundaryCondition.hpp" #include #include diff --git a/include/diffusion/BTCSBoundaryCondition.hpp b/include/grid/BTCSBoundaryCondition.hpp similarity index 100% rename from include/diffusion/BTCSBoundaryCondition.hpp rename to include/grid/BTCSBoundaryCondition.hpp diff --git a/src/BTCSBoundaryCondition.cpp b/src/BTCSBoundaryCondition.cpp index 71402e5..fcfda1a 100644 --- a/src/BTCSBoundaryCondition.cpp +++ b/src/BTCSBoundaryCondition.cpp @@ -2,8 +2,8 @@ #include #include -#include -#include +#include "grid/BTCSBoundaryCondition.hpp" +#include "diffusion/BTCSUtils.hpp" constexpr uint8_t DIM_1D = 2; constexpr uint8_t DIM_2D = 4; diff --git a/src/BTCSDiffusion.cpp b/src/BTCSDiffusion.cpp index d8f5369..232322a 100644 --- a/src/BTCSDiffusion.cpp +++ b/src/BTCSDiffusion.cpp @@ -1,5 +1,5 @@ #include "diffusion/BTCSDiffusion.hpp" -#include "diffusion/BTCSBoundaryCondition.hpp" +#include "grid/BTCSBoundaryCondition.hpp" #include diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ce97675..40a8bc6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,6 +1,9 @@ -add_library(BTCSDiffusion STATIC BTCSDiffusion.cpp BTCSBoundaryCondition.cpp) +add_library(BTCSBoundary STATIC BTCSBoundaryCondition.cpp) +add_library(BTCSDiffusion STATIC BTCSDiffusion.cpp) -target_link_libraries(BTCSDiffusion Eigen3::Eigen) +target_include_directories(BTCSBoundary PUBLIC ../include) + +target_link_libraries(BTCSDiffusion Eigen3::Eigen BTCSBoundary) if(BTCS_USE_OPENMP AND OpenMP_CXX_FOUND) target_link_libraries(BTCSDiffusion OpenMP::OpenMP_CXX) diff --git a/test/testBoundaryCondition.cpp b/test/testBoundaryCondition.cpp index f7fe646..a132aee 100644 --- a/test/testBoundaryCondition.cpp +++ b/test/testBoundaryCondition.cpp @@ -1,4 +1,4 @@ -#include +#include #include using namespace Diffusion; diff --git a/test/testDiffusion.cpp b/test/testDiffusion.cpp index 2865456..c1109eb 100644 --- a/test/testDiffusion.cpp +++ b/test/testDiffusion.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include #include