From aebb81eb98baf2ded6321f7cb3a58dc369683c19 Mon Sep 17 00:00:00 2001 From: nhorelik Date: Sun, 14 Apr 2013 18:33:47 -0400 Subject: [PATCH] Removed unnecessary xyz coords in voxel binary dump --- docs/source/usersguide/input.rst | 2 +- src/plot.F90 | 2 +- src/utils/voxel.py | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/docs/source/usersguide/input.rst b/docs/source/usersguide/input.rst index 9dbf361af..a99d5c418 100644 --- a/docs/source/usersguide/input.rst +++ b/docs/source/usersguide/input.rst @@ -1024,7 +1024,7 @@ attribute or sub-element: .. warning:: The ``pixels`` input determines the output file size. For the PPM format, 10 million pixels will result in a file just under 30 MB in size. A 10 million voxel binary file will be around - 152 MB. + 40 MB. .. warning:: If the aspect ratio defined in ``pixels`` does not match the aspect ratio defined in ``width`` the plot may appear stretched diff --git a/src/plot.F90 b/src/plot.F90 index 0ddcd238f..5c454c672 100644 --- a/src/plot.F90 +++ b/src/plot.F90 @@ -258,7 +258,7 @@ contains call position_rgb(pl, rgb, id) ! write to plot file - write(UNIT_PLOT) x, y, z, id + write(UNIT_PLOT) id ! advance particle in z direction p % coord0 % xyz(3) = p % coord0 % xyz(3) + vox(3) diff --git a/src/utils/voxel.py b/src/utils/voxel.py index 91ff077ff..4451a017f 100755 --- a/src/utils/voxel.py +++ b/src/utils/voxel.py @@ -41,10 +41,8 @@ def main(file_, o): sys.stdout.flush() for y in range(1,ny+1): for z in range(1,nz+1): - xm,ym,zm,id_ = get_int(fh, 4) + id_ = get_int(fh)[0] silomesh.set_value(float(id_), x, y, z) - if not x == xm or not y == ym or not z == zm: - raise Exception("mesh mismatch!") print silomesh.finalize_var() silomesh.finalize_mesh()