Merge branch 'dev'

3 files changed, 92 insertions, 7 deletions

diff --git a/lib/core/c++/math/n_linear.hpp b/lib/core/c++/math/n_linear.hpp
new file mode 100644
index 0000000..62906cd
--- /dev/null
+++ b/lib/core/c++/math/n_linear.hpp
@@ -0,0 +1,29 @@
+#pragma once
+
+#include "../common.hpp"
+
+namespace kel {
+namespace lbm {
+
+template<typename FieldSchema, typename T, uint64_t D>
+void n_linear_interpolate(const saw::data<FieldSchema>& field, const saw::data<sch::FixedArray<T,D>>& pos){
+
+	auto pos_bound = pos;
+	auto meta = field.dims();
+	saw::data<sch::UInt64> ind;
+	for(saw::data<sch::UInt64> i{0u}; i < saw::data<sch::UInt64>{D}; ++i){
+		pos_bound.at(i).set(
+			std::max(
+				std::min(
+					meta.at(i).template cast_to<T>().get(),
+					pos.at(i).get() + 1.5
+				),
+				1,
+			)
+			-1
+		);
+		ind.at(i) = pos_bound.at(i).template cast_to<sch::UInt64>();
+	}
+}
+}
+}
diff --git a/lib/core/c++/particle/blur.hpp b/lib/core/c++/particle/blur.hpp
new file mode 100644
index 0000000..a304e8d
--- /dev/null
+++ b/lib/core/c++/particle/blur.hpp
@@ -0,0 +1,37 @@
+#pragma once
+
+namespace kel {
+namespace lbm {
+template<typename T, uint64_t D>
+void blur_mask(saw::data<sch::Array<T,D>>& p_mask){
+
+	saw::data<T> mid{2.0/3.0};
+	saw::data<T> edge{1.0/6.0};
+
+	// saw::data<sch::FixedArray<sch::UInt64>,2u> blur_weights{{2.0/3.0},{1.0/6.0}};
+
+	auto meta = p_mask.dims();
+	saw::data<sch::Array<T,D>> blurred_mask{meta};
+
+	for(saw::data<sch::UInt64> i{0u}; i < saw::data<sch::UInt64>{D}; ++i){
+		iterator<D>::apply([&](const auto& index){
+			blurred_mask.at(index) = p_mask.at(index) * mid;
+
+			if(index.at({i}).get() > 0u){
+				auto l_ind = index;
+				l_ind.at({i}) = ind.at({i}) - 1u;
+				blurred_mask.at(index) = blurred_mask.at(index) + p_mask.at(l_ind) * edge;
+			}
+			if((index.at({i}).get() + 1u) < meta.at({i})){
+				auto r_ind = index;
+				r_ind.at({i}) = ind.at({i}) + 1u;
+				blurred_mask.at(index) = blurred_mask.at(index) + p_mask.at(r_ind) * edge;
+			}
+		},{},meta);
+
+		p_mask = blurred_mask;
+	}
+
+}
+}
+}
diff --git a/lib/core/c++/particle/geometry/circle.hpp b/lib/core/c++/particle/geometry/circle.hpp
index 331f06d..cf9b87e 100644
--- a/lib/core/c++/particle/geometry/circle.hpp
+++ b/lib/core/c++/particle/geometry/circle.hpp
@@ -5,7 +5,7 @@
 namespace kel {
 namespace lbm {
 
-template<typename T>
+template<typename T, uint64_t D>
 class particle_circle_geometry {
 private:
 public:
@@ -13,8 +13,8 @@ public:
 	{}
 
 	template<typename MT = T>
-	saw::data<sch::ParticleMask<MT,2>> generate_mask(uint64_t resolution, uint64_t boundary_nodes = 0) const {
-		saw::data<sch::ParticleMask<MT,2>> mask;
+	saw::data<sch::ParticleMask<MT,D>> generate_mask(uint64_t resolution, uint64_t boundary_nodes = 0) const {
+		saw::data<sch::ParticleMask<MT,D>> mask;
 
 		auto& grid = mask.template get<"grid">();
 		auto& com = mask.template get<"center_of_mass">();
@@ -28,6 +28,24 @@ public:
 		saw::data<T> delta_x{static_cast<typename saw::native_data_type<T>::type>(2.0  / static_cast<double>(diameter_i))};
 		saw::data<T> center = (saw::data<T>{1.0} + saw::data<T>{2.0} * saw::data<T>{static_cast<saw::native_data_type<T>::type>(boundary_nodes)/diameter_i});
 
+		saw::data<sch::FixedArray<sch::UInt64,D>> boundary_arr;
+		for(uint64_t i = 0u; i < D; ++i){
+			boundary_arr.set(boundary_nodes);
+		}
+
+		iterator<D>::apply([&](const auto& index){
+			grid.at(index).set(0);
+		}, {}, grid.dims());
+		
+		iterator<D>::apply([&](const auto& index){
+			saw::data<sch::Vector<T,D>> f_ind;
+			for(uint64_t i = 0u; i < D; ++i){
+				f_ind.at({{i}}) = (index.at({{i}}) + 0.5) * delta_x - center;
+			}
+
+			auto norm_f_ind = saw::math::norm(f_ind);
+		}, {}, grid.dims(),boundary_arr);
+
 		for(uint64_t i = 0; i < size; ++i){
 			for(uint64_t j = 0; j < size; ++j){
 				grid.at({{i,j}}).set(0);
@@ -43,18 +61,19 @@ public:
 			}
 		}
 
+		// I don't fully remember what this did
 		saw::data<T> total_mass{};
-		iterate_over([&](const saw::data<sch::FixedArray<sch::UInt64,2u>>& index){
+		iterator::apply<D>::apply([&](const saw::data<sch::FixedArray<sch::UInt64,D>>& index){
 			auto ind_vec = saw::math::vectorize_data(index).template cast_to<T>();
-			for(uint64_t i{0u}; i < 2u; ++i){
+			for(uint64_t i{0u}; i < D; ++i){
 				ind_vec.at({{i}}) = ind_vec.at({{i}}) * grid.at(index);
 			}
 			com = com + ind_vec;
 
 			total_mass = total_mass + grid.at(index);
-		},{{0u,0u}}, grid.dims());
+		},{}, grid.dims());
 
-		for(uint64_t i{0u}; i < 2u; ++i){
+		for(uint64_t i{0u}; i < D; ++i){
 			com.at({{i}}) = com.at({{i}}) / total_mass;
 		}