From 6e4d8c950544acd09552ee7be4b8af595f207f22 Mon Sep 17 00:00:00 2001
From: Stephen Mardson McQuay <stephen@mcquay.me>
Date: Wed, 2 Mar 2011 23:44:08 -0700
Subject: [PATCH] joining code

---
 bin/master.py       | 4 +++-
 bin/parse_gmsh3D.py | 9 +--------
 interp/tools.py     | 4 ++++
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/bin/master.py b/bin/master.py
index 028fd64..2d89fde 100644
--- a/bin/master.py
+++ b/bin/master.py
@@ -3,6 +3,8 @@
 import interp.bootstrap
 from multiprocessing.managers import BaseManager
 
+from interp.grid.gmsh import gmsh_grid3D
+
 class QueueManager(BaseManager): pass
 QueueManager.register('get_inqueue' )
 QueueManager.register('get_outqueue')
@@ -10,5 +12,5 @@ QueueManager.register('get_outqueue')
 m = QueueManager(address=('install', 50000), authkey='asdf')
 m.connect()
 
-inq = m.get_inqueue()
+inq  = m.get_inqueue()
 outq = m.get_outqueue()
diff --git a/bin/parse_gmsh3D.py b/bin/parse_gmsh3D.py
index 64318fa..22bf484 100755
--- a/bin/parse_gmsh3D.py
+++ b/bin/parse_gmsh3D.py
@@ -7,17 +7,10 @@ import numpy as np
 
 import interp.bootstrap
 from   interp.grid.gmsh import gmsh_grid3D
-from   interp.tools import improved_answer, log
+from   interp.tools import improved_answer, log, exact
 
 from interp.grid import grid
 
-def exact(X):
-  x = X[0]
-  y = X[1]
-  z = X[2]
-  return 1+ x*x + y*y + z*z
-
-
 
 if __name__ == '__main__':
   if len(sys.argv) != 2:
diff --git a/interp/tools.py b/interp/tools.py
index f8619ce..bd68680 100644
--- a/interp/tools.py
+++ b/interp/tools.py
@@ -62,6 +62,10 @@ def exact_func_3D(X):
   log.debug(answer)
   return answer
 
+def exact(X):
+  x,y,z = X
+  return 1 + x*x + y*y + z*z
+
 def improved_answer(answer, exact, verbose=False):
   if not answer['error']:
     return True