From 1f797c2f9716c5b604dc6eee8335d9149d4a0b77 Mon Sep 17 00:00:00 2001 From: "Claudius \"keldu\" Holeksa" Date: Fri, 7 Aug 2026 15:42:42 +0200 Subject: Cleanup --- modules/core/c++/descriptor.hpp | 146 +--------------------------------------- 1 file changed, 3 insertions(+), 143 deletions(-) (limited to 'modules/core/c++/descriptor.hpp') diff --git a/modules/core/c++/descriptor.hpp b/modules/core/c++/descriptor.hpp index 9f7399a..ed64a0f 100644 --- a/modules/core/c++/descriptor.hpp +++ b/modules/core/c++/descriptor.hpp @@ -4,18 +4,14 @@ #include #include +#include "descriptor/d2q9.hpp" +#include "descriptor/d3q27.hpp" + namespace kel { namespace lbm { namespace sch { using namespace saw::schema; -template -struct Descriptor { - static constexpr uint64_t D = DV; - static constexpr uint64_t Q = QV; -}; - -using D2Q9 = Descriptor<2u,9u>; //using D2Q5 = Descriptor<2u,5u>; using D3Q27 = Descriptor<3u,27u>; @@ -51,9 +47,6 @@ struct CellFieldStruct { } -template -class df_info{}; - /* namespace impl { template @@ -137,139 +130,6 @@ public: static constexpr typename saw::native_data_type::type cs2 = 1./3.; }; -template -class df_info> { -public: - using Descriptor = sch::Descriptor<2,9>; - - static constexpr uint64_t D = 2u; - static constexpr uint64_t Q = 9u; - - static constexpr std::array, Q> directions = {{ - { 0, 0}, // 0 - {-1, 0}, // 1 - { 1, 0}, // 2 - { 0,-1}, // 3 - { 0, 1}, // 4 - {-1,-1}, // 5 - { 1, 1}, // 6 - {-1, 1}, // 7 - { 1,-1} // 8 - }}; - - static constexpr std::array::type,Q> weights = { - 4./9., - 1./9., - 1./9., - 1./9., - 1./9., - 1./36., - 1./36., - 1./36., - 1./36. - }; - - static constexpr std::array opposite_index = { - 0, - 2, - 1, - 4, - 3, - 6, - 5, - 8, - 7 - }; - - static constexpr typename saw::native_data_type::type inv_cs2 = 3.0; - static constexpr typename saw::native_data_type::type cs2 = 1./3.; -}; - - -template -class df_info> { -public: - using Descriptor = sch::Descriptor<3,27>; - - static constexpr uint64_t D = 3u; - static constexpr uint64_t Q = 27u; - - static constexpr std::array, Q> directions = {{ - { 0, 0, 0}, // 0 - // Into 1D - {-1, 0, 0}, // 1 - { 1, 0, 0}, // 2 - // Expand into 2D - { 0, -1, 0}, // 3 - {-1, -1, 0}, // 4 - { 1, -1, 0}, // 5 - { 0, 1, 0}, // 6 - {-1, 1, 0}, // 7 - { 1, 1, 0}, // 8 - // Expand into 3D - { 0, 0, -1}, // 9 - {-1, 0, -1}, // 10 - { 1, 0, -1}, // 11 - { 0, -1, -1},// 12 - {-1, -1, -1},// 13 - { 1, -1, -1},// 14 - { 0, 1, -1}, // 15 - {-1, 1, -1}, // 16 - { 1, 1, -1}, // 17 - { 0, 0, 1}, // 18 - {-1, 0, 1}, // 19 - { 1, 0, 1}, // 20 - { 0, -1, 1}, // 21 - {-1, -1, 1}, // 22 - { 1, -1, 1}, // 23 - { 0, 1, 1}, // 24 - {-1, 1, 1}, // 25 - { 1, 1, 1} // 26 - }}; - - static constexpr std::array::type,Q> weights = { - 8./27., - // 1D - 1./36., - 1./36., - // 2D - 1./36., - 1./54., - 1./54., - 1./36., - 1./54., - 1./54., - // 3D - 1./36., - 1./54., - 1./54., - 1./54., - 1./216., - 1./216., - 1./54., - 1./216., - 1./216., - 1./36., - 1./54., - 1./54., - 1./54., - 1./216., - 1./216., - 1./54., - 1./216., - 1./216. - }; - - static constexpr std::array opposite_index = { - 0,2,1, - 6,8,7,3,5,4, - 18,20,19,24,26,25,21,23,22,9,11,10,15,17,16,12,14,13 - }; - - static constexpr typename saw::native_data_type::type inv_cs2 = 3.0; - static constexpr typename saw::native_data_type::type cs2 = 1./3.; -}; - template class cell_schema_builder { -- cgit v1.2.3 From cf3ee2ab8de44160c24da7850955021142f41da8 Mon Sep 17 00:00:00 2001 From: "Claudius \"keldu\" Holeksa" Date: Fri, 7 Aug 2026 16:14:16 +0200 Subject: Clean up descriptors --- modules/core/c++/descriptor.hpp | 74 ++--------------------------------------- 1 file changed, 3 insertions(+), 71 deletions(-) (limited to 'modules/core/c++/descriptor.hpp') diff --git a/modules/core/c++/descriptor.hpp b/modules/core/c++/descriptor.hpp index ed64a0f..ac09e7b 100644 --- a/modules/core/c++/descriptor.hpp +++ b/modules/core/c++/descriptor.hpp @@ -4,7 +4,10 @@ #include #include +#include "descriptor/d1q3.hpp" +#include "descriptor/d2q5.hpp" #include "descriptor/d2q9.hpp" +#include "descriptor/d3q19.hpp" #include "descriptor/d3q27.hpp" namespace kel { @@ -12,9 +15,6 @@ namespace lbm { namespace sch { using namespace saw::schema; -//using D2Q5 = Descriptor<2u,5u>; -using D3Q27 = Descriptor<3u,27u>; - template struct Cell { using Descriptor = Desc; @@ -63,74 +63,6 @@ struct df_ct_helper { } */ -template -class df_info> { -public: - using Descriptor = sch::Descriptor<1,3>; - - static constexpr uint64_t D = 1u; - static constexpr uint64_t Q = 3u; - - static constexpr std::array,Q> directions = {{ - { 0}, - {-1}, - { 1} - }}; - - static constexpr std::array::type, Q> weights = { - 2./3., - 1./6., - 1./6. - }; - - static constexpr std::array opposite_index = { - 0,2,1 - }; - - static constexpr typename saw::native_data_type::type inv_cs2 = 3.0; - static constexpr typename saw::native_data_type::type cs2 = 1./3.; -}; - -/** - * D2Q5 Descriptor - */ -template -class df_info> { -public: - using Descriptor = sch::Descriptor<2,5>; - - static constexpr uint64_t D = 2u; - static constexpr uint64_t Q = 5u; - - static constexpr std::array, Q> directions = {{ - { 0, 0}, - {-1, 0}, - { 1, 0}, - { 0,-1}, - { 0, 1}, - }}; - - static constexpr std::array::type,Q> weights = { - 1./3., - 1./6., - 1./6., - 1./6., - 1./6. - }; - - static constexpr std::array opposite_index = { - 0, - 2, - 1, - 4, - 3 - }; - - static constexpr typename saw::native_data_type::type inv_cs2 = 3.0; - static constexpr typename saw::native_data_type::type cs2 = 1./3.; -}; - - template class cell_schema_builder { private: -- cgit v1.2.3