Skip to content

Commit

Permalink
refactor: Rename folders and adjust header guards
Browse files Browse the repository at this point in the history
  • Loading branch information
2b-t committed Jun 15, 2024
1 parent c953d43 commit f30f8eb
Show file tree
Hide file tree
Showing 173 changed files with 1,104 additions and 1,091 deletions.
58 changes: 29 additions & 29 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ else()
endif()

add_library(lbt_obj OBJECT
src/general/disclaimer.cpp
src/general/openmp_manager.cpp
src/general/timer.cpp
src/general/vtk_utilities.cpp
src/common/disclaimer.cpp
src/common/openmp_manager.cpp
src/common/timer.cpp
src/common/vtk_utilities.cpp
src/geometry/vtk_import.cpp
)
target_include_directories(lbt_obj PUBLIC
Expand Down Expand Up @@ -81,33 +81,33 @@ if (NOT GTest_FOUND)
set(LBT_TEST_LIBRARIES ${LBT_LIBRARIES} gtest pthread)

add_library(lbt_test_obj OBJECT
test/constexpr_math/constexpr_math_test.cpp
test/continuum/simple_continuum_test.cpp
test/continuum/vtk_continuum_test.cpp
test/general/disclaimer_test.cpp
test/general/openmp_manager_test.cpp
test/general/output_utilities_test.cpp
test/general/stream_manager_test.cpp
test/general/timer_test.cpp
test/general/tuple_utilities_test.cpp
test/general/type_definitions_test.cpp
test/general/vtk_utilities_test.cpp
test/common/disclaimer_test.cpp
test/common/openmp_manager_test.cpp
test/common/output_utilities_test.cpp
test/common/stream_manager_test.cpp
test/common/timer_test.cpp
test/common/tuple_utilities_test.cpp
test/common/type_definitions_test.cpp
test/common/vtk_utilities_test.cpp
test/continuums/simple_continuum_test.cpp
test/continuums/vtk_continuum_test.cpp
test/geometry/vtk_import_test.cpp
test/lattice/lattice_test.cpp
test/material/materials_test.cpp
test/population/aa_population_test.cpp
test/population/ab_population_test.cpp
test/population/boundary/guo_test.cpp
test/population/boundary/normal_test.cpp
test/population/boundary/orientation_test.cpp
test/population/indexing/aa_pattern_test.cpp
test/population/indexing/indexing_test.cpp
test/testing_utilities/testing_utilities_test.cpp
test/unit/characteristic_numbers_test.cpp
test/unit/literals_test.cpp
test/unit/units_test.cpp
test/lattices/lattices_test.cpp
test/materials/materials_test.cpp
test/math/math_test.cpp
test/populations/aa_population_test.cpp
test/populations/ab_population_test.cpp
test/populations/boundaries/guo_test.cpp
test/populations/boundaries/normal_test.cpp
test/populations/boundaries/orientation_test.cpp
test/populations/indexing/aa_pattern_test.cpp
test/populations/indexing/indexing_test.cpp
test/simulation/simulation_test.cpp
test/test_utilities/test_utilities_test.cpp
test/units/characteristic_numbers_test.cpp
test/units/literals_test.cpp
test/units/units_test.cpp
test/converter_test.cpp
test/simulation_test.cpp
)
target_include_directories(lbt_test_obj PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
* \author Tobit Flatscher (github.com/2b-t)
*/

#ifndef LBT_DISCLAIMER
#define LBT_DISCLAIMER
#ifndef LBT__COMMON__DISCLAIMER
#define LBT__COMMON__DISCLAIMER
#pragma once

#include <string>
Expand All @@ -22,4 +22,4 @@ namespace lbt {

}

#endif // LBT_DISCLAIMER
#endif // LBT__COMMON__DISCLAIMER
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
* \author Tobit Flatscher (github.com/2b-t)
*/

#ifndef LBT_OPENMP_MANAGER
#define LBT_OPENMP_MANAGER
#ifndef LBT__COMMON__OPENMP_MANAGER
#define LBT__COMMON__OPENMP_MANAGER
#pragma once

#include <ostream>
Expand Down Expand Up @@ -94,4 +94,4 @@ namespace lbt {

}

#endif // LBT_OPENMP_MANAGER
#endif // LBT__COMMON__OPENMP_MANAGER
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
* \author Tobit Flatscher (github.com/2b-t)
*/

#ifndef LBT_OUTPUT_UTILITIES
#define LBT_OUTPUT_UTILITIES
#ifndef LBT__COMMON__OUTPUT_UTILITIES
#define LBT__COMMON__OUTPUT_UTILITIES
#pragma once

#include <iomanip>
#include <sstream>
Expand Down Expand Up @@ -50,4 +51,4 @@ namespace lbt {
}
}

#endif // LBT_OUTPUT_UTILITIES
#endif // LBT__COMMON__OUTPUT_UTILITIES
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
* \author Tobit Flatscher (github.com/2b-t)
*/

#ifndef LBT_STREAM_MANAGER
#define LBT_STREAM_MANAGER
#ifndef LBT__COMMON__STREAM_MANAGER
#define LBT__COMMON__STREAM_MANAGER
#pragma once

#include <ostream>
Expand Down Expand Up @@ -96,4 +96,4 @@ namespace lbt {

}

#endif // LBT_STREAM_MANAGER
#endif // LBT__COMMON__STREAM_MANAGER
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
* \author Tobit Flatscher (github.com/2b-t)
*/

#ifndef LBT_TIMER
#define LBT_TIMER
#ifndef LBT__COMMON__TIMER
#define LBT__COMMON__TIMER
#pragma once

#include <chrono>
Expand Down Expand Up @@ -51,4 +51,4 @@ namespace lbt {

}

#endif // LBT_TIMER
#endif // LBT__COMMON__TIMER
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
* \author Tobit Flatscher (github.com/2b-t)
*/

#ifndef LBT_TUPLE_UTILITIES
#define LBT_TUPLE_UTILITIES
#ifndef LBT__COMMON__TUPLE_UTILITIES
#define LBT__COMMON__TUPLE_UTILITIES
#pragma once

#include <tuple>
Expand Down Expand Up @@ -116,4 +116,4 @@ namespace lbt {
using CartesianProductApply_t = typename CartesianProductApply<TC,Ts...>::type;
}

#endif // LBT_TUPLE_UTILITIES
#endif // LBT__COMMON__TUPLE_UTILITIES
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
* \author Tobit Flatscher (github.com/2b-t)
*/

#ifndef LBT_TYPE_DEFINITIONS
#define LBT_TYPE_DEFINITIONS
#ifndef LBT__COMMON__TYPE_DEFINITIONS
#define LBT__COMMON__TYPE_DEFINITIONS
#pragma once

#include <array>
Expand Down Expand Up @@ -215,4 +215,4 @@ namespace lbt {
using HeapArray = AlignedArray<T>;
}

#endif // LBT_TYPE_DEFINITIONS
#endif // LBT__COMMON__TYPE_DEFINITIONS
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
* \author Tobit Flatscher (github.com/2b-t)
*/

#ifndef LBT_VTK_UTILITITES
#define LBT_VTK_UTILITITES
#ifndef LBT__COMMON__VTK_UTILITITES
#define LBT__COMMON__VTK_UTILITITES
#pragma once

#include "lbt/general/use_vtk.hpp"
#include "lbt/common/use_vtk.hpp"

#ifdef LBT_USE_VTK
#include <filesystem>
Expand Down Expand Up @@ -46,4 +46,4 @@
}
#endif // LBT_USE_VTK

