summaryrefslogtreecommitdiff
path: root/modules/core/c++/fplbm.hpp
diff options
context:
space:
mode:
Diffstat (limited to 'modules/core/c++/fplbm.hpp')
-rw-r--r--modules/core/c++/fplbm.hpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/core/c++/fplbm.hpp b/modules/core/c++/fplbm.hpp
index 37074b0..382d067 100644
--- a/modules/core/c++/fplbm.hpp
+++ b/modules/core/c++/fplbm.hpp
@@ -46,7 +46,7 @@ public:
auto& rho_f = macros.template get<"density">();
auto& rho = rho_f.at(index);
- auto& vel_f = macros.template get<"velocity">();
+ auto& vel_f = macros.template get<"momentum">();
auto& vel = vel_f.at(index);
compute_rho_u<T,Descriptor>(dfs,rho,vel);
@@ -86,7 +86,7 @@ public:
auto& rho_f = macros.template get<"density">();
saw::data<sch::Scalar<T>>& rho = rho_f.at(index);
- auto& vel_f = macros.template get<"velocity">();
+ auto& vel_f = macros.template get<"momentum">();
saw::data<sch::Vector<T,Descriptor::D>> vel = vel_f.at(index);
auto& force_f = macros.template get<"force">();
@@ -148,7 +148,7 @@ public:
// auto& dfs = dfs_old_f.at(index);
auto& rho_f = macros.template get<"density">();
- auto& vel_f = macros.template get<"velocity">();
+ auto& vel_f = macros.template get<"momentum">();
auto& por_f = macros.template get<"porosity">();
auto& force_f = macros.template get<"force">();
@@ -204,7 +204,7 @@ public:
// vel_s is technically time the density of the particle?
- force = ( vel_s * rho - vel * rho ) * two * flip_por;
+ force = ( vel_s * rho - vel * rho ) /* two */ * flip_por;
force_p = force_p - force;
}, aabb.template get<"a">(), aabb.template get<"b">());
@@ -245,7 +245,7 @@ public:
auto& dfs = dfs_old_f.at(index);
auto& rho_f = macros.template get<"density">();
- auto& vel_f = macros.template get<"velocity">();
+ auto& vel_f = macros.template get<"momentum">();
auto& por_f = macros.template get<"porosity">();
// Temporary find a better way