tAdd dimensionality check for non-rotating grains during momentum integration -… | |
git clone git://src.adamsgaard.dk/Granular.jl | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 985ca340ec43f3bc4c581503513756d2bd60083e | |
parent 0045cc69032ba0ebbbff2f1163130567155291e0 | |
Author: Anders Damsgaard <[email protected]> | |
Date: Mon, 11 Mar 2019 12:50:20 +0100 | |
Add dimensionality check for non-rotating grains during momentum integration | |
Diffstat: | |
M src/interaction.jl | 4 ++-- | |
1 file changed, 2 insertions(+), 2 deletions(-) | |
--- | |
diff --git a/src/interaction.jl b/src/interaction.jl | |
t@@ -434,8 +434,8 @@ function interactGrains!(simulation::Simulation, i::Int, j… | |
simulation.grains[i].torque[3] += -force_t*R_ij + M_t | |
simulation.grains[j].torque[3] += -force_t*R_ij - M_t | |
else | |
- simulation.grains[i].force += force_n*n; | |
- simulation.grains[j].force -= force_n*n; | |
+ simulation.grains[i].force += vecTo3d(force_n.*n); | |
+ simulation.grains[j].force -= vecTo3d(force_n.*n); | |
end | |
simulation.grains[i].pressure += |