changed the 2D gmsh to work with new baker method

bin/parse_gmsh.py

@@ -14,9 +14,10 @@ if __name__ == '__main__':
     sys.exit(1)
 
   g = gmsh_grid(sys.argv[1])
+  g.q = np.array([exact_func(x) for x in g.verts])
   # g.dump_to_blender_files()
 
-  X = np.array([0.2, 0.5, 0.0])
+  X = np.array([0.2, 0.5]) #TODO:, 0.0])
   R = g.get_containing_simplex(X)
   print R
   R, S = g.get_simplex_and_nearest_points(X, 10)
@@ -64,18 +65,17 @@ if __name__ == '__main__':
   e = exact_func(X)
   print e
   print improved_answer(a, e)
-  sys.exit(0)
 
   results = {True:0, False:0}
   for i in xrange(1000):
-    X = np.random.random((1,3))[0]
+    X = np.random.random((1,2))[0]
 
     try:
-      a = g.run_baker(X, order=2, extra_points = 10)
+      a = g.run_baker(X, order=2, extra_points = 3)
       e = exact_func(X)
       ia = improved_answer(a, e)
-      if not ia:
-        print a['final'] - e, a, e
+      # if not ia:
+      #   print a['final'] - e, a, e
       results[ia] += 1
     except Exception,e:
       print >>sys.stderr, e