Writing was flipped on non square, cubic domains

1 files changed, 206 insertions, 16 deletions

diff --git a/examples/poiseulle_2d.cpp b/examples/poiseulle_2d.cpp
index dcdc7c3..54623f7 100644
--- a/examples/poiseulle_2d.cpp
+++ b/examples/poiseulle_2d.cpp
@@ -45,8 +45,92 @@ using MacroStruct = Struct<
 	Member<T, "pressure">
 >;
 
+template<typename T>
+using GeometryStruct = Struct<
+	Member<T, "info">
+>;
+
 using CavityFieldD2Q9 = CellField<D2Q9, CellStruct<D2Q9>>;
 }
+
+namespace cmpt {
+template<bool East>
+struct PressureBoundaryRestrictedVelocityTo {};
+}
+
+/**
+ * This is massively hacky and expects a lot of conditions
+ * Either this or mirrored along the horizontal line works
+ *
+ * 0 - 2 - 2
+ * 0 - 3 - 1
+ * 0 - 3 - 1
+ * .........
+ * 0 - 3 - 1
+ * 0 - 2 - 2
+ *
+ */
+template<typename FP,typename Descriptor, bool East>
+struct component<FP,Descriptor, cmpt::PressureBoundaryRestrictedVelocityTo<East>> {
+private:
+	saw::data<FP> pressure_setting_;
+	saw::data<FP> rho_setting_;
+public:
+	component(const saw::data<FP>& pressure_setting__):
+		pressure_setting_{pressure_setting__},
+		rho_setting_{pressure_setting__}
+	{}
+
+	template<typename CellFieldSchema>
+	void apply(saw::data<CellFieldSchema>& field, saw::data<sch::FixedArray<sch::UInt64,Descriptor::D>> index, uint64_t time_step){
+		using dfi = df_info<FP,Descriptor>;
+
+		bool is_even = ((time_step % 2) == 0);
+		auto& cell = field(index);
+
+		auto& dfs_old = (is_even) ? cell.template get<"dfs_old">() : cell.template get<"dfs">();
+		auto& dfs = (not is_even) ? cell.template get<"dfs_old">() : cell.template get<"dfs">();
+
+		saw::data<FP> sum_df{0};
+		for(saw::data<sch::UInt64> k{0u}; k < saw::data<sch::UInt64>{Descriptor::Q}; ++k){
+			auto c_k = dfi::directions[k.get()];
+			auto& cell_n = field({{index.at({0u})+c_k[0u], index.at({1u})+c_k[1u]}});
+			auto& info_n = cell_n.template get<"info">();
+			auto info_n_val = info_n({0u});
+			auto k_opp = dfi::opposite_index[k.get()];
+
+			if(info_n_val.get() > 0u){
+				sum_df += dfs_old({k_opp});
+			}
+		}
+		constexpr int known_dir = East ? 1 : 1;
+		auto sum_unknown_dfs = (pressure_setting_ - sum_df) * saw::data<FP>{known_dir};
+
+		for(saw::data<sch::UInt64> k{0u}; k < saw::data<sch::UInt64>{Descriptor::Q}; ++k){
+			auto c_k = dfi::directions[k.get()];
+			auto& cell_n = field({{index.at({0u})+c_k[0u], index.at({1u})+c_k[1u]}});
+			auto& info_n = cell_n.template get<"info">();
+			auto info_n_val = info_n({0u});
+			auto k_opp = dfi::opposite_index[k.get()];
+
+			if(info_n_val.get() > 0u){
+				sum_unknown_dfs += dfs_old({k}) * c_k[0u];
+			}
+		}
+
+		auto vel_x = sum_unknown_dfs / pressure_setting_;
+
+		if constexpr (East) {
+			dfs_old({2u}) = dfs_old({1u}) + saw::data<FP>{2.0 / 3.0} * rho_setting_ * vel_x;
+			dfs_old({6u}) = dfs_old({5u}) + saw::data<FP>{1.0 / 6.0} * rho_setting_ * vel_x + saw::data<FP>{0.5} * (dfs_old({4u}) - dfs_old({3u}));
+			dfs_old({8u}) = dfs_old({7u}) + saw::data<FP>{1.0 / 6.0} * rho_setting_ * vel_x + saw::data<FP>{0.5} * (dfs_old({3u}) - dfs_old({4u}));
+		}else if constexpr (not East){
+			dfs_old({1u}) = dfs_old({2u}) - saw::data<FP>{2.0 / 3.0} * rho_setting_ * vel_x;
+			dfs_old({5u}) = dfs_old({6u}) - saw::data<FP>{1.0 / 6.0} * rho_setting_ * vel_x + saw::data<FP>{0.5} * (dfs_old({3u}) - dfs_old({4u}));
+			dfs_old({7u}) = dfs_old({8u}) - saw::data<FP>{1.0 / 6.0} * rho_setting_ * vel_x + saw::data<FP>{0.5} * (dfs_old({4u}) - dfs_old({3u}));
+		}
+	}
+};
 }
 }
 
