summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaudius "keldu" Holeksa <mail@keldu.de>2026-05-22 18:35:54 +0200
committerClaudius "keldu" Holeksa <mail@keldu.de>2026-05-22 18:35:54 +0200
commitcf4132d9a02271847e774035c4a49ff9158ba289 (patch)
treeca60cea2e670904be47878cc71ce1420489e197e
parent3b60c30226695421df2521c11a45177ff9b4086b (diff)
parent28aa0cdc4694b5364ca4b9f35ad6106d8e2f3149 (diff)
downloadlibs-lbm-cf4132d9a02271847e774035c4a49ff9158ba289.tar.gz
Merge branch 'dev'HEADmaster
-rw-r--r--lib/core/c++/SConscript3
-rw-r--r--lib/core/c++/particle/particle.hpp13
2 files changed, 15 insertions, 1 deletions
diff --git a/lib/core/c++/SConscript b/lib/core/c++/SConscript
index 85a078f..91f5b3e 100644
--- a/lib/core/c++/SConscript
+++ b/lib/core/c++/SConscript
@@ -18,6 +18,8 @@ core_env.headers = sorted(glob.glob(dir_path + "/*.hpp"));
core_env.particle_headers = sorted(glob.glob(dir_path + "/particle/*.hpp"));
core_env.particle_geometry_headers = sorted(glob.glob(dir_path + "/particle/geometry/*.hpp"));
+core_env.math_headers = sorted(glob.glob(dir_path + "/math/*.hpp"));
+
env.sources += core_env.sources;
env.headers += core_env.headers;
@@ -30,3 +32,4 @@ env.Install('$prefix/lib/', env.library_static);
env.Install('$prefix/include/kel/lbm/', core_env.headers);
env.Install('$prefix/include/kel/lbm/particle/', core_env.particle_headers);
env.Install('$prefix/include/kel/lbm/particle/geometry/', core_env.particle_geometry_headers);
+env.Install('$prefix/include/kel/lbm/math/', core_env.math_headers);
diff --git a/lib/core/c++/particle/particle.hpp b/lib/core/c++/particle/particle.hpp
index 5110893..938131b 100644
--- a/lib/core/c++/particle/particle.hpp
+++ b/lib/core/c++/particle/particle.hpp
@@ -79,7 +79,8 @@ saw::data<sch::ParticleGroup<T,D, sch::ParticleCollisionSpheroid<T,radius>>> cre
mask_dims.at({i}) = mask_resolution;
}
saw::data<sch::Scalar<T>> mask_step;
- saw::data<T> dia_d{radius*2};
+ saw::data<T> rad_d{radius};
+ saw::data<T> dia_d = rad_d * 2;
mask_step.at({}) = dia_d / mask_resolution.template cast_to<T>();
mask = {mask_dims};
@@ -89,6 +90,16 @@ saw::data<sch::ParticleGroup<T,D, sch::ParticleCollisionSpheroid<T,radius>>> cre
com.at({{i}}) = {};
}
saw::data<sch::UInt64> ele_ctr{0u};
+
+ // Radius ^ 2
+ saw::data<sch::Scalar<T>> rad_2_d;
+ rad_2_d.at({}) = rad_d * rad_d;
+
+ saw::data<sch::Vector<T,D>> center;
+ for(uint64_t i = 0u; i < D; ++i){
+ com.at({{i}}) = ;
+ }
+
iterator<D>::apply([&](const auto& index){
++ele_ctr;