#endif // LBT_VTK_UTILITITES
#endif // LBT__COMMON__VTK_UTILITITES
23 changes: 0 additions & 23 deletions include/lbt/constexpr_math/constexpr_math.hpp

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,26 @@
* \author Tobit Flatscher (github.com/2b-t)
*/

#ifndef LBT_CONTINUUM
#define LBT_CONTINUUM
#ifndef LBT__CONTINUUMS__CONTINUUM
#define LBT__CONTINUUMS__CONTINUUM
#pragma once

#include "lbt/general/use_vtk.hpp"
#include "lbt/common/use_vtk.hpp"

#ifdef LBT_USE_VTK
#include "lbt/continuum/vtk_continuum.hpp"
#include "lbt/continuums/vtk_continuum.hpp"

namespace lbt {
template <typename T>
using Continuum = VtkContinuum<T>;
}
#else
#include "lbt/continuum/simple_continuum.hpp"
#include "lbt/continuums/simple_continuum.hpp"

namespace lbt {
template <typename T>
using Continuum = SimpleContinuum<T>;
}
#endif // LBT_USE_VTK

#endif // LBT_CONTINUUM
#endif // LBT__CONTINUUMS__CONTINUUM
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
* \author Tobit Flatscher (github.com/2b-t)
*/

#ifndef LBT_CONTINUUM_BASE
#define LBT_CONTINUUM_BASE
#ifndef LBT__CONTINUUMS__CONTINUUM_BASE
#define LBT__CONTINUUMS__CONTINUUM_BASE
#pragma once