@@ -114,8 +198,96 @@ void set_geometry(saw::data<kel::lbm::sch::CavityFieldD2Q9>& latt){
 void set_initial_conditions(saw::data<kel::lbm::sch::CavityFieldD2Q9>& latt){
 	using namespace kel::lbm;
 
+	saw::data<sch::T> rho{1.0};
+	saw::data<sch::FixedArray<sch::T,sch::D2Q9::D>> vel{{0.01,0.0}};
+	auto eq = equilibrium<sch::T,sch::D2Q9>(rho, vel);
+
 	auto meta = latt.meta();
 
+	/**
+	 * Set distribution
+	 */
+	iterate_over([&](const saw::data<sch::FixedArray<sch::UInt64,2u>>& index){
+		auto& cell = latt(index);
+		auto& dfs = cell.template get<"dfs">();
+		auto& dfs_old = cell.template get<"dfs_old">();
+
+		for(saw::data<sch::UInt64> k = 0; k < saw::data<sch::UInt64>{sch::D2Q9::Q}; ++k){
+			dfs(k) = eq.at(k);
+			dfs_old(k) = eq.at(k);
+		}
+
+	}, {{0u,0u}}, meta);
+}
+
+void lbm_step(
+	saw::data<kel::lbm::sch::CavityFieldD2Q9>& latt,
+	uint64_t time_step
+){
+	using namespace kel::lbm;
+	using dfi = df_info<sch::T,sch::D2Q9>;
+
+	bool even_step = ((time_step % 2u) == 0u);
+  /**
+	* 1. Relaxation parameter \tau
+	*/
+	component<sch::T, sch::D2Q9, cmpt::BGK> coll{0.5384};
+	component<sch::T, sch::D2Q9, cmpt::BounceBack> bb;
+	component<sch::T, sch::D2Q9, cmpt::PressureBoundaryRestrictedVelocityTo<true>> inlet{1.1};
+	component<sch::T, sch::D2Q9, cmpt::PressureBoundaryRestrictedVelocityTo<false>> outlet{0.9};
+
+	auto meta = latt.meta();
+
+	/**
+	 * Collision
+	 */
+	iterate_over([&](const saw::data<sch::FixedArray<sch::UInt64,2u>>& index){
+		auto& cell = latt(index);
+		auto& info = cell.template get<"info">();
+
+		auto& dfs = cell.template get<"dfs">();
+		auto& dfs_old = cell.template get<"dfs_old">();
+
+		switch(info({0u}).get()){
+			case 1u: {
+				coll.apply(latt, index, time_step);
+				break;
+			}
+			case 2u: {
+				bb.apply(latt, index, time_step);
+				break;
+			}
+			case 3u: {
+				inlet.apply(latt, index, time_step);
+				break;
+			}
+			case 4u: {
+				outlet.apply(latt, index, time_step);
+				break;
+			}
+			default:
+				break;
+		}
+
+	}, {{0u,0u}}, meta);
+
+	// Stream
+	iterate_over([&](const saw::data<sch::FixedArray<sch::UInt64,2u>>& index){
+		auto& cell = latt(index);
+		auto& df_new = even_step ? cell.template get<"dfs">() : cell.template get<"dfs_old">();
+		auto& info_new = cell.template get<"info">();
+
+		if(info_new({0u}).get() > 0u){
+			for(uint64_t k = 0u; k < sch::D2Q9::Q; ++k){
+				auto dir = dfi::directions[dfi::opposite_index[k]];
+				auto& cell_dir_old = latt({{index.at({0u})+dir[0],index.at({1u})+dir[1]}});
+
+				auto& df_old = even_step ? cell_dir_old.template get<"dfs_old">() : cell_dir_old.template get<"dfs">();
+
+				df_new({k}) = df_old({k});
+			}
+		}
+	}, {{0u,0u}}, meta);
 }
 
 int main(int argc, char** argv){
@@ -148,39 +320,57 @@ int main(int argc, char** argv){
 
 	print_lbm_meta<sch::Float64,sch::Descriptor<2u,9u>>(conv, {conf.template get<"kinematic_viscosity">()});
 
-	saw::data<sch::FixedArray<sch::UInt64,sch::D2Q9::D>> dim{{32u, 8u}};
+	saw::data<sch::FixedArray<sch::UInt64,sch::D2Q9::D>> dim{{1024u, 128u}};
 	saw::data<sch::CavityFieldD2Q9, saw::encode::Native> lattice{dim};
-
-	set_geometry(lattice);
+	auto meta = lattice.meta();
 
 	/**
-	 * Print basic setup info
+	 * Setup geometry
 	 */
-	iterate_over([&](const saw::data<sch::FixedArray<sch::UInt64,2u>>& index){
-		auto& cell = lattice(index);
-		auto& info = cell.template get<"info">();
-		auto info_v = info({0u}).get();
-		std::cout<<(static_cast<uint32_t>(info_v));
+	set_geometry(lattice);
 
-		if( (index.at({1u}).get()+1u) < dim.at({1u}).get()){
-			std::cout<<" ";
-		}else{
-			std::cout<<"\n";
-		}
+	{
+
+		saw::data<sch::Array<sch::GeometryStruct<sch::T>, sch::D2Q9::D>> geo{dim};
+
+		iterate_over([&](const saw::data<sch::FixedArray<sch::UInt64,2u>>& index){
+			auto& cell = lattice(index);
+			auto& info = cell.template get<"info">();
 
-	}, {{0u,0u}}, dim);
+			geo(index).template get<"info">().set(info({0u}).get());
+		}, {{0u,0u}}, dim);
+
+		std::string vtk_f_name{"tmp/geometry.vtk"};
+		write_vtk_file(vtk_f_name, geo);
+	}
+
+	/**
+	 * Setup DFs
+	 */
+	set_initial_conditions(lattice);
 
 	saw::data<sch::Array<sch::MacroStruct<sch::T,sch::D2Q9::D>,sch::D2Q9::D>> macros{dim};
 
 	for(uint64_t i = 0u; i < 256u; ++i){
+		bool even_step = ((i % 2u) == 0u);
 
 		{
+			// Stream
+			iterate_over([&](const saw::data<sch::FixedArray<sch::UInt64,2u>>& index){
+				auto& cell = lattice(index);
+				auto& dfs = even_step ? cell.template get<"dfs">() : cell.template get<"dfs_old">();
+
+				auto& rho = macros.at(index).template get<"pressure">();
+				auto& vel = macros.at(index).template get<"velocity">();
+				compute_rho_u<sch::T,sch::D2Q9>(dfs,rho,vel);
+
+			}, {{0u,0u}}, meta);
 			std::string vtk_f_name{"tmp/poiseulle_2d_"};
 			vtk_f_name += std::to_string(i) + ".vtk";
 			write_vtk_file(vtk_f_name, macros);
 		}
 
-		// lbm_step(lattice, i);
+		lbm_step(lattice, i);
 	}
 
 	return 0;