tadded Zdisplacement component - sphere - GPU-based 3D discrete element method algorithm with optional fluid coupling
HTML git clone git://src.adamsgaard.dk/sphere
DIR Log
DIR Files
DIR Refs
DIR LICENSE
---
DIR commit 45015224a9aa5cdd2491c36a4d671a7d2972a877
DIR parent af3360fc4686a3ebc3423e44b148a4bcebdc9ec1
HTML Author: Anders Damsgaard <anders.damsgaard@geo.au.dk>
Date: Sun, 22 Jun 2014 09:11:05 +0200
added Zdisplacement component
Diffstat:
M doc/html/python_api.html | 2 +-
M doc/html/searchindex.js | 4 ++--
M doc/pdf/sphere.pdf | 0
M python/sphere.py | 47 ++++++++++++++++++-------------
M src/datatypes.h | 2 +-
M src/device.cu | 14 +++++++-------
M src/file_io.cpp | 12 +++++++-----
M src/integration.cuh | 21 ++++++++++++---------
M src/raytracer.cuh | 4 ++--
M src/sphere.cpp | 2 +-
M src/sphere.h | 2 +-
M tests/io_tests_fluid.py | 2 +-
12 files changed, 63 insertions(+), 49 deletions(-)
---
DIR diff --git a/doc/html/python_api.html b/doc/html/python_api.html
t@@ -328,7 +328,7 @@ are returned.</p>
<dl class="method">
<dt id="sphere.sim.addParticle">
-<tt class="descname">addParticle</tt><big>(</big><em>x</em>, <em>radius</em>, <em>xysum=array([ 0.</em>, <em>0.])</em>, <em>vel=array([ 0.</em>, <em>0.</em>, <em>0.])</em>, <em>fixvel=array([ 0.])</em>, <em>force=array([ 0.</em>, <em>0.</em>, <em>0.])</em>, <em>angpos=array([ 0.</em>, <em>0.</em>, <em>0.])</em>, <em>angvel=array([ 0.</em>, <em>0.</em>, <em>0.])</em>, <em>torque=array([ 0.</em>, <em>0.</em>, <em>0.])</em>, <em>es_dot=array([ 0.])</em>, <em>es=array([ 0.])</em>, <em>ev_dot=array([ 0.])</em>, <em>ev=array([ 0.])</em>, <em>p=array([ 0.])</em>, <em>color=0</em><big>)</big><a class="headerlink" href="#sphere.sim.addParticle" title="Permalink to this definition">¶</a></dt>
+<tt class="descname">addParticle</tt><big>(</big><em>x</em>, <em>radius</em>, <em>xyzsum=array([ 0.</em>, <em>0.</em>, <em>0.])</em>, <em>vel=array([ 0.</em>, <em>0.</em>, <em>0.])</em>, <em>fixvel=array([ 0.])</em>, <em>force=array([ 0.</em>, <em>0.</em>, <em>0.])</em>, <em>angpos=array([ 0.</em>, <em>0.</em>, <em>0.])</em>, <em>angvel=array([ 0.</em>, <em>0.</em>, <em>0.])</em>, <em>torque=array([ 0.</em>, <em>0.</em>, <em>0.])</em>, <em>es_dot=array([ 0.])</em>, <em>es=array([ 0.])</em>, <em>ev_dot=array([ 0.])</em>, <em>ev=array([ 0.])</em>, <em>p=array([ 0.])</em>, <em>color=0</em><big>)</big><a class="headerlink" href="#sphere.sim.addParticle" title="Permalink to this definition">¶</a></dt>
<dd><p>Add a single particle to the simulation object. The only required
parameters are the position (x) and the radius (radius).</p>
<table class="docutils field-list" frame="void" rules="none">
DIR diff --git a/doc/html/searchindex.js b/doc/html/searchindex.js
t@@ -1 +1 @@
mx1.adamsgaard.dk:70 /src/sphere/commit/45015224a9aa5cdd2491c36a4d671a7d2972a877.gph:43: line too long