tdo not remove NS values when Darcian fluid is selected - sphere - GPU-based 3D discrete element method algorithm with optional fluid coupling
(HTM) git clone git://src.adamsgaard.dk/sphere
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) LICENSE
---
(DIR) commit fde58d0c1249c6c7f9cde65c8f17c30a6517f79f
(DIR) parent 6d83996ddf0afa6017925b739e6c73055223e84c
(HTM) Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
Date: Tue, 26 Jan 2016 14:57:07 -0800
do not remove NS values when Darcian fluid is selected
Diffstat:
M python/sphere.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
---
(DIR) diff --git a/python/sphere.py b/python/sphere.py
t@@ -876,10 +876,12 @@ class sim:
self.p = numpy.delete(self.p, i)
self.color = numpy.delete(self.color, i)
if self.fluid:
- self.f_d = numpy.delete(self.f_d, i, axis=0)
+ # Darcy and Navier-Stokes
self.f_p = numpy.delete(self.f_p, i, axis=0)
- self.f_v = numpy.delete(self.f_v, i, axis=0)
- self.f_sum = numpy.delete(self.f_sum, i, axis=0)
+ if self.cfd_solver[0] == 0: # Navier-Stokes
+ self.f_d = numpy.delete(self.f_d, i, axis=0)
+ self.f_v = numpy.delete(self.f_v, i, axis=0)
+ self.f_sum = numpy.delete(self.f_sum, i, axis=0)
def deleteAllParticles(self):
'''