From 40519a339caa1ba8a7351a9f39ce4f821d89b47b Mon Sep 17 00:00:00 2001 From: Max Luebke Date: Fri, 25 Mar 2022 12:52:49 +0100 Subject: [PATCH] Restructure project dir --- app/Rcpp-BTCS-1d.cpp | 4 ++-- app/Rcpp-BTCS-2d.cpp | 4 ++-- app/Rcpp-interface.cpp | 4 ++-- app/main_1D.cpp | 5 +++-- app/main_2D.cpp | 4 ++-- app/main_2D_mdl.cpp | 4 ++-- {src => include/diffusion}/BTCSDiffusion.hpp | 0 {src => include/diffusion}/BoundaryCondition.hpp | 0 src/BTCSDiffusion.cpp | 4 ++-- src/CMakeLists.txt | 7 ++++--- 10 files changed, 19 insertions(+), 17 deletions(-) rename {src => include/diffusion}/BTCSDiffusion.hpp (100%) rename {src => include/diffusion}/BoundaryCondition.hpp (100%) diff --git a/app/Rcpp-BTCS-1d.cpp b/app/Rcpp-BTCS-1d.cpp index fc54856..8949d85 100644 --- a/app/Rcpp-BTCS-1d.cpp +++ b/app/Rcpp-BTCS-1d.cpp @@ -1,5 +1,5 @@ -#include "../src/BTCSDiffusion.hpp" // for BTCSDiffusion, BTCSDiffusion::BC_DIRICHLET -#include "../src/BoundaryCondition.hpp" +#include "../include/diffusion/BTCSDiffusion.hpp" +#include "../include/diffusion/BoundaryCondition.hpp" #include // for copy, max #include #include diff --git a/app/Rcpp-BTCS-2d.cpp b/app/Rcpp-BTCS-2d.cpp index efa3119..3a5e404 100644 --- a/app/Rcpp-BTCS-2d.cpp +++ b/app/Rcpp-BTCS-2d.cpp @@ -1,5 +1,5 @@ -#include "../src/BTCSDiffusion.hpp" // for BTCSDiffusion, BTCSDiffusion::BC_DIRICHLET -#include "../src/BoundaryCondition.hpp" +#include "../include/diffusion/BTCSDiffusion.hpp" +#include "../include/diffusion/BoundaryCondition.hpp" #include // for copy, max #include #include diff --git a/app/Rcpp-interface.cpp b/app/Rcpp-interface.cpp index fc54856..8949d85 100644 --- a/app/Rcpp-interface.cpp +++ b/app/Rcpp-interface.cpp @@ -1,5 +1,5 @@ -#include "../src/BTCSDiffusion.hpp" // for BTCSDiffusion, BTCSDiffusion::BC_DIRICHLET -#include "../src/BoundaryCondition.hpp" +#include "../include/diffusion/BTCSDiffusion.hpp" +#include "../include/diffusion/BoundaryCondition.hpp" #include // for copy, max #include #include diff --git a/app/main_1D.cpp b/app/main_1D.cpp index f7ec59b..b2423f2 100644 --- a/app/main_1D.cpp +++ b/app/main_1D.cpp @@ -1,5 +1,6 @@ -#include "BTCSDiffusion.hpp" // for BTCSDiffusion, BTCSDiffusion::BC_DIRICHLET -#include "BoundaryCondition.hpp" +#include +#include + #include // for copy, max #include #include diff --git a/app/main_2D.cpp b/app/main_2D.cpp index e67004c..6a35bba 100644 --- a/app/main_2D.cpp +++ b/app/main_2D.cpp @@ -1,5 +1,5 @@ -#include "BTCSDiffusion.hpp" // for BTCSDiffusion, BTCSDiffusion::BC_DIRICHLET -#include "BoundaryCondition.hpp" +#include +#include #include // for copy, max #include #include diff --git a/app/main_2D_mdl.cpp b/app/main_2D_mdl.cpp index 900741b..c040cfe 100644 --- a/app/main_2D_mdl.cpp +++ b/app/main_2D_mdl.cpp @@ -1,5 +1,5 @@ -#include "BTCSDiffusion.hpp" // for BTCSDiffusion, BTCSDiffusion::BC_DIRICHLET -#include "BoundaryCondition.hpp" +#include +#include #include // for copy, max #include #include diff --git a/src/BTCSDiffusion.hpp b/include/diffusion/BTCSDiffusion.hpp similarity index 100% rename from src/BTCSDiffusion.hpp rename to include/diffusion/BTCSDiffusion.hpp diff --git a/src/BoundaryCondition.hpp b/include/diffusion/BoundaryCondition.hpp similarity index 100% rename from src/BoundaryCondition.hpp rename to include/diffusion/BoundaryCondition.hpp diff --git a/src/BTCSDiffusion.cpp b/src/BTCSDiffusion.cpp index a09a5e0..8fdd020 100644 --- a/src/BTCSDiffusion.cpp +++ b/src/BTCSDiffusion.cpp @@ -1,5 +1,5 @@ -#include "BTCSDiffusion.hpp" -#include "BoundaryCondition.hpp" +#include "diffusion/BTCSDiffusion.hpp" +#include "diffusion/BoundaryCondition.hpp" #include diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index da8de73..30a0f62 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,6 +1,7 @@ -find_package(OpenMP) +set(HEADER_LIST "${Diffusion_SOURCE_DIR}/include/diffusion/BTCSDiffusion.hpp" + "${Diffusion_SOURCE_DIR}/include/diffusion/BoundaryCondition.hpp") -add_library(diffusion OBJECT BTCSDiffusion.cpp BTCSDiffusion.hpp) +add_library(diffusion STATIC BTCSDiffusion.cpp ${HEADER_LIST}) target_link_libraries(diffusion Eigen3::Eigen) @@ -8,4 +9,4 @@ if(USE_OPENMP AND OpenMP_CXX_FOUND) target_link_libraries(diffusion OpenMP::OpenMP_CXX) endif() -target_include_directories(diffusion PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +target_include_directories(diffusion PUBLIC ../include)