From c953d430fd8161fce4c6dc927dc062c771b77344 Mon Sep 17 00:00:00 2001 From: Tobit Flatscher <53856473+2b-t@users.noreply.github.com> Date: Sun, 25 Feb 2024 19:23:05 +0000 Subject: [PATCH] fix: Add lbt folder to includes and adapt files to not use relative includes, fix bug with initialization of testing fixtures --- CMakeLists.txt | 23 +++++++++------- include/constexpr_math/constexpr_math.hpp | 23 ---------------- include/lattice/lattices.hpp | 16 ------------ include/{ => lbt}/base_simulation.hpp | 2 +- include/lbt/constexpr_math/constexpr_math.hpp | 23 ++++++++++++++++ .../{ => lbt}/constexpr_math/detail/abs.hpp | 4 +-- .../{ => lbt}/constexpr_math/detail/ceil.hpp | 6 ++--- .../constexpr_math/detail/definitions.hpp | 0 .../{ => lbt}/constexpr_math/detail/exp.hpp | 14 +++++----- .../{ => lbt}/constexpr_math/detail/ipow.hpp | 6 ++--- .../constexpr_math/detail/is_almost_equal.hpp | 6 ++--- .../detail/is_almost_equal_eps_abs.hpp | 2 +- .../detail/is_almost_equal_eps_rel.hpp | 2 +- .../detail/is_almost_equal_ulps.hpp | 0 .../constexpr_math/detail/is_inf.hpp | 0 .../constexpr_math/detail/is_nan.hpp | 0 .../{ => lbt}/constexpr_math/detail/log.hpp | 12 ++++----- .../detail/mathematical_constants.hpp | 0 .../{ => lbt}/constexpr_math/detail/pow.hpp | 12 ++++----- .../{ => lbt}/constexpr_math/detail/sqrt.hpp | 8 +++--- include/{ => lbt}/continuum/continuum.hpp | 6 ++--- .../{ => lbt}/continuum/continuum_base.hpp | 0 .../{ => lbt}/continuum/simple_continuum.hpp | 6 ++--- include/{ => lbt}/continuum/vtk_continuum.hpp | 8 +++--- include/{ => lbt}/converter.hpp | 2 +- include/{ => lbt}/general/disclaimer.hpp | 0 include/{ => lbt}/general/openmp_manager.hpp | 0 .../{ => lbt}/general/output_utilities.hpp | 0 include/{ => lbt}/general/stream_manager.hpp | 0 include/{ => lbt}/general/timer.hpp | 0 include/{ => lbt}/general/tuple_utilities.hpp | 0 .../{ => lbt}/general/type_definitions.hpp | 0 include/{ => lbt}/general/use_vtk.hpp | 0 include/{ => lbt}/general/vtk_utilities.hpp | 2 +- include/{ => lbt}/geometry/vtk_import.hpp | 4 +-- include/{ => lbt}/lattice/D2Q9.hpp | 4 +-- include/{ => lbt}/lattice/D3Q15.hpp | 4 +-- include/{ => lbt}/lattice/D3Q19.hpp | 4 +-- include/{ => lbt}/lattice/D3Q27.hpp | 4 +-- include/lbt/lattice/lattices.hpp | 16 ++++++++++++ include/{ => lbt}/material/detail/air.hpp | 6 ++--- .../material/detail/carbon_dioxide.hpp | 6 ++--- .../{ => lbt}/material/detail/hydrogen.hpp | 6 ++--- .../{ => lbt}/material/detail/ideal_gas.hpp | 6 ++--- include/{ => lbt}/material/detail/oxygen.hpp | 6 ++--- include/{ => lbt}/material/detail/state.hpp | 2 +- .../material/detail/states_table.hpp | 6 ++--- include/{ => lbt}/material/detail/water.hpp | 6 ++--- include/{ => lbt}/material/materials.hpp | 11 ++++---- .../{ => lbt}/population/aa_population.hpp | 6 ++--- .../{ => lbt}/population/ab_population.hpp | 4 +-- include/{ => lbt}/population/boundary/guo.hpp | 8 +++--- .../{ => lbt}/population/boundary/normal.hpp | 2 +- .../population/boundary/orientation.hpp | 0 .../{ => lbt}/population/boundary/type.hpp | 0 .../{ => lbt}/population/collision/bgk.hpp | 0 .../population/collision_operators.hpp | 2 +- .../population/indexing/aa_pattern.hpp | 4 +-- .../population/indexing/indexing.hpp | 3 ++- include/{ => lbt}/population/population.hpp | 2 +- include/{ => lbt}/simulation.hpp | 16 ++++++------ .../{ => lbt}/unit/characteristic_numbers.hpp | 2 +- .../unit/detail/amount_of_substance.hpp | 2 +- .../detail/amount_of_substance_literals.hpp | 2 +- include/{ => lbt}/unit/detail/area.hpp | 2 +- .../{ => lbt}/unit/detail/area_literals.hpp | 8 +++--- include/{ => lbt}/unit/detail/density.hpp | 2 +- .../unit/detail/dynamic_viscosity.hpp | 2 +- .../detail/dynamic_viscosity_literals.hpp | 12 ++++----- .../unit/detail/kinematic_viscosity.hpp | 2 +- .../detail/kinematic_viscosity_literals.hpp | 12 ++++----- include/{ => lbt}/unit/detail/length.hpp | 2 +- .../{ => lbt}/unit/detail/length_literals.hpp | 2 +- include/{ => lbt}/unit/detail/mass.hpp | 2 +- .../{ => lbt}/unit/detail/mass_literals.hpp | 2 +- include/{ => lbt}/unit/detail/molar_mass.hpp | 2 +- .../unit/detail/molar_mass_literals.hpp | 12 ++++----- include/{ => lbt}/unit/detail/operators.hpp | 26 +++++++++---------- include/{ => lbt}/unit/detail/pressure.hpp | 2 +- .../unit/detail/pressure_literals.hpp | 2 +- .../{ => lbt}/unit/detail/reynolds_number.hpp | 6 ++--- include/{ => lbt}/unit/detail/temperature.hpp | 2 +- .../unit/detail/temperature_literals.hpp | 2 +- include/{ => lbt}/unit/detail/time.hpp | 2 +- .../{ => lbt}/unit/detail/time_literals.hpp | 2 +- include/{ => lbt}/unit/detail/unit_base.hpp | 0 include/{ => lbt}/unit/detail/velocity.hpp | 2 +- .../unit/detail/velocity_literals.hpp | 12 ++++----- include/{ => lbt}/unit/detail/volume.hpp | 2 +- .../{ => lbt}/unit/detail/volume_literals.hpp | 8 +++--- include/lbt/unit/literals.hpp | 24 +++++++++++++++++ include/lbt/unit/units.hpp | 26 +++++++++++++++++++ include/unit/literals.hpp | 24 ----------------- include/unit/units.hpp | 26 ------------------- src/general/disclaimer.cpp | 2 +- src/general/openmp_manager.cpp | 2 +- src/general/timer.cpp | 2 +- src/general/vtk_utilities.cpp | 4 +-- src/geometry/vtk_import.cpp | 6 ++--- src/main.cpp | 8 +++--- src/simple_main.cpp | 18 ++++++------- test/constexpr_math/detail/abs_test.hpp | 2 +- test/constexpr_math/detail/ceil_test.hpp | 2 +- test/constexpr_math/detail/exp_test.hpp | 4 +-- .../detail/is_almost_equal_eps_abs_test.hpp | 2 +- .../detail/is_almost_equal_eps_rel_test.hpp | 2 +- .../detail/is_almost_equal_ulps_test.hpp | 2 +- test/constexpr_math/detail/is_inf_test.hpp | 2 +- test/constexpr_math/detail/is_nan_test.hpp | 2 +- test/constexpr_math/detail/log_test.hpp | 10 +++---- .../detail/mathematical_constants_test.hpp | 2 +- test/constexpr_math/detail/pow_test.hpp | 8 +++--- test/constexpr_math/detail/sqrt_test.hpp | 6 ++--- test/continuum/continuum_base_test.hpp | 2 +- test/continuum/simple_continuum_test.cpp | 4 +-- test/continuum/vtk_continuum_test.cpp | 6 ++--- test/converter_test.cpp | 6 ++--- test/general/disclaimer_test.cpp | 2 +- test/general/openmp_manager_test.cpp | 2 +- test/general/output_utilities_test.cpp | 2 +- test/general/stream_manager_test.cpp | 2 +- test/general/timer_test.cpp | 2 +- test/general/tuple_utilities_test.cpp | 2 +- test/general/type_definitions_test.cpp | 2 +- test/general/vtk_utilities_test.cpp | 4 +-- test/geometry/vtk_import_test.cpp | 4 +-- test/lattice/lattice_test.cpp | 2 +- test/lattice/lattice_testing_types.hpp | 10 +++---- test/material/detail/air_test.hpp | 2 +- test/material/detail/carbon_dioxide_test.hpp | 2 +- test/material/detail/hydrogen_test.hpp | 2 +- test/material/detail/oxygen_test.hpp | 2 +- test/material/detail/states_table_test.hpp | 2 +- test/material/detail/water_test.hpp | 6 ++--- test/population/aa_population_test.cpp | 2 +- test/population/ab_population_test.cpp | 2 +- test/population/boundary/guo_test.cpp | 2 +- test/population/boundary/normal_test.cpp | 2 +- test/population/boundary/orientation_test.cpp | 2 +- test/population/indexing/aa_pattern_test.cpp | 11 +++----- test/population/indexing/indexing_test.cpp | 11 +++----- test/population/population_base_test.hpp | 9 +++---- test/simulation_test.cpp | 2 +- test/testing_utilities/array_utilities.hpp | 4 +-- test/testing_utilities/testing_utilities.hpp | 2 +- .../amount_of_substance_literals_test.hpp | 4 +-- test/unit/detail/area_literals_test.hpp | 4 +-- .../dynamic_viscosity_literals_test.hpp | 4 +-- .../kinematic_viscosity_literals_test.hpp | 4 +-- test/unit/detail/length_literals_test.hpp | 4 +-- test/unit/detail/mass_literals_test.hpp | 4 +-- test/unit/detail/molar_mass_literals_test.hpp | 4 +-- test/unit/detail/operators_test.hpp | 2 +- test/unit/detail/pressure_literals_test.hpp | 4 +-- test/unit/detail/reynolds_number_test.hpp | 8 +++--- .../unit/detail/temperature_literals_test.hpp | 4 +-- test/unit/detail/time_literals_test.hpp | 4 +-- test/unit/detail/unit_base_test.hpp | 4 +-- test/unit/detail/unit_literals_helper.hpp | 2 +- test/unit/detail/velocity_literals_test.hpp | 4 +-- test/unit/detail/volume_literals_test.hpp | 4 +-- 161 files changed, 409 insertions(+), 415 deletions(-) delete mode 100755 include/constexpr_math/constexpr_math.hpp delete mode 100755 include/lattice/lattices.hpp rename include/{ => lbt}/base_simulation.hpp (96%) create mode 100755 include/lbt/constexpr_math/constexpr_math.hpp rename include/{ => lbt}/constexpr_math/detail/abs.hpp (90%) rename include/{ => lbt}/constexpr_math/detail/ceil.hpp (88%) rename include/{ => lbt}/constexpr_math/detail/definitions.hpp (100%) rename include/{ => lbt}/constexpr_math/detail/exp.hpp (84%) rename include/{ => lbt}/constexpr_math/detail/ipow.hpp (95%) rename include/{ => lbt}/constexpr_math/detail/is_almost_equal.hpp (67%) rename include/{ => lbt}/constexpr_math/detail/is_almost_equal_eps_abs.hpp (96%) rename include/{ => lbt}/constexpr_math/detail/is_almost_equal_eps_rel.hpp (97%) rename include/{ => lbt}/constexpr_math/detail/is_almost_equal_ulps.hpp (100%) rename include/{ => lbt}/constexpr_math/detail/is_inf.hpp (100%) rename include/{ => lbt}/constexpr_math/detail/is_nan.hpp (100%) rename include/{ => lbt}/constexpr_math/detail/log.hpp (90%) rename include/{ => lbt}/constexpr_math/detail/mathematical_constants.hpp (100%) rename include/{ => lbt}/constexpr_math/detail/pow.hpp (93%) rename include/{ => lbt}/constexpr_math/detail/sqrt.hpp (92%) rename include/{ => lbt}/continuum/continuum.hpp (77%) rename include/{ => lbt}/continuum/continuum_base.hpp (100%) rename include/{ => lbt}/continuum/simple_continuum.hpp (99%) rename include/{ => lbt}/continuum/vtk_continuum.hpp (98%) rename include/{ => lbt}/converter.hpp (99%) rename include/{ => lbt}/general/disclaimer.hpp (100%) rename include/{ => lbt}/general/openmp_manager.hpp (100%) rename include/{ => lbt}/general/output_utilities.hpp (100%) rename include/{ => lbt}/general/stream_manager.hpp (100%) rename include/{ => lbt}/general/timer.hpp (100%) rename include/{ => lbt}/general/tuple_utilities.hpp (100%) rename include/{ => lbt}/general/type_definitions.hpp (100%) rename include/{ => lbt}/general/use_vtk.hpp (100%) rename include/{ => lbt}/general/vtk_utilities.hpp (97%) rename include/{ => lbt}/geometry/vtk_import.hpp (99%) rename include/{ => lbt}/lattice/D2Q9.hpp (97%) rename include/{ => lbt}/lattice/D3Q15.hpp (96%) rename include/{ => lbt}/lattice/D3Q19.hpp (96%) rename include/{ => lbt}/lattice/D3Q27.hpp (98%) create mode 100755 include/lbt/lattice/lattices.hpp rename include/{ => lbt}/material/detail/air.hpp (89%) rename include/{ => lbt}/material/detail/carbon_dioxide.hpp (90%) rename include/{ => lbt}/material/detail/hydrogen.hpp (89%) rename include/{ => lbt}/material/detail/ideal_gas.hpp (97%) rename include/{ => lbt}/material/detail/oxygen.hpp (89%) rename include/{ => lbt}/material/detail/state.hpp (98%) rename include/{ => lbt}/material/detail/states_table.hpp (98%) rename include/{ => lbt}/material/detail/water.hpp (96%) rename include/{ => lbt}/material/materials.hpp (56%) rename include/{ => lbt}/population/aa_population.hpp (96%) rename include/{ => lbt}/population/ab_population.hpp (95%) rename include/{ => lbt}/population/boundary/guo.hpp (95%) rename include/{ => lbt}/population/boundary/normal.hpp (97%) rename include/{ => lbt}/population/boundary/orientation.hpp (100%) rename include/{ => lbt}/population/boundary/type.hpp (100%) rename include/{ => lbt}/population/collision/bgk.hpp (100%) rename include/{ => lbt}/population/collision_operators.hpp (81%) rename include/{ => lbt}/population/indexing/aa_pattern.hpp (98%) rename include/{ => lbt}/population/indexing/indexing.hpp (98%) rename include/{ => lbt}/population/population.hpp (86%) rename include/{ => lbt}/simulation.hpp (98%) rename include/{ => lbt}/unit/characteristic_numbers.hpp (87%) rename include/{ => lbt}/unit/detail/amount_of_substance.hpp (96%) rename include/{ => lbt}/unit/detail/amount_of_substance_literals.hpp (95%) rename include/{ => lbt}/unit/detail/area.hpp (95%) rename include/{ => lbt}/unit/detail/area_literals.hpp (91%) rename include/{ => lbt}/unit/detail/density.hpp (95%) rename include/{ => lbt}/unit/detail/dynamic_viscosity.hpp (96%) rename include/{ => lbt}/unit/detail/dynamic_viscosity_literals.hpp (90%) rename include/{ => lbt}/unit/detail/kinematic_viscosity.hpp (96%) rename include/{ => lbt}/unit/detail/kinematic_viscosity_literals.hpp (86%) rename include/{ => lbt}/unit/detail/length.hpp (95%) rename include/{ => lbt}/unit/detail/length_literals.hpp (98%) rename include/{ => lbt}/unit/detail/mass.hpp (95%) rename include/{ => lbt}/unit/detail/mass_literals.hpp (97%) rename include/{ => lbt}/unit/detail/molar_mass.hpp (95%) rename include/{ => lbt}/unit/detail/molar_mass_literals.hpp (80%) rename include/{ => lbt}/unit/detail/operators.hpp (91%) rename include/{ => lbt}/unit/detail/pressure.hpp (95%) rename include/{ => lbt}/unit/detail/pressure_literals.hpp (98%) rename include/{ => lbt}/unit/detail/reynolds_number.hpp (96%) rename include/{ => lbt}/unit/detail/temperature.hpp (96%) rename include/{ => lbt}/unit/detail/temperature_literals.hpp (96%) rename include/{ => lbt}/unit/detail/time.hpp (95%) rename include/{ => lbt}/unit/detail/time_literals.hpp (98%) rename include/{ => lbt}/unit/detail/unit_base.hpp (100%) rename include/{ => lbt}/unit/detail/velocity.hpp (95%) rename include/{ => lbt}/unit/detail/velocity_literals.hpp (88%) rename include/{ => lbt}/unit/detail/volume.hpp (95%) rename include/{ => lbt}/unit/detail/volume_literals.hpp (91%) create mode 100755 include/lbt/unit/literals.hpp create mode 100755 include/lbt/unit/units.hpp delete mode 100755 include/unit/literals.hpp delete mode 100755 include/unit/units.hpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 328320d..89cf21b 100755 --- 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,11 +45,6 @@ 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 @@ -58,12 +52,19 @@ add_library(lbt_obj OBJECT src/general/vtk_utilities.cpp src/geometry/vtk_import.cpp ) +target_include_directories(lbt_obj PUBLIC + $ + $ +) + add_executable(lbt $ src/main.cpp ) - -# Link executable to libraries +target_include_directories(lbt PUBLIC + $ + $ +) 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 + $ + $ + ) add_executable(run_lbt_tests $ $ @@ -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 deleted file mode 100755 index 83cde30..0000000 --- a/include/constexpr_math/constexpr_math.hpp +++ /dev/null @@ -1,23 +0,0 @@ -/** - * \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 "detail/abs.hpp" -#include "detail/ceil.hpp" -#include "detail/exp.hpp" -#include "detail/is_inf.hpp" -#include "detail/is_nan.hpp" -#include "detail/is_almost_equal.hpp" -#include "detail/log.hpp" -#include "detail/mathematical_constants.hpp" -#include "detail/pow.hpp" -#include "detail/sqrt.hpp" - -#endif // LBT_CONSTEXPR_MATH diff --git a/include/lattice/lattices.hpp b/include/lattice/lattices.hpp deleted file mode 100755 index 33a0084..0000000 --- a/include/lattice/lattices.hpp +++ /dev/null @@ -1,16 +0,0 @@ -/** - * \file lattice.hpp - * \mainpage Super-header for different lattices - * \author Tobit Flatscher (github.com/2b-t) -*/ - -#ifndef LBT_LATTICE -#define LBT_LATTICE -#pragma once - -#include "D2Q9.hpp" -#include "D3Q15.hpp" -#include "D3Q19.hpp" -#include "D3Q27.hpp" - -#endif // LBT_LATTICE diff --git a/include/base_simulation.hpp b/include/lbt/base_simulation.hpp similarity index 96% rename from include/base_simulation.hpp rename to include/lbt/base_simulation.hpp index d74cafb..a3b2d97 100755 --- a/include/base_simulation.hpp +++ b/include/lbt/base_simulation.hpp @@ -8,7 +8,7 @@ #define LBT_BASE_SIMULATION #pragma once -#include "nlohmann/json.hpp" +#include namespace lbt { diff --git a/include/lbt/constexpr_math/constexpr_math.hpp b/include/lbt/constexpr_math/constexpr_math.hpp new file mode 100755 index 0000000..62545b3 --- /dev/null +++ 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 b/include/lbt/constexpr_math/detail/abs.hpp similarity index 90% rename from include/constexpr_math/detail/abs.hpp rename to include/lbt/constexpr_math/detail/abs.hpp index 2780412..4dfa255 100755 --- a/include/constexpr_math/detail/abs.hpp +++ b/include/lbt/constexpr_math/detail/abs.hpp @@ -10,8 +10,8 @@ #include -#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 b/include/lbt/constexpr_math/detail/ceil.hpp similarity index 88% rename from include/constexpr_math/detail/ceil.hpp rename to include/lbt/constexpr_math/detail/ceil.hpp index 6d9e8e6..2deb50b 100755 --- a/include/constexpr_math/detail/ceil.hpp +++ b/include/lbt/constexpr_math/detail/ceil.hpp @@ -12,9 +12,9 @@ #include #include -#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/include/constexpr_math/detail/definitions.hpp b/include/lbt/constexpr_math/detail/definitions.hpp similarity index 100% rename from include/constexpr_math/detail/definitions.hpp rename to include/lbt/constexpr_math/detail/definitions.hpp diff --git a/include/constexpr_math/detail/exp.hpp b/include/lbt/constexpr_math/detail/exp.hpp similarity index 84% rename from include/constexpr_math/detail/exp.hpp rename to include/lbt/constexpr_math/detail/exp.hpp index a5264be..0ede43b 100755 --- a/include/constexpr_math/detail/exp.hpp +++ b/include/lbt/constexpr_math/detail/exp.hpp @@ -13,13 +13,13 @@ #include #include -#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 b/include/lbt/constexpr_math/detail/ipow.hpp similarity index 95% rename from include/constexpr_math/detail/ipow.hpp rename to include/lbt/constexpr_math/detail/ipow.hpp index d326fee..6da69ab 100755 --- a/include/constexpr_math/detail/ipow.hpp +++ b/include/lbt/constexpr_math/detail/ipow.hpp @@ -12,9 +12,9 @@ #include #include -#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/include/constexpr_math/detail/is_almost_equal.hpp b/include/lbt/constexpr_math/detail/is_almost_equal.hpp similarity index 67% rename from include/constexpr_math/detail/is_almost_equal.hpp rename to include/lbt/constexpr_math/detail/is_almost_equal.hpp index f43ddbd..94c1fd3 100755 --- a/include/constexpr_math/detail/is_almost_equal.hpp +++ b/include/lbt/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/include/constexpr_math/detail/is_almost_equal_eps_abs.hpp b/include/lbt/constexpr_math/detail/is_almost_equal_eps_abs.hpp similarity index 96% rename from include/constexpr_math/detail/is_almost_equal_eps_abs.hpp rename to include/lbt/constexpr_math/detail/is_almost_equal_eps_abs.hpp index 9c03cd5..d370f0a 100755 --- a/include/constexpr_math/detail/is_almost_equal_eps_abs.hpp +++ b/include/lbt/constexpr_math/detail/is_almost_equal_eps_abs.hpp @@ -11,7 +11,7 @@ #include #include -#include "abs.hpp" +#include "lbt/constexpr_math/detail/abs.hpp" namespace lbt { diff --git a/include/constexpr_math/detail/is_almost_equal_eps_rel.hpp b/include/lbt/constexpr_math/detail/is_almost_equal_eps_rel.hpp similarity index 97% rename from include/constexpr_math/detail/is_almost_equal_eps_rel.hpp rename to include/lbt/constexpr_math/detail/is_almost_equal_eps_rel.hpp index 51387ff..a452602 100755 --- a/include/constexpr_math/detail/is_almost_equal_eps_rel.hpp +++ b/include/lbt/constexpr_math/detail/is_almost_equal_eps_rel.hpp @@ -12,7 +12,7 @@ #include #include -#include "abs.hpp" +#include "lbt/constexpr_math/detail/abs.hpp" namespace lbt { diff --git a/include/constexpr_math/detail/is_almost_equal_ulps.hpp b/include/lbt/constexpr_math/detail/is_almost_equal_ulps.hpp similarity index 100% rename from include/constexpr_math/detail/is_almost_equal_ulps.hpp rename to include/lbt/constexpr_math/detail/is_almost_equal_ulps.hpp diff --git a/include/constexpr_math/detail/is_inf.hpp b/include/lbt/constexpr_math/detail/is_inf.hpp similarity index 100% rename from include/constexpr_math/detail/is_inf.hpp rename to include/lbt/constexpr_math/detail/is_inf.hpp diff --git a/include/constexpr_math/detail/is_nan.hpp b/include/lbt/constexpr_math/detail/is_nan.hpp similarity index 100% rename from include/constexpr_math/detail/is_nan.hpp rename to include/lbt/constexpr_math/detail/is_nan.hpp diff --git a/include/constexpr_math/detail/log.hpp b/include/lbt/constexpr_math/detail/log.hpp similarity index 90% rename from include/constexpr_math/detail/log.hpp rename to include/lbt/constexpr_math/detail/log.hpp index 4506018..1e5301f 100755 --- a/include/constexpr_math/detail/log.hpp +++ b/include/lbt/constexpr_math/detail/log.hpp @@ -12,12 +12,12 @@ #include #include -#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/include/constexpr_math/detail/mathematical_constants.hpp b/include/lbt/constexpr_math/detail/mathematical_constants.hpp similarity index 100% rename from include/constexpr_math/detail/mathematical_constants.hpp rename to include/lbt/constexpr_math/detail/mathematical_constants.hpp diff --git a/include/constexpr_math/detail/pow.hpp b/include/lbt/constexpr_math/detail/pow.hpp similarity index 93% rename from include/constexpr_math/detail/pow.hpp rename to include/lbt/constexpr_math/detail/pow.hpp index 29d295f..90f3c5e 100755 --- a/include/constexpr_math/detail/pow.hpp +++ b/include/lbt/constexpr_math/detail/pow.hpp @@ -12,12 +12,12 @@ #include #include -#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 b/include/lbt/constexpr_math/detail/sqrt.hpp similarity index 92% rename from include/constexpr_math/detail/sqrt.hpp rename to include/lbt/constexpr_math/detail/sqrt.hpp index 06c26ec..5a33862 100755 --- a/include/constexpr_math/detail/sqrt.hpp +++ b/include/lbt/constexpr_math/detail/sqrt.hpp @@ -12,10 +12,10 @@ #include #include -#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 b/include/lbt/continuum/continuum.hpp similarity index 77% rename from include/continuum/continuum.hpp rename to include/lbt/continuum/continuum.hpp index 94ba3fe..9efbe2f 100755 --- a/include/continuum/continuum.hpp +++ b/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 using Continuum = VtkContinuum; } #else - #include "simple_continuum.hpp" + #include "lbt/continuum/simple_continuum.hpp" namespace lbt { template diff --git a/include/continuum/continuum_base.hpp b/include/lbt/continuum/continuum_base.hpp similarity index 100% rename from include/continuum/continuum_base.hpp rename to include/lbt/continuum/continuum_base.hpp diff --git a/include/continuum/simple_continuum.hpp b/include/lbt/continuum/simple_continuum.hpp similarity index 99% rename from include/continuum/simple_continuum.hpp rename to include/lbt/continuum/simple_continuum.hpp index 21af4e8..f2e7611 100755 --- a/include/continuum/simple_continuum.hpp +++ b/include/lbt/continuum/simple_continuum.hpp @@ -19,9 +19,9 @@ #include #include -#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 b/include/lbt/continuum/vtk_continuum.hpp similarity index 98% rename from include/continuum/vtk_continuum.hpp rename to include/lbt/continuum/vtk_continuum.hpp index b3ba9db..c8238eb 100755 --- a/include/continuum/vtk_continuum.hpp +++ b/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 @@ -22,9 +22,9 @@ #include #include - #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 b/include/lbt/converter.hpp similarity index 99% rename from include/converter.hpp rename to include/lbt/converter.hpp index d78a679..4f16fd6 100755 --- a/include/converter.hpp +++ b/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 b/include/lbt/general/disclaimer.hpp similarity index 100% rename from include/general/disclaimer.hpp rename to include/lbt/general/disclaimer.hpp diff --git a/include/general/openmp_manager.hpp b/include/lbt/general/openmp_manager.hpp similarity index 100% rename from include/general/openmp_manager.hpp rename to include/lbt/general/openmp_manager.hpp diff --git a/include/general/output_utilities.hpp b/include/lbt/general/output_utilities.hpp similarity index 100% rename from include/general/output_utilities.hpp rename to include/lbt/general/output_utilities.hpp diff --git a/include/general/stream_manager.hpp b/include/lbt/general/stream_manager.hpp similarity index 100% rename from include/general/stream_manager.hpp rename to include/lbt/general/stream_manager.hpp diff --git a/include/general/timer.hpp b/include/lbt/general/timer.hpp similarity index 100% rename from include/general/timer.hpp rename to include/lbt/general/timer.hpp diff --git a/include/general/tuple_utilities.hpp b/include/lbt/general/tuple_utilities.hpp similarity index 100% rename from include/general/tuple_utilities.hpp rename to include/lbt/general/tuple_utilities.hpp diff --git a/include/general/type_definitions.hpp b/include/lbt/general/type_definitions.hpp similarity index 100% rename from include/general/type_definitions.hpp rename to include/lbt/general/type_definitions.hpp diff --git a/include/general/use_vtk.hpp b/include/lbt/general/use_vtk.hpp similarity index 100% rename from include/general/use_vtk.hpp rename to include/lbt/general/use_vtk.hpp diff --git a/include/general/vtk_utilities.hpp b/include/lbt/general/vtk_utilities.hpp similarity index 97% rename from include/general/vtk_utilities.hpp rename to include/lbt/general/vtk_utilities.hpp index ce159c6..94943e7 100755 --- a/include/general/vtk_utilities.hpp +++ b/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 diff --git a/include/geometry/vtk_import.hpp b/include/lbt/geometry/vtk_import.hpp similarity index 99% rename from include/geometry/vtk_import.hpp rename to include/lbt/geometry/vtk_import.hpp index a0899b6..b8070ef 100755 --- a/include/geometry/vtk_import.hpp +++ b/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 @@ -23,7 +23,7 @@ #include #include - #include "../general/vtk_utilities.hpp" + #include "lbt/general/vtk_utilities.hpp" namespace lbt { diff --git a/include/lattice/D2Q9.hpp b/include/lbt/lattice/D2Q9.hpp similarity index 97% rename from include/lattice/D2Q9.hpp rename to include/lbt/lattice/D2Q9.hpp index f5cfb54..0fe76ec 100755 --- a/include/lattice/D2Q9.hpp +++ b/include/lbt/lattice/D2Q9.hpp @@ -13,8 +13,8 @@ #include #include -#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 { diff --git a/include/lattice/D3Q15.hpp b/include/lbt/lattice/D3Q15.hpp similarity index 96% rename from include/lattice/D3Q15.hpp rename to include/lbt/lattice/D3Q15.hpp index ef4af69..0472a4c 100755 --- a/include/lattice/D3Q15.hpp +++ b/include/lbt/lattice/D3Q15.hpp @@ -13,8 +13,8 @@ #include #include -#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 { diff --git a/include/lattice/D3Q19.hpp b/include/lbt/lattice/D3Q19.hpp similarity index 96% rename from include/lattice/D3Q19.hpp rename to include/lbt/lattice/D3Q19.hpp index fd1162e..aa3e61a 100755 --- a/include/lattice/D3Q19.hpp +++ b/include/lbt/lattice/D3Q19.hpp @@ -13,8 +13,8 @@ #include #include -#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 { diff --git a/include/lattice/D3Q27.hpp b/include/lbt/lattice/D3Q27.hpp similarity index 98% rename from include/lattice/D3Q27.hpp rename to include/lbt/lattice/D3Q27.hpp index 63e7ae1..d28e2a9 100755 --- a/include/lattice/D3Q27.hpp +++ b/include/lbt/lattice/D3Q27.hpp @@ -13,8 +13,8 @@ #include #include -#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 { diff --git a/include/lbt/lattice/lattices.hpp b/include/lbt/lattice/lattices.hpp new file mode 100755 index 0000000..2b84470 --- /dev/null +++ b/include/lbt/lattice/lattices.hpp @@ -0,0 +1,16 @@ +/** + * \file lattices.hpp + * \mainpage Super-header for different lattices + * \author Tobit Flatscher (github.com/2b-t) +*/ + +#ifndef LBT_LATTICES +#define LBT_LATTICES +#pragma once + +#include "lbt/lattice/D2Q9.hpp" +#include "lbt/lattice/D3Q15.hpp" +#include "lbt/lattice/D3Q19.hpp" +#include "lbt/lattice/D3Q27.hpp" + +#endif // LBT_LATTICES diff --git a/include/material/detail/air.hpp b/include/lbt/material/detail/air.hpp similarity index 89% rename from include/material/detail/air.hpp rename to include/lbt/material/detail/air.hpp index ad7040b..a8ed161 100644 --- a/include/material/detail/air.hpp +++ b/include/lbt/material/detail/air.hpp @@ -8,9 +8,9 @@ #define LBT_MATERIAL_AIR #pragma once -#include "../../unit/literals.hpp" -#include "../../unit/units.hpp" -#include "ideal_gas.hpp" +#include "lbt/material/detail/ideal_gas.hpp" +#include "lbt/unit/literals.hpp" +#include "lbt/unit/units.hpp" namespace lbt { diff --git a/include/material/detail/carbon_dioxide.hpp b/include/lbt/material/detail/carbon_dioxide.hpp similarity index 90% rename from include/material/detail/carbon_dioxide.hpp rename to include/lbt/material/detail/carbon_dioxide.hpp index 75ae322..34cb5b3 100644 --- a/include/material/detail/carbon_dioxide.hpp +++ b/include/lbt/material/detail/carbon_dioxide.hpp @@ -8,9 +8,9 @@ #define LBT_MATERIAL_CARBON_DIOXIDE #pragma once -#include "../../unit/literals.hpp" -#include "../../unit/units.hpp" -#include "ideal_gas.hpp" +#include "lbt/material/detail/ideal_gas.hpp" +#include "lbt/unit/literals.hpp" +#include "lbt/unit/units.hpp" namespace lbt { diff --git a/include/material/detail/hydrogen.hpp b/include/lbt/material/detail/hydrogen.hpp similarity index 89% rename from include/material/detail/hydrogen.hpp rename to include/lbt/material/detail/hydrogen.hpp index 0aa1088..f620a56 100644 --- a/include/material/detail/hydrogen.hpp +++ b/include/lbt/material/detail/hydrogen.hpp @@ -8,9 +8,9 @@ #define LBT_MATERIAL_HYDROGEN #pragma once -#include "../../unit/literals.hpp" -#include "../../unit/units.hpp" -#include "ideal_gas.hpp" +#include "lbt/material/detail/ideal_gas.hpp" +#include "lbt/unit/literals.hpp" +#include "lbt/unit/units.hpp" namespace lbt { diff --git a/include/material/detail/ideal_gas.hpp b/include/lbt/material/detail/ideal_gas.hpp similarity index 97% rename from include/material/detail/ideal_gas.hpp rename to include/lbt/material/detail/ideal_gas.hpp index 734f6d6..83f71b6 100644 --- a/include/material/detail/ideal_gas.hpp +++ b/include/lbt/material/detail/ideal_gas.hpp @@ -8,9 +8,9 @@ #define LBT_MATERIAL_IDEAL_GAS #pragma once -#include "../../constexpr_math/constexpr_math.hpp" -#include "../../unit/literals.hpp" -#include "../../unit/units.hpp" +#include "lbt/constexpr_math/constexpr_math.hpp" +#include "lbt/unit/literals.hpp" +#include "lbt/unit/units.hpp" namespace lbt { diff --git a/include/material/detail/oxygen.hpp b/include/lbt/material/detail/oxygen.hpp similarity index 89% rename from include/material/detail/oxygen.hpp rename to include/lbt/material/detail/oxygen.hpp index 0e38064..5f93e48 100644 --- a/include/material/detail/oxygen.hpp +++ b/include/lbt/material/detail/oxygen.hpp @@ -8,9 +8,9 @@ #define LBT_MATERIAL_OXYGEN #pragma once -#include "../../unit/literals.hpp" -#include "../../unit/units.hpp" -#include "ideal_gas.hpp" +#include "lbt/material/detail/ideal_gas.hpp" +#include "lbt/unit/literals.hpp" +#include "lbt/unit/units.hpp" namespace lbt { diff --git a/include/material/detail/state.hpp b/include/lbt/material/detail/state.hpp similarity index 98% rename from include/material/detail/state.hpp rename to include/lbt/material/detail/state.hpp index 9c5ec14..b56b977 100644 --- a/include/material/detail/state.hpp +++ b/include/lbt/material/detail/state.hpp @@ -8,7 +8,7 @@ #define LBT_MATERIAL_STATE #pragma once -#include "../../unit/units.hpp" +#include "lbt/unit/units.hpp" namespace lbt { diff --git a/include/material/detail/states_table.hpp b/include/lbt/material/detail/states_table.hpp similarity index 98% rename from include/material/detail/states_table.hpp rename to include/lbt/material/detail/states_table.hpp index 26604f0..feddb9e 100644 --- a/include/material/detail/states_table.hpp +++ b/include/lbt/material/detail/states_table.hpp @@ -12,9 +12,9 @@ #include #include -#include "../../constexpr_math/constexpr_math.hpp" -#include "../../unit/units.hpp" -#include "state.hpp" +#include "lbt/constexpr_math/constexpr_math.hpp" +#include "lbt/material/detail/state.hpp" +#include "lbt/unit/units.hpp" namespace lbt { diff --git a/include/material/detail/water.hpp b/include/lbt/material/detail/water.hpp similarity index 96% rename from include/material/detail/water.hpp rename to include/lbt/material/detail/water.hpp index 3175c7c..2a349d3 100644 --- a/include/material/detail/water.hpp +++ b/include/lbt/material/detail/water.hpp @@ -8,9 +8,9 @@ #define LBT_MATERIAL_WATER #pragma once -#include "../../constexpr_math/constexpr_math.hpp" -#include "../../unit/literals.hpp" -#include "../../unit/units.hpp" +#include "lbt/constexpr_math/constexpr_math.hpp" +#include "lbt/unit/literals.hpp" +#include "lbt/unit/units.hpp" namespace lbt { diff --git a/include/material/materials.hpp b/include/lbt/material/materials.hpp similarity index 56% rename from include/material/materials.hpp rename to include/lbt/material/materials.hpp index 08cd397..f9ba124 100644 --- a/include/material/materials.hpp +++ b/include/lbt/material/materials.hpp @@ -8,11 +8,10 @@ #define LBT_MATERIALS #pragma once -#include "detail/air.hpp" -#include "detail/carbon_dioxide.hpp" -#include "detail/hydrogen.hpp" -#include "detail/oxygen.hpp" -#include "detail/water.hpp" - +#include "lbt/material/detail/air.hpp" +#include "lbt/material/detail/carbon_dioxide.hpp" +#include "lbt/material/detail/hydrogen.hpp" +#include "lbt/material/detail/oxygen.hpp" +#include "lbt/material/detail/water.hpp" #endif // LBT_MATERIALS diff --git a/include/population/aa_population.hpp b/include/lbt/population/aa_population.hpp similarity index 96% rename from include/population/aa_population.hpp rename to include/lbt/population/aa_population.hpp index a5644c8..1e4a89f 100755 --- a/include/population/aa_population.hpp +++ b/include/lbt/population/aa_population.hpp @@ -12,9 +12,9 @@ #include #include -#include "../general/type_definitions.hpp" -#include "indexing/aa_pattern.hpp" -#include "indexing/indexing.hpp" +#include "lbt/general/type_definitions.hpp" +#include "lbt/population/indexing/aa_pattern.hpp" +#include "lbt/population/indexing/indexing.hpp" namespace lbt { diff --git a/include/population/ab_population.hpp b/include/lbt/population/ab_population.hpp similarity index 95% rename from include/population/ab_population.hpp rename to include/lbt/population/ab_population.hpp index 0224f55..8353300 100755 --- a/include/population/ab_population.hpp +++ b/include/lbt/population/ab_population.hpp @@ -12,8 +12,8 @@ #include #include -#include "../general/type_definitions.hpp" -#include "indexing/indexing.hpp" +#include "lbt/general/type_definitions.hpp" +#include "lbt/population/indexing/indexing.hpp" namespace lbt { diff --git a/include/population/boundary/guo.hpp b/include/lbt/population/boundary/guo.hpp similarity index 95% rename from include/population/boundary/guo.hpp rename to include/lbt/population/boundary/guo.hpp index 1fd2e2f..cf0a860 100755 --- a/include/population/boundary/guo.hpp +++ b/include/lbt/population/boundary/guo.hpp @@ -10,10 +10,10 @@ #include -#include "../../general/type_definitions.hpp" -#include "normal.hpp" -#include "orientation.hpp" -#include "type.hpp" +#include "lbt/general/type_definitions.hpp" +#include "lbt/population/boundary/normal.hpp" +#include "lbt/population/boundary/orientation.hpp" +#include "lbt/population/boundary/type.hpp" namespace lbt { diff --git a/include/population/boundary/normal.hpp b/include/lbt/population/boundary/normal.hpp similarity index 97% rename from include/population/boundary/normal.hpp rename to include/lbt/population/boundary/normal.hpp index 31bb8f6..e0574e9 100755 --- a/include/population/boundary/normal.hpp +++ b/include/lbt/population/boundary/normal.hpp @@ -11,7 +11,7 @@ #include #include -#include "orientation.hpp" +#include "lbt/population/boundary/orientation.hpp" namespace lbt { diff --git a/include/population/boundary/orientation.hpp b/include/lbt/population/boundary/orientation.hpp similarity index 100% rename from include/population/boundary/orientation.hpp rename to include/lbt/population/boundary/orientation.hpp diff --git a/include/population/boundary/type.hpp b/include/lbt/population/boundary/type.hpp similarity index 100% rename from include/population/boundary/type.hpp rename to include/lbt/population/boundary/type.hpp diff --git a/include/population/collision/bgk.hpp b/include/lbt/population/collision/bgk.hpp similarity index 100% rename from include/population/collision/bgk.hpp rename to include/lbt/population/collision/bgk.hpp diff --git a/include/population/collision_operators.hpp b/include/lbt/population/collision_operators.hpp similarity index 81% rename from include/population/collision_operators.hpp rename to include/lbt/population/collision_operators.hpp index 0842ca1..e60ab4f 100755 --- a/include/population/collision_operators.hpp +++ b/include/lbt/population/collision_operators.hpp @@ -8,7 +8,7 @@ #define LBT_COLLISION_OPERATORS #pragma once -#include "collision/bgk.hpp" +#include "lbt/population/collision/bgk.hpp" #endif // LBT_COLLISION_OPERATORS diff --git a/include/population/indexing/aa_pattern.hpp b/include/lbt/population/indexing/aa_pattern.hpp similarity index 98% rename from include/population/indexing/aa_pattern.hpp rename to include/lbt/population/indexing/aa_pattern.hpp index c793135..25f0252 100755 --- a/include/population/indexing/aa_pattern.hpp +++ b/include/lbt/population/indexing/aa_pattern.hpp @@ -21,8 +21,8 @@ #include #include -#include "../../general/type_definitions.hpp" -#include "indexing.hpp" +#include "lbt/general/type_definitions.hpp" +#include "lbt/population/indexing/indexing.hpp" namespace lbt { diff --git a/include/population/indexing/indexing.hpp b/include/lbt/population/indexing/indexing.hpp similarity index 98% rename from include/population/indexing/indexing.hpp rename to include/lbt/population/indexing/indexing.hpp index fbef2a4..ba0d176 100755 --- a/include/population/indexing/indexing.hpp +++ b/include/lbt/population/indexing/indexing.hpp @@ -12,7 +12,7 @@ #include #include -#include "../../general/type_definitions.hpp" +#include "lbt/general/type_definitions.hpp" namespace lbt { @@ -62,6 +62,7 @@ namespace lbt { */ constexpr Indexing(std::int32_t const NX, std::int32_t const NY, std::int32_t const NZ) noexcept : NX{NX}, NY{NY}, NZ{NZ} { + std::cout << NZ << std::endl; assert((LT::DIM == 2) ? (NZ == 1) : true); // Two-dimensional lattice with NZ != 1 return; } diff --git a/include/population/population.hpp b/include/lbt/population/population.hpp similarity index 86% rename from include/population/population.hpp rename to include/lbt/population/population.hpp index b6a60a6..a1225f0 100755 --- a/include/population/population.hpp +++ b/include/lbt/population/population.hpp @@ -10,7 +10,7 @@ #include -#include "aa_population.hpp" +#include "lbt/population/aa_population.hpp" namespace lbt { diff --git a/include/simulation.hpp b/include/lbt/simulation.hpp similarity index 98% rename from include/simulation.hpp rename to include/lbt/simulation.hpp index 119e809..27c6522 100755 --- a/include/simulation.hpp +++ b/include/lbt/simulation.hpp @@ -19,14 +19,14 @@ #include -#include "continuum/continuum.hpp" -/*#include "population/collision/collision.hpp" -#include "population/population.hpp" -#include "general/openmp_manager.hpp" -#include "general/output_utilities.hpp"*/ -#include "general/vtk_utilities.hpp" -#include "geometry/vtk_import.hpp" -#include "base_simulation.hpp" +#include "lbt/continuum/continuum.hpp" +/*#include "lbt/population/collision/collision.hpp" +#include "lbt/population/population.hpp" +#include "lbt/general/openmp_manager.hpp" +#include "lbt/general/output_utilities.hpp"*/ +#include "lbt/general/vtk_utilities.hpp" +#include "lbt/geometry/vtk_import.hpp" +#include "lbt/base_simulation.hpp" namespace lbt { diff --git a/include/unit/characteristic_numbers.hpp b/include/lbt/unit/characteristic_numbers.hpp similarity index 87% rename from include/unit/characteristic_numbers.hpp rename to include/lbt/unit/characteristic_numbers.hpp index c25528f..5870c51 100755 --- a/include/unit/characteristic_numbers.hpp +++ b/include/lbt/unit/characteristic_numbers.hpp @@ -8,7 +8,7 @@ #define LBT_CHARACTERISTIC_NUMBERS #pragma once -#include "detail/reynolds_number.hpp" +#include "lbt/unit/detail/reynolds_number.hpp" #endif // LBT_CHARACTERISTIC_NUMBERS diff --git a/include/unit/detail/amount_of_substance.hpp b/include/lbt/unit/detail/amount_of_substance.hpp similarity index 96% rename from include/unit/detail/amount_of_substance.hpp rename to include/lbt/unit/detail/amount_of_substance.hpp index fb8d925..283b238 100644 --- a/include/unit/detail/amount_of_substance.hpp +++ b/include/lbt/unit/detail/amount_of_substance.hpp @@ -8,7 +8,7 @@ #define LBT_UNIT_AMOUNT_OF_SUBSTANCE #pragma once -#include "unit_base.hpp" +#include "lbt/unit/detail/unit_base.hpp" namespace lbt { diff --git a/include/unit/detail/amount_of_substance_literals.hpp b/include/lbt/unit/detail/amount_of_substance_literals.hpp similarity index 95% rename from include/unit/detail/amount_of_substance_literals.hpp rename to include/lbt/unit/detail/amount_of_substance_literals.hpp index 7e7c8e2..d6450c1 100644 --- a/include/unit/detail/amount_of_substance_literals.hpp +++ b/include/lbt/unit/detail/amount_of_substance_literals.hpp @@ -8,7 +8,7 @@ #define LBT_UNIT_AMOUNT_OF_SUBSTANCES_LITERALS #pragma once -#include "amount_of_substance.hpp" +#include "lbt/unit/detail/amount_of_substance.hpp" namespace lbt { diff --git a/include/unit/detail/area.hpp b/include/lbt/unit/detail/area.hpp similarity index 95% rename from include/unit/detail/area.hpp rename to include/lbt/unit/detail/area.hpp index 92373eb..255c927 100644 --- a/include/unit/detail/area.hpp +++ b/include/lbt/unit/detail/area.hpp @@ -8,7 +8,7 @@ #define LBT_UNIT_AREA #pragma once -#include "unit_base.hpp" +#include "lbt/unit/detail/unit_base.hpp" namespace lbt { diff --git a/include/unit/detail/area_literals.hpp b/include/lbt/unit/detail/area_literals.hpp similarity index 91% rename from include/unit/detail/area_literals.hpp rename to include/lbt/unit/detail/area_literals.hpp index afe5ff0..ad0acf4 100644 --- a/include/unit/detail/area_literals.hpp +++ b/include/lbt/unit/detail/area_literals.hpp @@ -8,10 +8,10 @@ #define LBT_UNIT_AREA_LITERALS #pragma once -#include "area.hpp" -#include "length.hpp" -#include "length_literals.hpp" -#include "operators.hpp" +#include "lbt/unit/detail/area.hpp" +#include "lbt/unit/detail/length.hpp" +#include "lbt/unit/detail/length_literals.hpp" +#include "lbt/unit/detail/operators.hpp" namespace lbt { diff --git a/include/unit/detail/density.hpp b/include/lbt/unit/detail/density.hpp similarity index 95% rename from include/unit/detail/density.hpp rename to include/lbt/unit/detail/density.hpp index f34f093..b0417c6 100644 --- a/include/unit/detail/density.hpp +++ b/include/lbt/unit/detail/density.hpp @@ -8,7 +8,7 @@ #define LBT_UNIT_DENSITY #pragma once -#include "unit_base.hpp" +#include "lbt/unit/detail/unit_base.hpp" namespace lbt { diff --git a/include/unit/detail/dynamic_viscosity.hpp b/include/lbt/unit/detail/dynamic_viscosity.hpp similarity index 96% rename from include/unit/detail/dynamic_viscosity.hpp rename to include/lbt/unit/detail/dynamic_viscosity.hpp index 70622e8..4992db1 100644 --- a/include/unit/detail/dynamic_viscosity.hpp +++ b/include/lbt/unit/detail/dynamic_viscosity.hpp @@ -8,7 +8,7 @@ #define LBT_UNIT_DYNAMIC_VISCOSITY #pragma once -#include "unit_base.hpp" +#include "lbt/unit/detail/unit_base.hpp" namespace lbt { diff --git a/include/unit/detail/dynamic_viscosity_literals.hpp b/include/lbt/unit/detail/dynamic_viscosity_literals.hpp similarity index 90% rename from include/unit/detail/dynamic_viscosity_literals.hpp rename to include/lbt/unit/detail/dynamic_viscosity_literals.hpp index 843696d..9520d73 100644 --- a/include/unit/detail/dynamic_viscosity_literals.hpp +++ b/include/lbt/unit/detail/dynamic_viscosity_literals.hpp @@ -8,12 +8,12 @@ #define LBT_UNIT_DYNAMIC_VISCOSITY_LITERALS #pragma once -#include "dynamic_viscosity.hpp" -#include "operators.hpp" -#include "pressure.hpp" -#include "pressure_literals.hpp" -#include "time.hpp" -#include "time_literals.hpp" +#include "lbt/unit/detail/dynamic_viscosity.hpp" +#include "lbt/unit/detail/operators.hpp" +#include "lbt/unit/detail/pressure.hpp" +#include "lbt/unit/detail/pressure_literals.hpp" +#include "lbt/unit/detail/time.hpp" +#include "lbt/unit/detail/time_literals.hpp" namespace lbt { diff --git a/include/unit/detail/kinematic_viscosity.hpp b/include/lbt/unit/detail/kinematic_viscosity.hpp similarity index 96% rename from include/unit/detail/kinematic_viscosity.hpp rename to include/lbt/unit/detail/kinematic_viscosity.hpp index 72b152a..50b3173 100644 --- a/include/unit/detail/kinematic_viscosity.hpp +++ b/include/lbt/unit/detail/kinematic_viscosity.hpp @@ -8,7 +8,7 @@ #define LBT_UNIT_KINEMATIC_VISCOSITY #pragma once -#include "unit_base.hpp" +#include "lbt/unit/detail/unit_base.hpp" namespace lbt { diff --git a/include/unit/detail/kinematic_viscosity_literals.hpp b/include/lbt/unit/detail/kinematic_viscosity_literals.hpp similarity index 86% rename from include/unit/detail/kinematic_viscosity_literals.hpp rename to include/lbt/unit/detail/kinematic_viscosity_literals.hpp index 853f638..ea4913d 100644 --- a/include/unit/detail/kinematic_viscosity_literals.hpp +++ b/include/lbt/unit/detail/kinematic_viscosity_literals.hpp @@ -8,12 +8,12 @@ #define LBT_UNIT_KINEMATIC_VISCOSITY_LITERALS #pragma once -#include "kinematic_viscosity.hpp" -#include "length.hpp" -#include "length_literals.hpp" -#include "operators.hpp" -#include "time.hpp" -#include "time_literals.hpp" +#include "lbt/unit/detail/kinematic_viscosity.hpp" +#include "lbt/unit/detail/length.hpp" +#include "lbt/unit/detail/length_literals.hpp" +#include "lbt/unit/detail/operators.hpp" +#include "lbt/unit/detail/time.hpp" +#include "lbt/unit/detail/time_literals.hpp" namespace lbt { diff --git a/include/unit/detail/length.hpp b/include/lbt/unit/detail/length.hpp similarity index 95% rename from include/unit/detail/length.hpp rename to include/lbt/unit/detail/length.hpp index 8c9cec1..414fb7f 100644 --- a/include/unit/detail/length.hpp +++ b/include/lbt/unit/detail/length.hpp @@ -8,7 +8,7 @@ #define LBT_UNIT_LENGTH #pragma once -#include "unit_base.hpp" +#include "lbt/unit/detail/unit_base.hpp" namespace lbt { diff --git a/include/unit/detail/length_literals.hpp b/include/lbt/unit/detail/length_literals.hpp similarity index 98% rename from include/unit/detail/length_literals.hpp rename to include/lbt/unit/detail/length_literals.hpp index f7709ff..d2d2bad 100644 --- a/include/unit/detail/length_literals.hpp +++ b/include/lbt/unit/detail/length_literals.hpp @@ -8,7 +8,7 @@ #define LBT_UNIT_LENGTH_LITERALS #pragma once -#include "length.hpp" +#include "lbt/unit/detail/length.hpp" namespace lbt { diff --git a/include/unit/detail/mass.hpp b/include/lbt/unit/detail/mass.hpp similarity index 95% rename from include/unit/detail/mass.hpp rename to include/lbt/unit/detail/mass.hpp index 2f06866..1389f3f 100644 --- a/include/unit/detail/mass.hpp +++ b/include/lbt/unit/detail/mass.hpp @@ -8,7 +8,7 @@ #define LBT_UNIT_MASS #pragma once -#include "unit_base.hpp" +#include "lbt/unit/detail/unit_base.hpp" namespace lbt { diff --git a/include/unit/detail/mass_literals.hpp b/include/lbt/unit/detail/mass_literals.hpp similarity index 97% rename from include/unit/detail/mass_literals.hpp rename to include/lbt/unit/detail/mass_literals.hpp index abbd924..dc0af53 100644 --- a/include/unit/detail/mass_literals.hpp +++ b/include/lbt/unit/detail/mass_literals.hpp @@ -8,7 +8,7 @@ #define LBT_UNIT_MASS_LITERALS #pragma once -#include "mass.hpp" +#include "lbt/unit/detail/mass.hpp" namespace lbt { diff --git a/include/unit/detail/molar_mass.hpp b/include/lbt/unit/detail/molar_mass.hpp similarity index 95% rename from include/unit/detail/molar_mass.hpp rename to include/lbt/unit/detail/molar_mass.hpp index 20c0766..0f196da 100644 --- a/include/unit/detail/molar_mass.hpp +++ b/include/lbt/unit/detail/molar_mass.hpp @@ -8,7 +8,7 @@ #define LBT_UNIT_MOLAR_MASS #pragma once -#include "unit_base.hpp" +#include "lbt/unit/detail/unit_base.hpp" namespace lbt { diff --git a/include/unit/detail/molar_mass_literals.hpp b/include/lbt/unit/detail/molar_mass_literals.hpp similarity index 80% rename from include/unit/detail/molar_mass_literals.hpp rename to include/lbt/unit/detail/molar_mass_literals.hpp index 9043f66..0d033e0 100644 --- a/include/unit/detail/molar_mass_literals.hpp +++ b/include/lbt/unit/detail/molar_mass_literals.hpp @@ -8,12 +8,12 @@ #define LBT_UNIT_MOLAR_MASS_LITERALS #pragma once -#include "amount_of_substance.hpp" -#include "amount_of_substance_literals.hpp" -#include "mass.hpp" -#include "mass_literals.hpp" -#include "molar_mass.hpp" -#include "operators.hpp" +#include "lbt/unit/detail/amount_of_substance.hpp" +#include "lbt/unit/detail/amount_of_substance_literals.hpp" +#include "lbt/unit/detail/mass.hpp" +#include "lbt/unit/detail/mass_literals.hpp" +#include "lbt/unit/detail/molar_mass.hpp" +#include "lbt/unit/detail/operators.hpp" namespace lbt { diff --git a/include/unit/detail/operators.hpp b/include/lbt/unit/detail/operators.hpp similarity index 91% rename from include/unit/detail/operators.hpp rename to include/lbt/unit/detail/operators.hpp index 657e0eb..abd9365 100644 --- a/include/unit/detail/operators.hpp +++ b/include/lbt/unit/detail/operators.hpp @@ -8,19 +8,19 @@ #define LBT_UNIT_OPERATORS #pragma once -#include "amount_of_substance.hpp" -#include "area.hpp" -#include "density.hpp" -#include "dynamic_viscosity.hpp" -#include "kinematic_viscosity.hpp" -#include "length.hpp" -#include "mass.hpp" -#include "molar_mass.hpp" -#include "pressure.hpp" -#include "time.hpp" -#include "unit_base.hpp" -#include "velocity.hpp" -#include "volume.hpp" +#include "lbt/unit/detail/amount_of_substance.hpp" +#include "lbt/unit/detail/area.hpp" +#include "lbt/unit/detail/density.hpp" +#include "lbt/unit/detail/dynamic_viscosity.hpp" +#include "lbt/unit/detail/kinematic_viscosity.hpp" +#include "lbt/unit/detail/length.hpp" +#include "lbt/unit/detail/mass.hpp" +#include "lbt/unit/detail/molar_mass.hpp" +#include "lbt/unit/detail/pressure.hpp" +#include "lbt/unit/detail/time.hpp" +#include "lbt/unit/detail/unit_base.hpp" +#include "lbt/unit/detail/velocity.hpp" +#include "lbt/unit/detail/volume.hpp" namespace lbt { diff --git a/include/unit/detail/pressure.hpp b/include/lbt/unit/detail/pressure.hpp similarity index 95% rename from include/unit/detail/pressure.hpp rename to include/lbt/unit/detail/pressure.hpp index 9eb1df7..2e0f498 100644 --- a/include/unit/detail/pressure.hpp +++ b/include/lbt/unit/detail/pressure.hpp @@ -8,7 +8,7 @@ #define LBT_UNIT_PRESSURE #pragma once -#include "unit_base.hpp" +#include "lbt/unit/detail/unit_base.hpp" namespace lbt { diff --git a/include/unit/detail/pressure_literals.hpp b/include/lbt/unit/detail/pressure_literals.hpp similarity index 98% rename from include/unit/detail/pressure_literals.hpp rename to include/lbt/unit/detail/pressure_literals.hpp index 47b0cbe..01adad7 100644 --- a/include/unit/detail/pressure_literals.hpp +++ b/include/lbt/unit/detail/pressure_literals.hpp @@ -8,7 +8,7 @@ #define LBT_UNIT_PRESSURE_LITERALS #pragma once -#include "pressure.hpp" +#include "lbt/unit/detail/pressure.hpp" namespace lbt { diff --git a/include/unit/detail/reynolds_number.hpp b/include/lbt/unit/detail/reynolds_number.hpp similarity index 96% rename from include/unit/detail/reynolds_number.hpp rename to include/lbt/unit/detail/reynolds_number.hpp index c4032d3..0d1cd01 100644 --- a/include/unit/detail/reynolds_number.hpp +++ b/include/lbt/unit/detail/reynolds_number.hpp @@ -8,9 +8,9 @@ #define LBT_UNIT_REYNOLDS_NUMBER #pragma once -#include "length.hpp" -#include "kinematic_viscosity.hpp" -#include "velocity.hpp" +#include "lbt/unit/detail/length.hpp" +#include "lbt/unit/detail/kinematic_viscosity.hpp" +#include "lbt/unit/detail/velocity.hpp" namespace lbt { diff --git a/include/unit/detail/temperature.hpp b/include/lbt/unit/detail/temperature.hpp similarity index 96% rename from include/unit/detail/temperature.hpp rename to include/lbt/unit/detail/temperature.hpp index cffbff2..e507469 100644 --- a/include/unit/detail/temperature.hpp +++ b/include/lbt/unit/detail/temperature.hpp @@ -8,7 +8,7 @@ #define LBT_UNIT_TEMPERATURE #pragma once -#include "unit_base.hpp" +#include "lbt/unit/detail/unit_base.hpp" namespace lbt { diff --git a/include/unit/detail/temperature_literals.hpp b/include/lbt/unit/detail/temperature_literals.hpp similarity index 96% rename from include/unit/detail/temperature_literals.hpp rename to include/lbt/unit/detail/temperature_literals.hpp index 5c428e6..bda2b68 100644 --- a/include/unit/detail/temperature_literals.hpp +++ b/include/lbt/unit/detail/temperature_literals.hpp @@ -8,7 +8,7 @@ #define LBT_UNIT_TEMPERATURE_LITERALS #pragma once -#include "temperature.hpp" +#include "lbt/unit/detail/temperature.hpp" namespace lbt { diff --git a/include/unit/detail/time.hpp b/include/lbt/unit/detail/time.hpp similarity index 95% rename from include/unit/detail/time.hpp rename to include/lbt/unit/detail/time.hpp index 2894606..071c460 100644 --- a/include/unit/detail/time.hpp +++ b/include/lbt/unit/detail/time.hpp @@ -8,7 +8,7 @@ #define LBT_UNIT_TIME #pragma once -#include "unit_base.hpp" +#include "lbt/unit/detail/unit_base.hpp" namespace lbt { diff --git a/include/unit/detail/time_literals.hpp b/include/lbt/unit/detail/time_literals.hpp similarity index 98% rename from include/unit/detail/time_literals.hpp rename to include/lbt/unit/detail/time_literals.hpp index 922d862..86ff5c2 100644 --- a/include/unit/detail/time_literals.hpp +++ b/include/lbt/unit/detail/time_literals.hpp @@ -8,7 +8,7 @@ #define LBT_UNIT_TIME_LITERALS #pragma once -#include "time.hpp" +#include "lbt/unit/detail/time.hpp" namespace lbt { diff --git a/include/unit/detail/unit_base.hpp b/include/lbt/unit/detail/unit_base.hpp similarity index 100% rename from include/unit/detail/unit_base.hpp rename to include/lbt/unit/detail/unit_base.hpp diff --git a/include/unit/detail/velocity.hpp b/include/lbt/unit/detail/velocity.hpp similarity index 95% rename from include/unit/detail/velocity.hpp rename to include/lbt/unit/detail/velocity.hpp index 4c66afb..458d7cd 100644 --- a/include/unit/detail/velocity.hpp +++ b/include/lbt/unit/detail/velocity.hpp @@ -8,7 +8,7 @@ #define LBT_UNIT_VELOCITY #pragma once -#include "unit_base.hpp" +#include "lbt/unit/detail/unit_base.hpp" namespace lbt { diff --git a/include/unit/detail/velocity_literals.hpp b/include/lbt/unit/detail/velocity_literals.hpp similarity index 88% rename from include/unit/detail/velocity_literals.hpp rename to include/lbt/unit/detail/velocity_literals.hpp index 5baa16c..6901a34 100644 --- a/include/unit/detail/velocity_literals.hpp +++ b/include/lbt/unit/detail/velocity_literals.hpp @@ -8,12 +8,12 @@ #define LBT_UNIT_VELOCITY_LITERALS #pragma once -#include "length.hpp" -#include "length_literals.hpp" -#include "operators.hpp" -#include "time.hpp" -#include "time_literals.hpp" -#include "velocity.hpp" +#include "lbt/unit/detail/length.hpp" +#include "lbt/unit/detail/length_literals.hpp" +#include "lbt/unit/detail/operators.hpp" +#include "lbt/unit/detail/time.hpp" +#include "lbt/unit/detail/time_literals.hpp" +#include "lbt/unit/detail/velocity.hpp" namespace lbt { diff --git a/include/unit/detail/volume.hpp b/include/lbt/unit/detail/volume.hpp similarity index 95% rename from include/unit/detail/volume.hpp rename to include/lbt/unit/detail/volume.hpp index fee1797..4659225 100644 --- a/include/unit/detail/volume.hpp +++ b/include/lbt/unit/detail/volume.hpp @@ -8,7 +8,7 @@ #define LBT_UNIT_VOLUME #pragma once -#include "unit_base.hpp" +#include "lbt/unit/detail/unit_base.hpp" namespace lbt { diff --git a/include/unit/detail/volume_literals.hpp b/include/lbt/unit/detail/volume_literals.hpp similarity index 91% rename from include/unit/detail/volume_literals.hpp rename to include/lbt/unit/detail/volume_literals.hpp index cc01b42..a74ad60 100644 --- a/include/unit/detail/volume_literals.hpp +++ b/include/lbt/unit/detail/volume_literals.hpp @@ -8,10 +8,10 @@ #define LBT_UNIT_VOLUME_LITERALS #pragma once -#include "length.hpp" -#include "length_literals.hpp" -#include "operators.hpp" -#include "volume.hpp" +#include "lbt/unit/detail/length.hpp" +#include "lbt/unit/detail/length_literals.hpp" +#include "lbt/unit/detail/operators.hpp" +#include "lbt/unit/detail/volume.hpp" namespace lbt { diff --git a/include/lbt/unit/literals.hpp b/include/lbt/unit/literals.hpp new file mode 100755 index 0000000..c5488d5 --- /dev/null +++ b/include/lbt/unit/literals.hpp @@ -0,0 +1,24 @@ +/** + * \file literals.hpp + * \mainpage Contains definitions for user-defined literals of different physical units + * \author Tobit Flatscher (github.com/2b-t) +*/ + +#ifndef LBT_LITERALS +#define LBT_LITERALS +#pragma once + +#include "lbt/unit/detail/area_literals.hpp" +#include "lbt/unit/detail/dynamic_viscosity_literals.hpp" +#include "lbt/unit/detail/kinematic_viscosity_literals.hpp" +#include "lbt/unit/detail/length_literals.hpp" +#include "lbt/unit/detail/mass_literals.hpp" +#include "lbt/unit/detail/molar_mass_literals.hpp" +#include "lbt/unit/detail/pressure_literals.hpp" +#include "lbt/unit/detail/temperature_literals.hpp" +#include "lbt/unit/detail/time_literals.hpp" +#include "lbt/unit/detail/velocity_literals.hpp" +#include "lbt/unit/detail/volume_literals.hpp" + + +#endif // LBT_LITERALS diff --git a/include/lbt/unit/units.hpp b/include/lbt/unit/units.hpp new file mode 100755 index 0000000..82c65e5 --- /dev/null +++ b/include/lbt/unit/units.hpp @@ -0,0 +1,26 @@ +/** + * \file units.hpp + * \mainpage Contains definitions for different physical units + * \author Tobit Flatscher (github.com/2b-t) +*/ + +#ifndef LBT_UNITS +#define LBT_UNITS +#pragma once + +#include "lbt/unit/detail/area.hpp" +#include "lbt/unit/detail/density.hpp" +#include "lbt/unit/detail/dynamic_viscosity.hpp" +#include "lbt/unit/detail/kinematic_viscosity.hpp" +#include "lbt/unit/detail/length.hpp" +#include "lbt/unit/detail/mass.hpp" +#include "lbt/unit/detail/molar_mass.hpp" +#include "lbt/unit/detail/operators.hpp" +#include "lbt/unit/detail/pressure.hpp" +#include "lbt/unit/detail/temperature.hpp" +#include "lbt/unit/detail/time.hpp" +#include "lbt/unit/detail/velocity.hpp" +#include "lbt/unit/detail/volume.hpp" + + +#endif // LBT_UNITS diff --git a/include/unit/literals.hpp b/include/unit/literals.hpp deleted file mode 100755 index 2b0ffca..0000000 --- a/include/unit/literals.hpp +++ /dev/null @@ -1,24 +0,0 @@ -/** - * \file literals.hpp - * \mainpage Contains definitions for user-defined literals of different physical units - * \author Tobit Flatscher (github.com/2b-t) -*/ - -#ifndef LBT_LITERALS -#define LBT_LITERALS -#pragma once - -#include "detail/area_literals.hpp" -#include "detail/dynamic_viscosity_literals.hpp" -#include "detail/kinematic_viscosity_literals.hpp" -#include "detail/length_literals.hpp" -#include "detail/mass_literals.hpp" -#include "detail/molar_mass_literals.hpp" -#include "detail/pressure_literals.hpp" -#include "detail/temperature_literals.hpp" -#include "detail/time_literals.hpp" -#include "detail/velocity_literals.hpp" -#include "detail/volume_literals.hpp" - - -#endif // LBT_LITERALS diff --git a/include/unit/units.hpp b/include/unit/units.hpp deleted file mode 100755 index b85945a..0000000 --- a/include/unit/units.hpp +++ /dev/null @@ -1,26 +0,0 @@ -/** - * \file units.hpp - * \mainpage Contains definitions for different physical units - * \author Tobit Flatscher (github.com/2b-t) -*/ - -#ifndef LBT_UNITS -#define LBT_UNITS -#pragma once - -#include "detail/area.hpp" -#include "detail/density.hpp" -#include "detail/dynamic_viscosity.hpp" -#include "detail/kinematic_viscosity.hpp" -#include "detail/length.hpp" -#include "detail/mass.hpp" -#include "detail/molar_mass.hpp" -#include "detail/operators.hpp" -#include "detail/pressure.hpp" -#include "detail/temperature.hpp" -#include "detail/time.hpp" -#include "detail/velocity.hpp" -#include "detail/volume.hpp" - - -#endif // LBT_UNITS diff --git a/src/general/disclaimer.cpp b/src/general/disclaimer.cpp index 33af0db..6e2c334 100755 --- a/src/general/disclaimer.cpp +++ b/src/general/disclaimer.cpp @@ -1,4 +1,4 @@ -#include "general/disclaimer.hpp" +#include "lbt/general/disclaimer.hpp" #include #include diff --git a/src/general/openmp_manager.cpp b/src/general/openmp_manager.cpp index 2047bbe..a29f744 100755 --- a/src/general/openmp_manager.cpp +++ b/src/general/openmp_manager.cpp @@ -1,4 +1,4 @@ -#include "general/openmp_manager.hpp" +#include "lbt/general/openmp_manager.hpp" #include diff --git a/src/general/timer.cpp b/src/general/timer.cpp index 98fcfcc..9df210e 100755 --- a/src/general/timer.cpp +++ b/src/general/timer.cpp @@ -1,4 +1,4 @@ -#include "general/timer.hpp" +#include "lbt/general/timer.hpp" #include diff --git a/src/general/vtk_utilities.cpp b/src/general/vtk_utilities.cpp index ca1122e..51b7578 100755 --- a/src/general/vtk_utilities.cpp +++ b/src/general/vtk_utilities.cpp @@ -1,6 +1,6 @@ -#include "general/vtk_utilities.hpp" +#include "lbt/general/vtk_utilities.hpp" -#include "general/use_vtk.hpp" +#include "lbt/general/use_vtk.hpp" #ifdef LBT_USE_VTK #include diff --git a/src/geometry/vtk_import.cpp b/src/geometry/vtk_import.cpp index f48d3b5..9b8ece5 100755 --- a/src/geometry/vtk_import.cpp +++ b/src/geometry/vtk_import.cpp @@ -1,6 +1,6 @@ -#include "geometry/vtk_import.hpp" +#include "lbt/geometry/vtk_import.hpp" -#include "general/use_vtk.hpp" +#include "lbt/general/use_vtk.hpp" #ifdef LBT_USE_VTK #include @@ -46,7 +46,7 @@ #include #include - #include "general/vtk_utilities.hpp" + #include "lbt/general/vtk_utilities.hpp" namespace lbt { diff --git a/src/main.cpp b/src/main.cpp index e022975..6e110bf 100755 --- a/src/main.cpp +++ b/src/main.cpp @@ -14,10 +14,10 @@ #include -#include "general/disclaimer.hpp" -#include "general/openmp_manager.hpp" -#include "lattice/D3Q15.hpp" -#include "simulation.hpp" +#include "lbt/general/disclaimer.hpp" +#include "lbt/general/openmp_manager.hpp" +#include "lbt/lattice/D3Q15.hpp" +#include "lbt/simulation.hpp" int main(int argc, char* argv[]) { diff --git a/src/simple_main.cpp b/src/simple_main.cpp index b7407ac..551cbbd 100755 --- a/src/simple_main.cpp +++ b/src/simple_main.cpp @@ -10,15 +10,15 @@ #include #include -#include "continuum/continuum.hpp" -#include "general/openmp_manager.hpp" -#include "lattice/lattices.hpp" -#include "material/materials.hpp" -#include "population/collision_operators.hpp" -#include "population/population.hpp" -#include "unit/characteristic_numbers.hpp" -#include "unit/literals.hpp" -#include "converter.hpp" +#include "lbt/continuum/continuum.hpp" +#include "lbt/general/openmp_manager.hpp" +#include "lbt/lattice/lattices.hpp" +#include "lbt/material/materials.hpp" +#include "lbt/population/collision_operators.hpp" +#include "lbt/population/population.hpp" +#include "lbt/unit/characteristic_numbers.hpp" +#include "lbt/unit/literals.hpp" +#include "lbt/converter.hpp" int main(int argc, char* argv[]) { diff --git a/test/constexpr_math/detail/abs_test.hpp b/test/constexpr_math/detail/abs_test.hpp index a4d00e5..82a08c8 100755 --- a/test/constexpr_math/detail/abs_test.hpp +++ b/test/constexpr_math/detail/abs_test.hpp @@ -15,7 +15,7 @@ #include -#include "constexpr_math/detail/abs.hpp" +#include "lbt/constexpr_math/detail/abs.hpp" #include "testing_types.hpp" diff --git a/test/constexpr_math/detail/ceil_test.hpp b/test/constexpr_math/detail/ceil_test.hpp index 66b1f58..4752655 100755 --- a/test/constexpr_math/detail/ceil_test.hpp +++ b/test/constexpr_math/detail/ceil_test.hpp @@ -15,7 +15,7 @@ #include -#include "constexpr_math/detail/ceil.hpp" +#include "lbt/constexpr_math/detail/ceil.hpp" #include "testing_types.hpp" diff --git a/test/constexpr_math/detail/exp_test.hpp b/test/constexpr_math/detail/exp_test.hpp index 9a1704b..97cc6be 100755 --- a/test/constexpr_math/detail/exp_test.hpp +++ b/test/constexpr_math/detail/exp_test.hpp @@ -16,8 +16,8 @@ #include -#include "constexpr_math/detail/exp.hpp" -#include "constexpr_math/detail/mathematical_constants.hpp" +#include "lbt/constexpr_math/detail/exp.hpp" +#include "lbt/constexpr_math/detail/mathematical_constants.hpp" #include "testing_types.hpp" diff --git a/test/constexpr_math/detail/is_almost_equal_eps_abs_test.hpp b/test/constexpr_math/detail/is_almost_equal_eps_abs_test.hpp index f5e27e0..6cc8c7d 100755 --- a/test/constexpr_math/detail/is_almost_equal_eps_abs_test.hpp +++ b/test/constexpr_math/detail/is_almost_equal_eps_abs_test.hpp @@ -15,7 +15,7 @@ #include -#include "constexpr_math/detail/is_almost_equal_eps_abs.hpp" +#include "lbt/constexpr_math/detail/is_almost_equal_eps_abs.hpp" #include "testing_types.hpp" diff --git a/test/constexpr_math/detail/is_almost_equal_eps_rel_test.hpp b/test/constexpr_math/detail/is_almost_equal_eps_rel_test.hpp index 0a76cef..b26857e 100755 --- a/test/constexpr_math/detail/is_almost_equal_eps_rel_test.hpp +++ b/test/constexpr_math/detail/is_almost_equal_eps_rel_test.hpp @@ -15,7 +15,7 @@ #include -#include "constexpr_math/detail/is_almost_equal_eps_rel.hpp" +#include "lbt/constexpr_math/detail/is_almost_equal_eps_rel.hpp" #include "testing_types.hpp" diff --git a/test/constexpr_math/detail/is_almost_equal_ulps_test.hpp b/test/constexpr_math/detail/is_almost_equal_ulps_test.hpp index ba6704a..a7f97b7 100755 --- a/test/constexpr_math/detail/is_almost_equal_ulps_test.hpp +++ b/test/constexpr_math/detail/is_almost_equal_ulps_test.hpp @@ -15,7 +15,7 @@ #include -#include "constexpr_math/detail/is_almost_equal_ulps.hpp" +#include "lbt/constexpr_math/detail/is_almost_equal_ulps.hpp" #include "testing_types.hpp" diff --git a/test/constexpr_math/detail/is_inf_test.hpp b/test/constexpr_math/detail/is_inf_test.hpp index cfde781..1d3669e 100755 --- a/test/constexpr_math/detail/is_inf_test.hpp +++ b/test/constexpr_math/detail/is_inf_test.hpp @@ -15,7 +15,7 @@ #include -#include "constexpr_math/detail/is_inf.hpp" +#include "lbt/constexpr_math/detail/is_inf.hpp" #include "testing_types.hpp" diff --git a/test/constexpr_math/detail/is_nan_test.hpp b/test/constexpr_math/detail/is_nan_test.hpp index 16ea42b..4b6b59e 100755 --- a/test/constexpr_math/detail/is_nan_test.hpp +++ b/test/constexpr_math/detail/is_nan_test.hpp @@ -15,7 +15,7 @@ #include -#include "constexpr_math/detail/is_nan.hpp" +#include "lbt/constexpr_math/detail/is_nan.hpp" #include "testing_types.hpp" diff --git a/test/constexpr_math/detail/log_test.hpp b/test/constexpr_math/detail/log_test.hpp index 5850844..40cd7ed 100755 --- a/test/constexpr_math/detail/log_test.hpp +++ b/test/constexpr_math/detail/log_test.hpp @@ -16,11 +16,11 @@ #include -#include "constexpr_math/detail/is_inf.hpp" -#include "constexpr_math/detail/is_nan.hpp" -#include "constexpr_math/detail/is_almost_equal_eps_abs.hpp" -#include "constexpr_math/detail/log.hpp" -#include "constexpr_math/detail/mathematical_constants.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_abs.hpp" +#include "lbt/constexpr_math/detail/log.hpp" +#include "lbt/constexpr_math/detail/mathematical_constants.hpp" #include "testing_types.hpp" diff --git a/test/constexpr_math/detail/mathematical_constants_test.hpp b/test/constexpr_math/detail/mathematical_constants_test.hpp index 311105c..009e1e9 100755 --- a/test/constexpr_math/detail/mathematical_constants_test.hpp +++ b/test/constexpr_math/detail/mathematical_constants_test.hpp @@ -13,7 +13,7 @@ #include -#include "constexpr_math/detail/mathematical_constants.hpp" +#include "lbt/constexpr_math/detail/mathematical_constants.hpp" #include "testing_types.hpp" diff --git a/test/constexpr_math/detail/pow_test.hpp b/test/constexpr_math/detail/pow_test.hpp index 83bf7ae..c23bfc7 100755 --- a/test/constexpr_math/detail/pow_test.hpp +++ b/test/constexpr_math/detail/pow_test.hpp @@ -16,10 +16,10 @@ #include -#include "constexpr_math/detail/is_inf.hpp" -#include "constexpr_math/detail/is_nan.hpp" -#include "constexpr_math/detail/is_almost_equal_eps_abs.hpp" -#include "constexpr_math/detail/pow.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_abs.hpp" +#include "lbt/constexpr_math/detail/pow.hpp" #include "testing_types.hpp" diff --git a/test/constexpr_math/detail/sqrt_test.hpp b/test/constexpr_math/detail/sqrt_test.hpp index 9b95f46..0701e9a 100755 --- a/test/constexpr_math/detail/sqrt_test.hpp +++ b/test/constexpr_math/detail/sqrt_test.hpp @@ -16,9 +16,9 @@ #include -#include "constexpr_math/detail/is_inf.hpp" -#include "constexpr_math/detail/is_nan.hpp" -#include "constexpr_math/detail/sqrt.hpp" +#include "lbt/constexpr_math/detail/is_inf.hpp" +#include "lbt/constexpr_math/detail/is_nan.hpp" +#include "lbt/constexpr_math/detail/sqrt.hpp" #include "constexpr_math_utilities.hpp" #include "testing_types.hpp" diff --git a/test/continuum/continuum_base_test.hpp b/test/continuum/continuum_base_test.hpp index 4b71a14..3d6c271 100755 --- a/test/continuum/continuum_base_test.hpp +++ b/test/continuum/continuum_base_test.hpp @@ -16,7 +16,7 @@ #include #include -#include "constexpr_math/constexpr_math.hpp" +#include "lbt/constexpr_math/constexpr_math.hpp" #include "../testing_utilities/testing_utilities.hpp" diff --git a/test/continuum/simple_continuum_test.cpp b/test/continuum/simple_continuum_test.cpp index ab3d4cd..b14b3e4 100755 --- a/test/continuum/simple_continuum_test.cpp +++ b/test/continuum/simple_continuum_test.cpp @@ -13,8 +13,8 @@ #include -#include "continuum/simple_continuum.hpp" -#include "general/tuple_utilities.hpp" +#include "lbt/continuum/simple_continuum.hpp" +#include "lbt/general/tuple_utilities.hpp" #include "../testing_utilities/testing_utilities.hpp" #include "continuum_base_test.hpp" diff --git a/test/continuum/vtk_continuum_test.cpp b/test/continuum/vtk_continuum_test.cpp index ee34e16..c782654 100755 --- a/test/continuum/vtk_continuum_test.cpp +++ b/test/continuum/vtk_continuum_test.cpp @@ -4,7 +4,7 @@ * \author Tobit Flatscher (github.com/2b-t) */ -#include "general/use_vtk.hpp" +#include "lbt/general/use_vtk.hpp" #ifdef LBT_USE_VTK #include @@ -16,8 +16,8 @@ #include - #include "continuum/vtk_continuum.hpp" - #include "general/tuple_utilities.hpp" + #include "lbt/continuum/vtk_continuum.hpp" + #include "lbt/general/tuple_utilities.hpp" #include "../testing_utilities/testing_utilities.hpp" #include "continuum_base_test.hpp" diff --git a/test/converter_test.cpp b/test/converter_test.cpp index 8f818ad..dfb09b5 100755 --- a/test/converter_test.cpp +++ b/test/converter_test.cpp @@ -6,9 +6,9 @@ #include -#include "converter.hpp" -#include "unit/literals.hpp" -#include "unit/units.hpp" +#include "lbt/unit/literals.hpp" +#include "lbt/unit/units.hpp" +#include "lbt/converter.hpp" namespace lbt { diff --git a/test/general/disclaimer_test.cpp b/test/general/disclaimer_test.cpp index 1b7abc0..5bbbe9f 100755 --- a/test/general/disclaimer_test.cpp +++ b/test/general/disclaimer_test.cpp @@ -8,7 +8,7 @@ #include -#include "general/disclaimer.hpp" +#include "lbt/general/disclaimer.hpp" namespace lbt { diff --git a/test/general/openmp_manager_test.cpp b/test/general/openmp_manager_test.cpp index d12dec9..f20f0b7 100755 --- a/test/general/openmp_manager_test.cpp +++ b/test/general/openmp_manager_test.cpp @@ -11,7 +11,7 @@ #include -#include "general/openmp_manager.hpp" +#include "lbt/general/openmp_manager.hpp" namespace lbt { diff --git a/test/general/output_utilities_test.cpp b/test/general/output_utilities_test.cpp index c273ad3..13e3a19 100755 --- a/test/general/output_utilities_test.cpp +++ b/test/general/output_utilities_test.cpp @@ -9,7 +9,7 @@ #include -#include "general/output_utilities.hpp" +#include "lbt/general/output_utilities.hpp" namespace lbt { diff --git a/test/general/stream_manager_test.cpp b/test/general/stream_manager_test.cpp index a98f1b6..fed9aa4 100755 --- a/test/general/stream_manager_test.cpp +++ b/test/general/stream_manager_test.cpp @@ -10,7 +10,7 @@ #include -#include "general/stream_manager.hpp" +#include "lbt/general/stream_manager.hpp" namespace lbt { diff --git a/test/general/timer_test.cpp b/test/general/timer_test.cpp index 545f2b3..f67eb65 100755 --- a/test/general/timer_test.cpp +++ b/test/general/timer_test.cpp @@ -9,7 +9,7 @@ #include -#include "general/timer.hpp" +#include "lbt/general/timer.hpp" namespace lbt { diff --git a/test/general/tuple_utilities_test.cpp b/test/general/tuple_utilities_test.cpp index 04d4507..c39639d 100755 --- a/test/general/tuple_utilities_test.cpp +++ b/test/general/tuple_utilities_test.cpp @@ -10,7 +10,7 @@ #include -#include "general/tuple_utilities.hpp" +#include "lbt/general/tuple_utilities.hpp" namespace lbt { diff --git a/test/general/type_definitions_test.cpp b/test/general/type_definitions_test.cpp index 0554762..c1a98de 100755 --- a/test/general/type_definitions_test.cpp +++ b/test/general/type_definitions_test.cpp @@ -9,7 +9,7 @@ #include -#include "general/type_definitions.hpp" +#include "lbt/general/type_definitions.hpp" #include "../testing_utilities/array_utilities.hpp" diff --git a/test/general/vtk_utilities_test.cpp b/test/general/vtk_utilities_test.cpp index 554fce5..635e39d 100755 --- a/test/general/vtk_utilities_test.cpp +++ b/test/general/vtk_utilities_test.cpp @@ -4,12 +4,12 @@ * \author Tobit Flatscher (github.com/2b-t) */ -#include "general/use_vtk.hpp" +#include "lbt/general/use_vtk.hpp" #ifdef LBT_USE_VTK #include - #include "general/vtk_utilities.hpp" + #include "lbt/general/vtk_utilities.hpp" namespace lbt { diff --git a/test/geometry/vtk_import_test.cpp b/test/geometry/vtk_import_test.cpp index 01d5fd3..37ad00d 100755 --- a/test/geometry/vtk_import_test.cpp +++ b/test/geometry/vtk_import_test.cpp @@ -4,7 +4,7 @@ * \author Tobit Flatscher (github.com/2b-t) */ -#include "general/use_vtk.hpp" +#include "lbt/general/use_vtk.hpp" #ifdef LBT_USE_VTK #include @@ -15,7 +15,7 @@ #include - #include "geometry/vtk_import.hpp" + #include "lbt/geometry/vtk_import.hpp" namespace lbt { diff --git a/test/lattice/lattice_test.cpp b/test/lattice/lattice_test.cpp index 6371297..185cb72 100755 --- a/test/lattice/lattice_test.cpp +++ b/test/lattice/lattice_test.cpp @@ -9,7 +9,7 @@ #include -#include "constexpr_math/constexpr_math.hpp" +#include "lbt/constexpr_math/constexpr_math.hpp" #include "../testing_utilities/array_utilities.hpp" #include "lattice_testing_types.hpp" diff --git a/test/lattice/lattice_testing_types.hpp b/test/lattice/lattice_testing_types.hpp index e93bcb1..61cabbd 100755 --- a/test/lattice/lattice_testing_types.hpp +++ b/test/lattice/lattice_testing_types.hpp @@ -12,11 +12,11 @@ #include -#include "lattice/D2Q9.hpp" -#include "lattice/D3Q15.hpp" -#include "lattice/D3Q19.hpp" -#include "lattice/D3Q27.hpp" -#include "general/tuple_utilities.hpp" +#include "lbt/lattice/D2Q9.hpp" +#include "lbt/lattice/D3Q15.hpp" +#include "lbt/lattice/D3Q19.hpp" +#include "lbt/lattice/D3Q27.hpp" +#include "lbt/general/tuple_utilities.hpp" #include "../testing_utilities/testing_utilities.hpp" diff --git a/test/material/detail/air_test.hpp b/test/material/detail/air_test.hpp index 9ad028a..e069e53 100644 --- a/test/material/detail/air_test.hpp +++ b/test/material/detail/air_test.hpp @@ -10,7 +10,7 @@ #include -#include "material/detail/air.hpp" +#include "lbt/material/detail/air.hpp" namespace lbt { diff --git a/test/material/detail/carbon_dioxide_test.hpp b/test/material/detail/carbon_dioxide_test.hpp index 020777d..1da6adf 100644 --- a/test/material/detail/carbon_dioxide_test.hpp +++ b/test/material/detail/carbon_dioxide_test.hpp @@ -10,7 +10,7 @@ #include -#include "material/detail/carbon_dioxide.hpp" +#include "lbt/material/detail/carbon_dioxide.hpp" namespace lbt { diff --git a/test/material/detail/hydrogen_test.hpp b/test/material/detail/hydrogen_test.hpp index 6c5ff89..575e40f 100644 --- a/test/material/detail/hydrogen_test.hpp +++ b/test/material/detail/hydrogen_test.hpp @@ -10,7 +10,7 @@ #include -#include "material/detail/hydrogen.hpp" +#include "lbt/material/detail/hydrogen.hpp" namespace lbt { diff --git a/test/material/detail/oxygen_test.hpp b/test/material/detail/oxygen_test.hpp index f5fda2a..8c0bccd 100644 --- a/test/material/detail/oxygen_test.hpp +++ b/test/material/detail/oxygen_test.hpp @@ -10,7 +10,7 @@ #include -#include "material/detail/oxygen.hpp" +#include "lbt/material/detail/oxygen.hpp" namespace lbt { diff --git a/test/material/detail/states_table_test.hpp b/test/material/detail/states_table_test.hpp index 6564c43..561a934 100644 --- a/test/material/detail/states_table_test.hpp +++ b/test/material/detail/states_table_test.hpp @@ -14,7 +14,7 @@ #include -#include "material/detail/states_table.hpp" +#include "lbt/material/detail/states_table.hpp" namespace lbt { diff --git a/test/material/detail/water_test.hpp b/test/material/detail/water_test.hpp index fd9b281..c608008 100644 --- a/test/material/detail/water_test.hpp +++ b/test/material/detail/water_test.hpp @@ -12,9 +12,9 @@ #include -#include "material/detail/water.hpp" -#include "unit/literals.hpp" -#include "unit/units.hpp" +#include "lbt/material/detail/water.hpp" +#include "lbt/unit/literals.hpp" +#include "lbt/unit/units.hpp" namespace lbt { diff --git a/test/population/aa_population_test.cpp b/test/population/aa_population_test.cpp index d13d0a3..8bfc5fa 100755 --- a/test/population/aa_population_test.cpp +++ b/test/population/aa_population_test.cpp @@ -10,7 +10,7 @@ #include -#include "population/aa_population.hpp" +#include "lbt/population/aa_population.hpp" #include "../lattice/lattice_testing_types.hpp" #include "population_base_test.hpp" diff --git a/test/population/ab_population_test.cpp b/test/population/ab_population_test.cpp index d8401ed..ed82848 100755 --- a/test/population/ab_population_test.cpp +++ b/test/population/ab_population_test.cpp @@ -10,7 +10,7 @@ #include -#include "population/ab_population.hpp" +#include "lbt/population/ab_population.hpp" #include "../lattice/lattice_testing_types.hpp" #include "population_base_test.hpp" diff --git a/test/population/boundary/guo_test.cpp b/test/population/boundary/guo_test.cpp index 8d49df2..4045620 100755 --- a/test/population/boundary/guo_test.cpp +++ b/test/population/boundary/guo_test.cpp @@ -9,7 +9,7 @@ #include -#include "population/boundary/guo.hpp" +#include "lbt/population/boundary/guo.hpp" namespace lbt { diff --git a/test/population/boundary/normal_test.cpp b/test/population/boundary/normal_test.cpp index 018ffdd..9fa17d8 100755 --- a/test/population/boundary/normal_test.cpp +++ b/test/population/boundary/normal_test.cpp @@ -10,7 +10,7 @@ #include -#include "population/boundary/normal.hpp" +#include "lbt/population/boundary/normal.hpp" namespace lbt { diff --git a/test/population/boundary/orientation_test.cpp b/test/population/boundary/orientation_test.cpp index f66c816..8c08b4f 100755 --- a/test/population/boundary/orientation_test.cpp +++ b/test/population/boundary/orientation_test.cpp @@ -8,7 +8,7 @@ #include -#include "population/boundary/orientation.hpp" +#include "lbt/population/boundary/orientation.hpp" namespace lbt { diff --git a/test/population/indexing/aa_pattern_test.cpp b/test/population/indexing/aa_pattern_test.cpp index aa03df8..4e904e6 100755 --- a/test/population/indexing/aa_pattern_test.cpp +++ b/test/population/indexing/aa_pattern_test.cpp @@ -10,8 +10,8 @@ #include -#include "general/type_definitions.hpp" -#include "population/indexing/aa_pattern.hpp" +#include "lbt/general/type_definitions.hpp" +#include "lbt/population/indexing/aa_pattern.hpp" #include "../../lattice/lattice_testing_types.hpp" @@ -21,11 +21,8 @@ namespace lbt { template class AaPatternTest: public ::testing::Test { public: - AaPatternTest(std::int32_t const NX = 7, std::int32_t const NY = 9, std::int32_t const NZ = 11) noexcept - : NX{NX}, NY{NY}, NZ{NZ}, aa_pattern{NX,NY,NZ} { - if constexpr (LT::DIM == 2) { - this->NZ = 1; - } + AaPatternTest(std::int32_t const NX_ = 7, std::int32_t const NY_ = 9, std::int32_t const NZ_ = 11) noexcept + : NX{NX_}, NY{NY_}, NZ{LT::DIM != 2 ? NZ_ : 1}, aa_pattern{NX,NY,NZ} { return; } protected: diff --git a/test/population/indexing/indexing_test.cpp b/test/population/indexing/indexing_test.cpp index fd53f44..e5adfd9 100755 --- a/test/population/indexing/indexing_test.cpp +++ b/test/population/indexing/indexing_test.cpp @@ -10,7 +10,7 @@ #include -#include "population/indexing/indexing.hpp" +#include "lbt/population/indexing/indexing.hpp" #include "../../lattice/lattice_testing_types.hpp" @@ -28,7 +28,7 @@ namespace lbt { // Make sure that final index succeeds the numeric limit of the int32_t constexpr std::int32_t NX {1}; constexpr std::int32_t NY {std::numeric_limits::max()}; - constexpr std::int32_t NZ {0}; + constexpr std::int32_t NZ {1}; constexpr std::int32_t NP {1}; lbt::Indexing const indexing {NX, NY, NZ}; constexpr std::int32_t x {0}; @@ -47,11 +47,8 @@ namespace lbt { class IndexingTest : public ::testing::Test { public: // Initialise with arbitrary resolution - constexpr IndexingTest(std::int32_t const NX = 9, std::int32_t const NY = 11, std::int32_t const NZ = 21) noexcept - : NX{NX}, NY{NY}, NZ{NZ}, indexing{NX,NY,NZ} { - if constexpr (LT::DIM == 2) { - this->NZ = 1; - } + constexpr IndexingTest(std::int32_t const NX_ = 9, std::int32_t const NY_ = 11, std::int32_t const NZ_ = 21) noexcept + : NX{NX_}, NY{NY_}, NZ{LT::DIM != 2 ? NZ_ : 1}, indexing{NX,NY,NZ} { return; } protected: diff --git a/test/population/population_base_test.hpp b/test/population/population_base_test.hpp index bf6eb2d..bda8595 100755 --- a/test/population/population_base_test.hpp +++ b/test/population/population_base_test.hpp @@ -14,7 +14,7 @@ #include -#include "constexpr_math/constexpr_math.hpp" +#include "lbt/constexpr_math/constexpr_math.hpp" #include "../lattice/lattice_testing_types.hpp" @@ -24,11 +24,8 @@ namespace lbt { template