#include <cstdint>
Expand Down Expand Up @@ -139,4 +139,4 @@ namespace lbt {

}

#endif // LBT_CONTINUUM_BASE
#endif // LBT__CONTINUUMS__CONTINUUM_BASE
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
* \author Tobit Flatscher (github.com/2b-t)
*/

#ifndef LBT_SIMPLE_CONTINUUM
#define LBT_SIMPLE_CONTINUUM
#ifndef LBT__CONTINUUMS__SIMPLE_CONTINUUM
#define LBT__CONTINUUMS__SIMPLE_CONTINUUM
#pragma once

#include <cinttypes>
Expand All @@ -19,9 +19,9 @@
#include <tuple>
#include <type_traits>

#include "lbt/continuum/continuum_base.hpp"
#include "lbt/general/output_utilities.hpp"
#include "lbt/general/type_definitions.hpp"
#include "lbt/common/output_utilities.hpp"
#include "lbt/common/type_definitions.hpp"
#include "lbt/continuums/continuum_base.hpp"


namespace lbt {
Expand Down Expand Up @@ -365,4 +365,4 @@ namespace lbt {
}
}

#endif // LBT_PLAIN_CONTINUUM
#endif // LBT__CONTINUUMS__SIMPLE_CONTINUUM
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
* \author Tobit Flatscher (github.com/2b-t)
*/

#ifndef LBT_VTK_CONTINUUM
#define LBT_VTK_CONTINUUM
#ifndef LBT__CONTINUUMS__VTK_CONTINUUM
#define LBT__CONTINUUMS__VTK_CONTINUUM
#pragma once

#include "lbt/general/use_vtk.hpp"
#include "lbt/common/use_vtk.hpp"

#ifdef LBT_USE_VTK
#include <cassert>
Expand All @@ -22,9 +22,9 @@
#include <vtkPointData.h>
#include <vtkSmartPointer.h>

#include "lbt/general/output_utilities.hpp"
#include "lbt/general/vtk_utilities.hpp"
#include "lbt/continuum/continuum_base.hpp"
#include "lbt/common/output_utilities.hpp"
#include "lbt/common/vtk_utilities.hpp"
#include "lbt/continuums/continuum_base.hpp"


namespace lbt {
Expand Down Expand Up @@ -313,4 +313,4 @@
}
#endif // LBT_USE_VTK

#endif // LBT_VTK_CONTINUUM
#endif // LBT__CONTINUUMS__VTK_CONTINUUM
8 changes: 4 additions & 4 deletions include/lbt/converter.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
* \author Tobit Flatscher (github.com/2b-t)
*/

#ifndef LBT_CONVERTER
#define LBT_CONVERTER
#ifndef LBT__CONVERTER
#define LBT__CONVERTER
#pragma once

#include "lbt/unit/units.hpp"
#include "lbt/units/units.hpp"


namespace lbt {
Expand Down Expand Up @@ -138,4 +138,4 @@ namespace lbt {

}

#endif // LBT_CONVERTER
#endif // LBT__CONVERTER
Loading

0 comments on commit f30f8eb

Please sign in to comment.