diff options
Diffstat (limited to 'modules/core/c++/psm.hpp')
| -rw-r--r-- | modules/core/c++/psm.hpp | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/modules/core/c++/psm.hpp b/modules/core/c++/psm.hpp index 1dca64b..f5a8452 100644 --- a/modules/core/c++/psm.hpp +++ b/modules/core/c++/psm.hpp @@ -79,22 +79,6 @@ public: uint64_t i_opp = dfi::opposite_index[i]; dfs.at({i}) = dfs_cpy.at({i}) + frequency_ * (eq.at(i) - dfs_cpy.at({i})) * porous.at({}) + (dfs_cpy.at({i_opp}) - dfs_cpy.at({i}) ) * flip_porous; } - - auto& force_f = macros.template get<"force">(); - auto& force = force_f.at(index); - for(uint64_t k{0u}; k < Descriptor::D; ++k){ - force.at({{k}}).set(0); - } - - for(uint64_t i{0u}; i < Descriptor::Q; ++i){ - uint64_t i_opp = dfi::opposite_index[i]; - auto dfs_diff = dfs.at({i}) - dfs.at({i_opp}); - for(uint64_t k{0u}; k < Descriptor::D; ++k){ - force.at({{k}}) = force.at({{k}}) + dfs_diff * dfi::directions[i][k]; - } - } - - force = force * porous; } }; @@ -314,14 +298,9 @@ void apply( /* * ------------------------------------------------ - * D3Q27 / general Q momentum exchange - * * We exclude i=0 because the rest population has * no momentum. * - * The original code summed both directions of - * every opposite pair. Therefore we apply 1/2 - * after the sum. * ------------------------------------------------ */ @@ -425,46 +404,10 @@ void apply( + e_i * dfs_added_v; } - - /* - * ------------------------------------------------ - * Since both i and i_opp were included above, - * compensate for double counting. - * - * This is the important change from your original - * implementation. - * ------------------------------------------------ - */ - - - - momentum = - momentum * half; - - - /* - * ------------------------------------------------ - * PSM solid fraction - * - * por = 1 -> fluid - * por = 0 -> particle - * - * Therefore: - * - * flip_por = 1 - por - * ------------------------------------------------ - */ - auto flip_por = one - por; - /* - * ------------------------------------------------ - * Force transferred TO FLUID - * ------------------------------------------------ - */ - auto& force = force_f.at(index_f); |