fix: Add lbt folder to includes and adapt files to not use relative i…

…ncludes, fix bug with initialization of testing fixtures
2b-t · Feb 25, 2024 · c953d43 · c953d43
1 parent 6995102
commit c953d43
Show file tree

Hide file tree

Showing 161 changed files with 409 additions and 415 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,7 +16,6 @@ else()
   set(CMAKE_CXX_FLAGS_RELEASE "-O3")
 endif()
 
-# Set compilation flags
 set(CMAKE_BUILD_TYPE Release)
 set(CMAKE_CXX_STANDARD 17) # The vast majority of code is written for C++17 but certain tests require C++20
 set(CMAKE_CXX_STANDARD_REQUIRED True)
@@ -46,24 +45,26 @@ else()
   message(WARNING "OpenMP not found: Multi-threading disabled!")
 endif()
 
-include_directories(
-  include
-)
-
-# Add executable
 add_library(lbt_obj OBJECT
   src/general/disclaimer.cpp
   src/general/openmp_manager.cpp
   src/general/timer.cpp
   src/general/vtk_utilities.cpp 
   src/geometry/vtk_import.cpp
 )
+target_include_directories(lbt_obj PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+  $<INSTALL_INTERFACE:include>
+)
+
 add_executable(lbt 
   $<TARGET_OBJECTS:lbt_obj>
   src/main.cpp
 )
-
-# Link executable to libraries
+target_include_directories(lbt PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+  $<INSTALL_INTERFACE:include>
+)
 set(LBT_LIBRARIES ${VTK_LIBRARIES} nlohmann_json::nlohmann_json)
 if(OpenMP_CXX_FOUND)
   set(LBT_LIBRARIES ${LBT_LIBRARIES} OpenMP::OpenMP_CXX)
@@ -79,7 +80,6 @@ include(GoogleTest)
 if (NOT GTest_FOUND)
   set(LBT_TEST_LIBRARIES ${LBT_LIBRARIES} gtest pthread)
 
-  # Add executable
   add_library(lbt_test_obj OBJECT
     test/constexpr_math/constexpr_math_test.cpp
     test/continuum/simple_continuum_test.cpp
@@ -109,6 +109,10 @@ if (NOT GTest_FOUND)
     test/converter_test.cpp
     test/simulation_test.cpp
   )
+  target_include_directories(lbt_test_obj PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+    $<INSTALL_INTERFACE:include>
+  )
   add_executable(run_lbt_tests
     $<TARGET_OBJECTS:lbt_obj>
     $<TARGET_OBJECTS:lbt_test_obj>
@@ -123,7 +127,6 @@ if (NOT GTest_FOUND)
   )
   set_tests_properties(${noArgsTests} PROPERTIES TIMEOUT 10)
 
-  # Link executable to libraries
   target_link_libraries(lbt_test_obj ${LBT_TEST_LIBRARIES})
   target_link_libraries(run_lbt_tests ${LBT_TEST_LIBRARIES})
 else()

diff --git a/include/constexpr_math/constexpr_math.hpp b/include/constexpr_math/constexpr_math.hpp
diff --git a/include/lattice/lattices.hpp b/include/lattice/lattices.hpp
diff --git a/include/base_simulation.hpp → include/lbt/base_simulation.hpp b/include/base_simulation.hpp → include/lbt/base_simulation.hpp
@@ -8,7 +8,7 @@
 #define LBT_BASE_SIMULATION
 #pragma once
 
