tmerge - 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 119cac8a4e5b392f9b41fb700d0fff088b3ad6b3
 (DIR) parent b275eec9d3daa93502b045ee37e173562489a5b7
 (HTM) Author: Anders Damsgaard Christensen <adc@geo.au.dk>
       Date:   Sun,  7 Apr 2013 03:38:26 +0200
       
       merge
       
       Diffstat:
         M python/sphere.py                    |      20 --------------------
       
       1 file changed, 0 insertions(+), 20 deletions(-)
       ---
 (DIR) diff --git a/python/sphere.py b/python/sphere.py
       t@@ -783,10 +783,6 @@ class Spherebin:
        
                for n in numpy.arange(bondparticles.shape[0]):
                    self.createBondPair(bondparticles[n,0], bondparticles[n,1], spacing)
       -<<<<<<< HEAD
       -=======
       -
       ->>>>>>> a4966d0106281e3fbecd21a0a132f7e76e851ad0
        
            def zeroKinematics(self):
                'Zero kinematics of particles'
       t@@ -822,10 +818,6 @@ class Spherebin:
                self.w_vel = numpy.zeros(1)
                self.w_force = numpy.zeros(1)
                self.w_devs = numpy.zeros(1)
       -<<<<<<< HEAD
       -=======
       -
       ->>>>>>> a4966d0106281e3fbecd21a0a132f7e76e851ad0
        
        
            def consolidate(self, deviatoric_stress = 10e3,
       t@@ -934,10 +926,6 @@ class Spherebin:
                self.time_file_dt[0] = file_dt
                self.time_step_count[0] = 0
        
       -<<<<<<< HEAD
       -=======
       -
       ->>>>>>> a4966d0106281e3fbecd21a0a132f7e76e851ad0
            def defaultParams(self,
                    mu_s = 0.4,
                    mu_d = 0.4,
       t@@ -1135,10 +1123,6 @@ class Spherebin:
                # Find the volume of solids
                V_solid = numpy.sum(V_sphere(self.radius))
                return (V_total - V_solid) / V_total
       -<<<<<<< HEAD
       -=======
       -
       ->>>>>>> a4966d0106281e3fbecd21a0a132f7e76e851ad0
        
            def porosity(self,
                    slices = 10,
       t@@ -1200,10 +1184,6 @@ class Spherebin:
                if (status != 0):
                    raise Exception("Error, the sphere run returned with status " + str(status))
        
       -<<<<<<< HEAD
       -=======
       -
       ->>>>>>> a4966d0106281e3fbecd21a0a132f7e76e851ad0
            def torqueScript(self,
                    email="adc@geo.au.dk",
                    email_alerts="ae",