diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/core/c++/fplbm.hpp | 5 | ||||
| -rw-r--r-- | modules/core/c++/particle/particle.hpp | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/modules/core/c++/fplbm.hpp b/modules/core/c++/fplbm.hpp index 840db99..9514c93 100644 --- a/modules/core/c++/fplbm.hpp +++ b/modules/core/c++/fplbm.hpp @@ -93,8 +93,8 @@ public: saw::data<sch::Vector<T,Descriptor::D>> vel = vel_f.at(index); // compute_rho_u<T,Descriptor>(dfs,rho,vel); - vel = vel + force * half / rho; auto eq = equilibrium<T,Descriptor>(rho,vel); + vel = vel + force * half / rho; using dfi = df_info<T,Descriptor>; @@ -206,8 +206,7 @@ public: // vel_s is technically time the density of the particle? - force = ( vel_s * rho - vel * rho ) * rho * flip_por; - // force = ( vel_s * rho - vel * rho ) * flip_por; + force = ( vel_s * rho - vel * rho ) * flip_por; // force = ( vel_s * rho - vel * rho ) /* (two / three) */ * flip_por; force_p = force_p - force; diff --git a/modules/core/c++/particle/particle.hpp b/modules/core/c++/particle/particle.hpp index 21b4b34..25c1776 100644 --- a/modules/core/c++/particle/particle.hpp +++ b/modules/core/c++/particle/particle.hpp @@ -247,10 +247,14 @@ constexpr auto broadphase_collision_check = []( return broadphase_collision_distance_squared<T,D,Collision>(left,coll_l,right,coll_r).first; }; +template<typename T,uint64_t D, uint64_t PartAmount> +constexpr auto particle_dem_lambda = [](saw::data<sch::ParticleGroup<T,D,PartAmount, coll::Spheroid<T>>>& particle, saw::data<sch::Scalar<T>> time_step_delta){ + for(uint64_t i{0u}; i < PartAmount; ++i){ + auto has_collided = false; + } +}; -namespace impl { -} } } |