From 7e169bbb7988e28c578a8c3b7eaeb6345cf8dc6b Mon Sep 17 00:00:00 2001
From: Rowan Cockett <rowan@visiblegeology.com>
Date: Tue, 30 Jul 2013 22:56:36 -0700
Subject: [PATCH] Cleaned utils code, merged in subArray.

---
 SimPEG/subArray.py |  8 --------
 SimPEG/utils.py    | 19 ++++++++++++-------
 2 files changed, 12 insertions(+), 15 deletions(-)
 delete mode 100644 SimPEG/subArray.py

diff --git a/SimPEG/subArray.py b/SimPEG/subArray.py
deleted file mode 100644
index 2811f350..00000000
--- a/SimPEG/subArray.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import numpy as np
-
-def getSubArray(A,ind):
-    """subArray"""
-    i = ind[0]; j = ind[1]; k = ind[2]
-    
-    return A[i,:,:][:,j,:][:,:,k]
-    
\ No newline at end of file
diff --git a/SimPEG/utils.py b/SimPEG/utils.py
index b9e17847..ec89739b 100644
--- a/SimPEG/utils.py
+++ b/SimPEG/utils.py
@@ -1,5 +1,5 @@
 import numpy as np
-from numpy import *
+
 
 def reshapeF(x, size):
     return np.reshape(x, size, order='F')
@@ -106,13 +106,13 @@ def ind2sub(shape, ind):
     mult = [1]
     for i in range(0, len(revshp)-1):
         mult.extend([mult[i]*revshp[i]])
-    mult = array(mult).reshape(len(mult))
+    mult = np.array(mult).reshape(len(mult))
 
     sub = []
 
     for i in range(0, len(shape)):
-        sub.extend([math.floor(ind / mult[i])])
-        ind = ind - (math.floor(ind/mult[i]) * mult[i])
+        sub.extend([np.math.floor(ind / mult[i])])
+        ind = ind - (np.math.floor(ind/mult[i]) * mult[i])
     return sub
 
 
@@ -122,7 +122,12 @@ def sub2ind(shape, subs):
     mult = [1]
     for i in range(0, len(revshp)-1):
         mult.extend([mult[i]*revshp[i]])
-    mult = array(mult).reshape(len(mult), 1)
+    mult = np.array(mult).reshape(len(mult), 1)
 
-    idx = dot((subs), (mult))
-    return idx
\ No newline at end of file
+    idx = np.dot((subs), (mult))
+    return idx
+
+
+def getSubArray(A, ind):
+    """subArray"""
+    return A[ind[0], :, :][:, ind[1], :][:, :, ind[2]]