tfixed bug in class render function - 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 9fc0fc43e1fb2089f6e7781b3265724025de521d
(DIR) parent af8c54c428fc06f48214ddbd8df52189fefd967f
(HTM) Author: Anders Damsgaard <adc@geo.au.dk>
Date: Thu, 24 Jan 2013 11:16:58 +0100
fixed bug in class render function
Diffstat:
M python/sphere.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---
(DIR) diff --git a/python/sphere.py b/python/sphere.py
t@@ -1004,7 +1004,7 @@ class Spherebin:
quiet = "-q"
# Render images using sphere raytracer
- subprocess.call("cd ..; ./sphere* " + quiet \
+ subprocess.call("cd ..; ./sphere " + quiet \
+ " --method " + method + " {}".format(max_val) \
+ " -l {}".format(lower_cutoff) \
+ " --render output/" + self.sid + "*.bin" \
t@@ -1222,7 +1222,8 @@ class Spherebin:
# Plot thinsection with gnuplot script
gamma = self.shearstrain()
- subprocess.call("""cd ../gnuplot/scripts && gnuplot -e "sid='{}'; gamma='{:.3}'" plotts.gp""".format(self.sid, self.shearstrain()), shell=True)
+ subprocess.call("""cd ../gnuplot/scripts && gnuplot -e "sid='{}'; gamma='{:.4}'; xmin='{}'; ymin='{}'; ymax='{}'" plotts.gp""".format(\
+ self.sid, self.shearstrain(), self.origo[0], self.L[0], self.origo[2], self.L[2]), shell=True)
# Find all particles who have a slip velocity higher than slipvel
slipvellimit = 0.01
t@@ -1295,7 +1296,7 @@ def video(project,
qscale = 1,
bitrate = 1800,
verbose = False):
- 'Use ffmpeg to combine images to animation'
+ 'Use ffmpeg to combine images to animation. All images should be rendered beforehand.'
# Possible loglevels: quiet, panic, fatal, error, warning, info, verbose, debug
loglevel = "info" # verbose = True
t@@ -1342,7 +1343,6 @@ def thinsectionVideo(project,
+ out_folder + "/" + project + "-ts-x1x3." + video_format, \
shell=True)
-
def visualize(project, method = 'energy', savefig = True, outformat = 'png'):
""" Visualize output from the target project,
where the temporal progress is of interest.