From bf993339d68328fdc8695e9338fef4a6db90c8cd Mon Sep 17 00:00:00 2001 From: Stephen Mardson McQuay Date: Mon, 28 Mar 2011 15:36:50 -0600 Subject: [PATCH] moved the blender funcs into the main grid object --- interp/grid/__init__.py | 8 ++++++++ interp/grid/gmsh.py | 7 ------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/interp/grid/__init__.py b/interp/grid/__init__.py index 3fa83e9..19807ed 100644 --- a/interp/grid/__init__.py +++ b/interp/grid/__init__.py @@ -1,5 +1,6 @@ import sys from collections import defaultdict +import pickle from xml.dom.minidom import Document @@ -173,6 +174,13 @@ class grid(object): self.q *= new_max/largest_number + def dump_to_blender_files(self, pfile = '/tmp/points.p', cfile = '/tmp/cells.p'): + if len(self.verts[0]) == 2: + pickle.dump([(p[0], p[1], 0.0) for p in self.verts], open(pfile, 'w')) + else: + pickle.dump([(p[0], p[1], p[2]) for p in self.verts], open(pfile, 'w')) + + pickle.dump([f.verts for f in self.cells.itervalues()], open(cfile, 'w')) def get_xml(self): doc = Document() diff --git a/interp/grid/gmsh.py b/interp/grid/gmsh.py index 0dab7cf..19ddcdd 100644 --- a/interp/grid/gmsh.py +++ b/interp/grid/gmsh.py @@ -99,9 +99,6 @@ class gmsh_grid(grid): self.cells[v[0]].add_neighbor(self.cells[v[1]]) self.cells[v[1]].add_neighbor(self.cells[v[0]]) - def dump_to_blender_files(self, pfile = '/tmp/points.p', ffile = '/tmp/cells.p'): - pickle.dump([(p[0], p[1], 0.0) for p in self.verts], open(pfile, 'w')) - pickle.dump([f.verts for f in self.cells.itervalues()], open(ffile, 'w')) class gmsh_grid3D(grid): @@ -174,7 +171,3 @@ class gmsh_grid3D(grid): if len(v) > 1: self.cells[v[0]].add_neighbor(self.cells[v[1]]) self.cells[v[1]].add_neighbor(self.cells[v[0]]) - - def dump_to_blender_files(self, pfile = '/tmp/points.p', ffile = '/tmp/cells.p'): - pickle.dump([(p[0], p[1], p[2]) for p in self.verts], open(pfile, 'w')) - pickle.dump([f.verts for f in self.cells.itervalues()], open(ffile, 'w'))