From d3963db59ae51c26a687edfd44bc5c96a4128dcf Mon Sep 17 00:00:00 2001
From: "Stephen M. McQuay" <smcquay@fusionio.com>
Date: Tue, 27 Sep 2011 22:08:10 -0600
Subject: [PATCH] fixed minor bugs in running the master/minon setup

---
 bin/master.py | 18 ++++++------------
 bin/minion.py |  9 ++++-----
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/bin/master.py b/bin/master.py
index f4cb9cb..0747ecc 100644
--- a/bin/master.py
+++ b/bin/master.py
@@ -1,22 +1,17 @@
 #!/usr/bin/env python
 
-import sys
-import os
-
-import time
-import shelve
 from collections import defaultdict
-from optparse        import OptionParser
-
-import logging
-log = logging.getLogger("interp")
+from optparse import OptionParser
+import os
+from progressbar import ProgressBar, Percentage, Bar, ETA
+import shelve
+import sys
+import time
 
 import numpy as np
 
 from     interp.cluster import QueueManager, get_qs
 
-from progressbar import ProgressBar, Percentage, Bar, ETA
-
 if __name__ == '__main__':
     parser = OptionParser(usage="usage: %s [options] <server> <interp count>")
 
@@ -132,7 +127,6 @@ if __name__ == '__main__':
     stats['order'] = options.order
 
     print "%s" % stats
-    log.error("stats: %s", stats)
 
     tasks_accomplished_by = defaultdict(int)
     for i in results:
diff --git a/bin/minion.py b/bin/minion.py
index cb14046..ac2aa13 100644
--- a/bin/minion.py
+++ b/bin/minion.py
@@ -4,10 +4,9 @@ import sys
 import os
 from optparse import OptionParser
 
-import numpy as np
 
-from     interp.grid.gmsh import ggrid
-from     interp.tools import baker_exact_3D as exact
+from interp.grid.gmsh import ggrid
+from interp.tools import baker_exact_3D as exact, exact_me
 from interp.cluster import QueueManager, get_qs
 
 if __name__ == '__main__':
@@ -41,7 +40,7 @@ if __name__ == '__main__':
     if options.verbose:
         print "%s: starting parse input file" % myname
     g = ggrid(input_file)
-    g.q = np.array([exact(x) for x in g.verts])
+    g.values = exact_me(g.points, exact)
     if options.verbose:
         print "%s: done parsing input file" % myname
 
@@ -62,7 +61,7 @@ if __name__ == '__main__':
         while not tasksq.empty():
             i, o, e, X = tasksq.get()
             try:
-                a = g.run_baker(X, order=o, extra_points=e)
+                a = g.interpolate(X, order=o, extra_points=e)
                 resultsq.put((i, myname, a.qlin, a.error, a.final, exact(X)))
             except Exception as e:
                 print X, e