tvideo() adapted to new file name format - sphere - GPU-based 3D discrete eleme… | |
git clone git://src.adamsgaard.dk/sphere | |
Log | |
Files | |
Refs | |
LICENSE | |
--- | |
commit 64e76c5f86212627f079b05da0ded770660c1dff | |
parent 84689fe3abac69016675da1d814c657ebb62a0c5 | |
Author: Anders Damsgaard <[email protected]> | |
Date: Thu, 29 Nov 2012 18:33:16 +0100 | |
video() adapted to new file name format | |
Diffstat: | |
M python/sphere.py | 24 +++++++++++++++++++----- | |
1 file changed, 19 insertions(+), 5 deletions(-) | |
--- | |
diff --git a/python/sphere.py b/python/sphere.py | |
t@@ -10,13 +10,27 @@ import subprocess | |
numpy.seterr(all='warn', over='raise') | |
class Spherebin: | |
- """ Class containing all data SPHERE data. | |
- Contains functions for reading and writing | |
- binaries. | |
+ """ | |
+ Class containing all data SPHERE data. | |
+ | |
+ Contains functions for reading and writing binaries, as well as simulation | |
+ setup and data analysis. | |
""" | |
def __init__(self, np = 1, nd = 3, nw = 1, sid = 'unnamed'): | |
- 'Constructor - Initializes arrays' | |
+ """ | |
+ Constructor - initializes arrays | |
+ | |
+ :param np: the number of particles to allocate memory for | |
+ :param nd: the number of spatial dimensions | |
+ :param nw: the number of dynamic walls | |
+ :param sid: the simulation id | |
+ :type np: int | |
+ :type nd: int | |
+ :type nw: int | |
+ :type sid: string | |
+ | |
+ """ | |
self.nd = numpy.ones(1, dtype=numpy.int32) * nd | |
self.np = numpy.ones(1, dtype=numpy.uint32) * np | |
t@@ -1058,7 +1072,7 @@ def video(project, | |
subprocess.call(\ | |
"ffmpeg -qscale {0} -r {1} -b {2} -y ".format(qscale, fps, bitrate… | |
+ "-loglevel " + loglevel + " " \ | |
- + "-i " + graphics_folder + project + ".output%d." + graphics_form… | |
+ + "-i " + graphics_folder + project + ".output%05d." + graphics_fo… | |
+ out_folder + "/" + project + "." + video_format, shell=True) | |