From 1b91fbcfca374c7f351315bd9c5f246b33463d24 Mon Sep 17 00:00:00 2001
From: Stephen Mardson McQuay <stephen@mcquay.me>
Date: Tue, 22 Mar 2011 16:06:08 -0600
Subject: [PATCH] minor: logging changes

---
 interp/baker/__init__.py | 18 +++++++++++-------
 interp/grid/DD.py        |  1 -
 interp/grid/DDD.py       |  1 -
 interp/grid/gmsh.py      |  3 +++
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/interp/baker/__init__.py b/interp/baker/__init__.py
index 4d78829..402a6bd 100644
--- a/interp/baker/__init__.py
+++ b/interp/baker/__init__.py
@@ -5,7 +5,7 @@ import numpy as np
 import itertools
 
 import logging
-log = logging.getLogger("interp")
+log = logging.getLogger('interp')
 
 def get_phis(X, R):
   """
@@ -75,6 +75,8 @@ def get_phis(X, R):
     # raise Exception(msg)
     phi = np.dot(np.linalg.pinv(A), b)
 
+  log.debug("phi: %s", phi)
+
   return phi
 
 def qlinear(X, R):
@@ -89,15 +91,19 @@ def qlinear(X, R):
 
   phis = get_phis(X, R.verts)
   qlin = np.sum([q_i * phi_i for q_i, phi_i in zip(R.q, phis)])
+
+  log.debug("phis: %s", phis)
+  log.debug("qlin: %s", qlin)
+
   return phis, qlin
 
 def get_error(phi, R, S, order = 2):
-  log.debug("len(phi): %d"% len(phi))
+  print "asdf"
   B = [] # baker eq 9
   w = [] # baker eq 11
 
   p  = pattern(order, len(phi), offset = -1)
-  log.debug("pattern: %s" % p)
+  log.info("pattern: %s" % p)
 
   for (s,q) in zip(S.verts, S.q):
     cur_phi, cur_qlin = qlinear(s, R)
@@ -111,8 +117,8 @@ def get_error(phi, R, S, order = 2):
     B.append(l)
     w.append(q - cur_qlin)
 
-  log.debug("B: %s" % B)
-  log.debug("w: %s" % w)
+  log.info("B: %s" % B)
+  log.info("w: %s" % w)
 
 
   B = np.array(B)
@@ -128,8 +134,6 @@ def get_error(phi, R, S, order = 2):
     log.error("linear calculation went bad, resorting to np.linalg.pinv: %s" % e)
     abc = np.dot(np.linalg.pinv(A), b)
 
-  log.debug(len(abc) == len(p))
-
   error_term = 0.0
   for (a, i) in zip(abc, p):
     cur_sum = a
diff --git a/interp/grid/DD.py b/interp/grid/DD.py
index 32d130f..e49e47a 100644
--- a/interp/grid/DD.py
+++ b/interp/grid/DD.py
@@ -31,7 +31,6 @@ class rect_grid(grid):
         verts.append([cur_x, cur_y])
         q.append(exact_func((cur_x, cur_y)))
     grid.__init__(self, verts, q)
-    self.construct_connectivity()
 
 
 class random_grid(rect_grid):
diff --git a/interp/grid/DDD.py b/interp/grid/DDD.py
index 37eefe6..8e2467e 100644
--- a/interp/grid/DDD.py
+++ b/interp/grid/DDD.py
@@ -38,7 +38,6 @@ class rect_grid(grid):
           verts.append([cur_x, cur_y, cur_z])
           q.append(exact_func_3D((cur_x, cur_y, cur_z)))
     grid.__init__(self, verts, q)
-  # self.construct_connectivity()
 
 
 
diff --git a/interp/grid/gmsh.py b/interp/grid/gmsh.py
index e294ff4..42e2b22 100644
--- a/interp/grid/gmsh.py
+++ b/interp/grid/gmsh.py
@@ -10,6 +10,9 @@ from   interp.grid         import grid
 from   interp.grid         import cell
 from   interp.tools        import exact_func, exact_func_3D
 
+import logging
+log = logging.getLogger('interp')
+
 
 
 THREE_NODE_TRIANGLE = 2