Moved things around! Packages should now all be capitalized. may need to to tweak git to ensure this...

SimPEG/utils/ModelBuilder.py

@@ -151,7 +151,7 @@ def randomModel(shape, seed=None, anisotropy=None, its=100, bounds=[0,1]):
         .. plot::
 
             import matplotlib.pyplot as plt
-            import SimPEG.utils.ModelBuilder as MB
+            import SimPEG.Utils.ModelBuilder as MB
             plt.colorbar(plt.imshow(MB.randomModel((50,50),bounds=[-4,0])))
             plt.title('A very cool, yet completely random model.')
             plt.show()

SimPEG/utils/Save.py

@@ -5,7 +5,7 @@ import re
 try:
     import h5py
 except Exception, e:
-    print 'Warning: SimPEG.utils.Save needs h5py to be installed.'
+    print 'Warning: SimPEG.Utils.Save needs h5py to be installed.'
 
 
 SAVEABLES = {}
@@ -347,6 +347,6 @@ def loadSavable(node, pointers=None):
             print 'KWARGS: ', KWARGS
             return (cls, ARGS, KWARGS, node)
     else:
-        print 'Warning: %s Class not found in SimPEG.utils.Save.SAVABLES' % cls
+        print 'Warning: %s Class not found in SimPEG.Utils.Save.SAVABLES' % cls
         return (cls, ARGS, KWARGS, node)
 

SimPEG/utils/__init__.py

@@ -3,7 +3,7 @@ from sputils import spzeros, kron3, speye, sdiag, ddx, av, avExtrap
 from meshutils import exampleLomGird, meshTensors
 from lomutils import volTetra, faceInfo, inv2X2BlockDiagonal, inv3X3BlockDiagonal, indexCube
 from interputils import interpmat
-from ipythonUtils import easyAnimate as animate
+from ipythonutils import easyAnimate as animate
 from Solver import Solver
 import Save
 import Geophysics

SimPEG/utils/interputils.py

@@ -45,7 +45,7 @@ def interpmat(locs, x, y=None, z=None):
             x = np.linspace(0,1,7)
             dense = np.linspace(0,1,200)
             fun = lambda x: np.cos(2*np.pi*x)
-            Q = SimPEG.utils.interpmat(locs, x)
+            Q = SimPEG.Utils.interpmat(locs, x)
             plt.plot(x, fun(x), 'bs-')
             plt.plot(dense, fun(dense), 'y:')
             plt.plot(locs, Q*fun(x), 'mo')
@@ -173,7 +173,7 @@ if __name__ == '__main__':
     x = np.linspace(0,1,7)
     dense = np.linspace(0,1,200)
     fun = lambda x: np.cos(2*np.pi*x)
-    Q = SimPEG.utils.interpmat(locs, x)
+    Q = SimPEG.Utils.interpmat(locs, x)
     plt.plot(x, fun(x), 'bs-')
     plt.plot(dense, fun(dense), 'y:')
     plt.plot(locs, Q*fun(x), 'mo')

SimPEG/utils/meshutils.py

@@ -34,8 +34,8 @@ def meshTensors(*args):
 
         .. plot::
 
-            from SimPEG import mesh, utils
-            M = mesh.TensorMesh(utils.meshTensors(((10,10),(40,10),(10,10)), ((10,10),(20,10),(0,0))))
+            from SimPEG import mesh, Utils
+            M = mesh.TensorMesh(Utils.meshTensors(((10,10),(40,10),(10,10)), ((10,10),(20,10),(0,0))))
             M.plotGrid()
 
     """