-#include "nlohmann/json.hpp"
+#include <nlohmann/json.hpp>
 
 
 namespace lbt {

diff --git a/include/lbt/constexpr_math/constexpr_math.hpp b/include/lbt/constexpr_math/constexpr_math.hpp
@@ -0,0 +1,23 @@
+/**
+ * \file     constexpr_math.hpp
+ * \mainpage A series of functions that can evaluate to a constant expression and thus
+ *           can make use of evaluation and optimisation at compile time.
+ * \author   Tobit Flatscher (github.com/2b-t)
+*/
+
+#ifndef LBT_CONSTEXPR_MATH
+#define LBT_CONSTEXPR_MATH
+#pragma once
+
+#include "lbt/constexpr_math/detail/abs.hpp"
+#include "lbt/constexpr_math/detail/ceil.hpp"
+#include "lbt/constexpr_math/detail/exp.hpp"
+#include "lbt/constexpr_math/detail/is_inf.hpp"
+#include "lbt/constexpr_math/detail/is_nan.hpp"
+#include "lbt/constexpr_math/detail/is_almost_equal.hpp"
+#include "lbt/constexpr_math/detail/log.hpp"
+#include "lbt/constexpr_math/detail/mathematical_constants.hpp"
+#include "lbt/constexpr_math/detail/pow.hpp"
+#include "lbt/constexpr_math/detail/sqrt.hpp"
+
+#endif // LBT_CONSTEXPR_MATH
diff --git a/include/constexpr_math/detail/abs.hpp → include/lbt/constexpr_math/detail/abs.hpp b/include/constexpr_math/detail/abs.hpp → include/lbt/constexpr_math/detail/abs.hpp
@@ -10,8 +10,8 @@
 
 #include <type_traits>
 
-#include "is_inf.hpp"
-#include "is_nan.hpp"
+#include "lbt/constexpr_math/detail/is_inf.hpp"
+#include "lbt/constexpr_math/detail/is_nan.hpp"
 
 
 namespace lbt {

diff --git a/include/constexpr_math/detail/ceil.hpp → include/lbt/constexpr_math/detail/ceil.hpp b/include/constexpr_math/detail/ceil.hpp → include/lbt/constexpr_math/detail/ceil.hpp
@@ -12,9 +12,9 @@
 #include <limits>
 #include <type_traits>
 
-#include "is_inf.hpp"
-#include "is_nan.hpp"
-#include "is_almost_equal_eps_rel.hpp"
+#include "lbt/constexpr_math/detail/is_inf.hpp"
+#include "lbt/constexpr_math/detail/is_nan.hpp"
+#include "lbt/constexpr_math/detail/is_almost_equal_eps_rel.hpp"
 
 
 namespace lbt {

diff --git a/...ude/constexpr_math/detail/definitions.hpp → ...lbt/constexpr_math/detail/definitions.hpp b/...ude/constexpr_math/detail/definitions.hpp → ...lbt/constexpr_math/detail/definitions.hpp
diff --git a/include/constexpr_math/detail/exp.hpp → include/lbt/constexpr_math/detail/exp.hpp b/include/constexpr_math/detail/exp.hpp → include/lbt/constexpr_math/detail/exp.hpp
@@ -13,13 +13,13 @@
 #include <limits>
 #include <type_traits>
 
-#include "abs.hpp"
-#include "ceil.hpp"
-#include "ipow.hpp"
-#include "is_inf.hpp"
-#include "is_nan.hpp"
-#include "is_almost_equal_eps_rel.hpp"
-#include "mathematical_constants.hpp"
+#include "lbt/constexpr_math/detail/abs.hpp"
+#include "lbt/constexpr_math/detail/ceil.hpp"
+#include "lbt/constexpr_math/detail/ipow.hpp"
+#include "lbt/constexpr_math/detail/is_inf.hpp"
+#include "lbt/constexpr_math/detail/is_nan.hpp"
+#include "lbt/constexpr_math/detail/is_almost_equal_eps_rel.hpp"
+#include "lbt/constexpr_math/detail/mathematical_constants.hpp"
 
 
 namespace lbt {

diff --git a/include/constexpr_math/detail/ipow.hpp → include/lbt/constexpr_math/detail/ipow.hpp b/include/constexpr_math/detail/ipow.hpp → include/lbt/constexpr_math/detail/ipow.hpp
@@ -12,9 +12,9 @@
 #include <limits>
 #include <type_traits>
 
-#include "is_inf.hpp"
-#include "is_nan.hpp"
-#include "is_almost_equal_eps_rel.hpp"
+#include "lbt/constexpr_math/detail/is_inf.hpp"
+#include "lbt/constexpr_math/detail/is_nan.hpp"
+#include "lbt/constexpr_math/detail/is_almost_equal_eps_rel.hpp"
 
 
 namespace lbt {

diff --git a/...constexpr_math/detail/is_almost_equal.hpp → ...constexpr_math/detail/is_almost_equal.hpp b/...constexpr_math/detail/is_almost_equal.hpp → ...constexpr_math/detail/is_almost_equal.hpp
@@ -8,12 +8,12 @@
 #define LBT_CEM_IS_ALMOST_EQUAL
 #pragma once
 
-#include "is_almost_equal_eps_abs.hpp"
-#include "is_almost_equal_eps_rel.hpp"
+#include "lbt/constexpr_math/detail/is_almost_equal_eps_abs.hpp"
+#include "lbt/constexpr_math/detail/is_almost_equal_eps_rel.hpp"
 
 #if __cplusplus >= 202002L
   /// Constexpr ULPS comparison only possible from C++20 onwards
-  #include "is_almost_equal_ulps.hpp"
+  #include "lbt/constexpr_math/detail/is_almost_equal_ulps.hpp"
 #endif
 
 #endif // LBT_CEM_IS_ALMOST_EQUAL
diff --git a/...r_math/detail/is_almost_equal_eps_abs.hpp → ...r_math/detail/is_almost_equal_eps_abs.hpp b/...r_math/detail/is_almost_equal_eps_abs.hpp → ...r_math/detail/is_almost_equal_eps_abs.hpp
@@ -11,7 +11,7 @@
 #include <limits>
 #include <type_traits>
 
-#include "abs.hpp"
+#include "lbt/constexpr_math/detail/abs.hpp"
 
 
 namespace lbt {

diff --git a/...r_math/detail/is_almost_equal_eps_rel.hpp → ...r_math/detail/is_almost_equal_eps_rel.hpp b/...r_math/detail/is_almost_equal_eps_rel.hpp → ...r_math/detail/is_almost_equal_eps_rel.hpp
@@ -12,7 +12,7 @@
 #include <limits>
 #include <type_traits>
 
-#include "abs.hpp"
+#include "lbt/constexpr_math/detail/abs.hpp"
 
 
 namespace lbt {

diff --git a/...expr_math/detail/is_almost_equal_ulps.hpp → ...expr_math/detail/is_almost_equal_ulps.hpp b/...expr_math/detail/is_almost_equal_ulps.hpp → ...expr_math/detail/is_almost_equal_ulps.hpp
diff --git a/include/constexpr_math/detail/is_inf.hpp → include/lbt/constexpr_math/detail/is_inf.hpp b/include/constexpr_math/detail/is_inf.hpp → include/lbt/constexpr_math/detail/is_inf.hpp
diff --git a/include/constexpr_math/detail/is_nan.hpp → include/lbt/constexpr_math/detail/is_nan.hpp b/include/constexpr_math/detail/is_nan.hpp → include/lbt/constexpr_math/detail/is_nan.hpp
diff --git a/include/constexpr_math/detail/log.hpp → include/lbt/constexpr_math/detail/log.hpp b/include/constexpr_math/detail/log.hpp → include/lbt/constexpr_math/detail/log.hpp
@@ -12,12 +12,12 @@
 #include <limits>
 #include <type_traits>
 
-#include "definitions.hpp"
-#include "exp.hpp"
-#include "is_inf.hpp"
-#include "is_nan.hpp"
-#include "is_almost_equal_eps_rel.hpp"
-#include "mathematical_constants.hpp"
+#include "lbt/constexpr_math/detail/definitions.hpp"
+#include "lbt/constexpr_math/detail/exp.hpp"
+#include "lbt/constexpr_math/detail/is_inf.hpp"
+#include "lbt/constexpr_math/detail/is_nan.hpp"
+#include "lbt/constexpr_math/detail/is_almost_equal_eps_rel.hpp"
+#include "lbt/constexpr_math/detail/mathematical_constants.hpp"
 
 
 namespace lbt {

diff --git a/...pr_math/detail/mathematical_constants.hpp → ...pr_math/detail/mathematical_constants.hpp b/...pr_math/detail/mathematical_constants.hpp → ...pr_math/detail/mathematical_constants.hpp
diff --git a/include/constexpr_math/detail/pow.hpp → include/lbt/constexpr_math/detail/pow.hpp b/include/constexpr_math/detail/pow.hpp → include/lbt/constexpr_math/detail/pow.hpp
@@ -12,12 +12,12 @@
 #include <limits>
 #include <type_traits>
 
-#include "exp.hpp"
-#include "ipow.hpp"
-#include "is_inf.hpp"
-#include "is_nan.hpp"
-#include "is_almost_equal_eps_rel.hpp"
-#include "log.hpp"
+#include "lbt/constexpr_math/detail/exp.hpp"
+#include "lbt/constexpr_math/detail/ipow.hpp"
+#include "lbt/constexpr_math/detail/is_inf.hpp"
+#include "lbt/constexpr_math/detail/is_nan.hpp"
+#include "lbt/constexpr_math/detail/is_almost_equal_eps_rel.hpp"
+#include "lbt/constexpr_math/detail/log.hpp"
 
 
 namespace lbt {

diff --git a/include/constexpr_math/detail/sqrt.hpp → include/lbt/constexpr_math/detail/sqrt.hpp b/include/constexpr_math/detail/sqrt.hpp → include/lbt/constexpr_math/detail/sqrt.hpp
@@ -12,10 +12,10 @@
 #include <limits>
 #include <type_traits>
 
-#include "definitions.hpp"
-#include "is_inf.hpp"
-#include "is_nan.hpp"
-#include "is_almost_equal_eps_rel.hpp"
+#include "lbt/constexpr_math/detail/definitions.hpp"
+#include "lbt/constexpr_math/detail/is_inf.hpp"
+#include "lbt/constexpr_math/detail/is_nan.hpp"
+#include "lbt/constexpr_math/detail/is_almost_equal_eps_rel.hpp"
 
 
 namespace lbt {

diff --git a/include/continuum/continuum.hpp → include/lbt/continuum/continuum.hpp b/include/continuum/continuum.hpp → include/lbt/continuum/continuum.hpp
@@ -8,17 +8,17 @@
 #define LBT_CONTINUUM
 #pragma once
 
-#include "../general/use_vtk.hpp"
+#include "lbt/general/use_vtk.hpp"
 
 #ifdef LBT_USE_VTK
-  #include "vtk_continuum.hpp"
+  #include "lbt/continuum/vtk_continuum.hpp"
 
   namespace lbt {
     template <typename T>
     using Continuum = VtkContinuum<T>;
   }
 #else
-  #include "simple_continuum.hpp"
+  #include "lbt/continuum/simple_continuum.hpp"
 
   namespace lbt {
     template <typename T>

diff --git a/include/continuum/continuum_base.hpp → include/lbt/continuum/continuum_base.hpp b/include/continuum/continuum_base.hpp → include/lbt/continuum/continuum_base.hpp
diff --git a/include/continuum/simple_continuum.hpp → include/lbt/continuum/simple_continuum.hpp b/include/continuum/simple_continuum.hpp → include/lbt/continuum/simple_continuum.hpp
@@ -19,9 +19,9 @@
 #include <tuple>
 #include <type_traits>
 
-#include "../general/output_utilities.hpp"
-#include "../general/type_definitions.hpp"
-#include "continuum_base.hpp"
+#include "lbt/continuum/continuum_base.hpp"
+#include "lbt/general/output_utilities.hpp"
+#include "lbt/general/type_definitions.hpp"
 
 
 namespace lbt {

diff --git a/include/continuum/vtk_continuum.hpp → include/lbt/continuum/vtk_continuum.hpp b/include/continuum/vtk_continuum.hpp → include/lbt/continuum/vtk_continuum.hpp
@@ -8,7 +8,7 @@
 #define LBT_VTK_CONTINUUM
 #pragma once
 
-#include "../general/use_vtk.hpp"
+#include "lbt/general/use_vtk.hpp"
 
 #ifdef LBT_USE_VTK
   #include <cassert>
@@ -22,9 +22,9 @@
   #include <vtkPointData.h>
   #include <vtkSmartPointer.h>
 
-  #include "../general/output_utilities.hpp"
-  #include "../general/vtk_utilities.hpp"
-  #include "continuum_base.hpp"
+  #include "lbt/general/output_utilities.hpp"
+  #include "lbt/general/vtk_utilities.hpp"
+  #include "lbt/continuum/continuum_base.hpp"
 
 
   namespace lbt {

diff --git a/include/converter.hpp → include/lbt/converter.hpp b/include/converter.hpp → include/lbt/converter.hpp
@@ -8,7 +8,7 @@
 #define LBT_CONVERTER
 #pragma once
 
-#include "unit/units.hpp"
+#include "lbt/unit/units.hpp"
 
 
 namespace lbt {

diff --git a/include/general/disclaimer.hpp → include/lbt/general/disclaimer.hpp b/include/general/disclaimer.hpp → include/lbt/general/disclaimer.hpp
diff --git a/include/general/openmp_manager.hpp → include/lbt/general/openmp_manager.hpp b/include/general/openmp_manager.hpp → include/lbt/general/openmp_manager.hpp
diff --git a/include/general/output_utilities.hpp → include/lbt/general/output_utilities.hpp b/include/general/output_utilities.hpp → include/lbt/general/output_utilities.hpp
diff --git a/include/general/stream_manager.hpp → include/lbt/general/stream_manager.hpp b/include/general/stream_manager.hpp → include/lbt/general/stream_manager.hpp
diff --git a/include/general/timer.hpp → include/lbt/general/timer.hpp b/include/general/timer.hpp → include/lbt/general/timer.hpp
diff --git a/include/general/tuple_utilities.hpp → include/lbt/general/tuple_utilities.hpp b/include/general/tuple_utilities.hpp → include/lbt/general/tuple_utilities.hpp
diff --git a/include/general/type_definitions.hpp → include/lbt/general/type_definitions.hpp b/include/general/type_definitions.hpp → include/lbt/general/type_definitions.hpp
diff --git a/include/general/use_vtk.hpp → include/lbt/general/use_vtk.hpp b/include/general/use_vtk.hpp → include/lbt/general/use_vtk.hpp
diff --git a/include/general/vtk_utilities.hpp → include/lbt/general/vtk_utilities.hpp b/include/general/vtk_utilities.hpp → include/lbt/general/vtk_utilities.hpp
@@ -8,7 +8,7 @@
 #define LBT_VTK_UTILITITES
 #pragma once
 
-#include "use_vtk.hpp"
+#include "lbt/general/use_vtk.hpp"
 
 #ifdef LBT_USE_VTK
   #include <filesystem>

diff --git a/include/geometry/vtk_import.hpp → include/lbt/geometry/vtk_import.hpp b/include/geometry/vtk_import.hpp → include/lbt/geometry/vtk_import.hpp
@@ -9,7 +9,7 @@
 #define LBT_VTK_IMPORT
 #pragma once
 
-#include "../general/use_vtk.hpp"
+#include "lbt/general/use_vtk.hpp"
 
 #ifdef LBT_USE_VTK
   #include <array>
@@ -23,7 +23,7 @@
   #include <vtkPolyData.h>
   #include <vtkSmartPointer.h>
 
-  #include "../general/vtk_utilities.hpp"
+  #include "lbt/general/vtk_utilities.hpp"
 
 
   namespace lbt {

diff --git a/include/lattice/D2Q9.hpp → include/lbt/lattice/D2Q9.hpp b/include/lattice/D2Q9.hpp → include/lbt/lattice/D2Q9.hpp
@@ -13,8 +13,8 @@
 #include <cstdint>
 #include <type_traits>
 
-#include "../constexpr_math/constexpr_math.hpp"
-#include "../general/type_definitions.hpp"
+#include "lbt/constexpr_math/constexpr_math.hpp"
+#include "lbt/general/type_definitions.hpp"
 
 
 namespace lbt {