Bug Fixes in TensorView and test_utils

Updated ipnbs

SimPEG/parameters.py

@@ -5,64 +5,64 @@ import TensorView as tv
 
 def getIndecesBlock(p0,p1,ccMesh):
     """
-    Creates a vector containing the block indexes in the cell centerd mesh. 
-    Returns a tuple 
-    
+    Creates a vector containing the block indexes in the cell centerd mesh.
+    Returns a tuple
+
     The block is defined by the points
-    p0 : describe the position of the left  upper  front corner, and 
+    p0 : describe the position of the left  upper  front corner, and
     p1 : describe the position of the right bottom back  corner.
-    
+
     ccMesh represents the cell-centered mesh
-    
-    The points p0 and p1 must live in the the same dimensional space as the mesh.    
+
+    The points p0 and p1 must live in the the same dimensional space as the mesh.
     """
-    
+
     # Validation of the input
     assert type(p0) == np.ndarray, "Vector must be a numpy array"
     assert type(p1) == np.ndarray, "Vector must be a numpy array"
-    
+
     # Validation: p0 and p1 live in the same dimensional space
     assert len(p0) == len(p1), "Dimension mismatch. len(p0) != len(p1)"
 
     # Validation: mesh and points live in the same dimensional space
     dimMesh = np.size(ccMesh[0,:])
     assert len(p0) == dimMesh, "Dimension mismatch. len(p0) != dimMesh"
-    
+
     if dimMesh == 1:
        # Define the reference points
-        x1 = p0[0]   
-        x2 = p1[0]   
-  
+        x1 = p0[0]
+        x2 = p1[0]
+
         indX = (x1 <= ccMesh[:,0]) & (ccMesh[:,0] <= x2)
         ind  = np.where(indX)
-          
+
     elif dimMesh == 2:
        # Define the reference points
-        x1 = p0[0]   
-        y1 = p0[1]  
-    
-        x2 = p1[0]   
-        y2 = p1[1]  
-    
+        x1 = p0[0]
+        y1 = p0[1]
+
+        x2 = p1[0]
+        y2 = p1[1]
+
         indX = (x1 <= ccMesh[:,0]) & (ccMesh[:,0] <= x2)
         indY = (y1 <= ccMesh[:,1]) & (ccMesh[:,1] <= y2)
-    
+
         ind  = np.where(indX & indY)
-   
+
     else:
         # Define the points
-        x1 = p0[0]   
-        y1 = p0[1]  
+        x1 = p0[0]
+        y1 = p0[1]
         z1 = p0[2]
-    
-        x2 = p1[0]   
-        y2 = p1[1]  
+
+        x2 = p1[0]
+        y2 = p1[1]
         z2 = p1[2]
-    
+
         indX = (x1 <= ccMesh[:,0]) & (ccMesh[:,0] <= x2)
         indY = (y1 <= ccMesh[:,1]) & (ccMesh[:,1] <= y2)
         indZ = (z1 <= ccMesh[:,2]) & (ccMesh[:,2] <= z2)
-    
+
         ind  = np.where(indX & indY & indZ)
 
     # Return a tuple
@@ -76,28 +76,28 @@ def defineBlockConductivity(p0,p1,ccMesh,condVals):
     """
     sigma = np.zeros(ccMesh.shape[0]) + condVals[1]
     ind   = getIndecesBlock(p0,p1,ccMesh)
-    
+
     sigma[ind] = condVals[0]
-    
+
     return sigma
-    
+
 def defineTwoLayeredConductivity(depth,ccMesh,condVals):
     """
     Define a two layered model.  Depth of the first layer must be specified.
     CondVals vector with the conductivity values of the layers.  Eg:
-    
-    Convention to number the layers:  
+
+    Convention to number the layers:
         <----------------------------|------------------------------------>
         0                          depth                                 zf
              1st layer                       2nd layer
     """
     sigma = np.zeros(ccMesh.shape[0]) + condVals[1]
-   
+
     dim = np.size(ccMesh[0,:])
-   
+
     p0 = np.zeros(dim)
     p1 = np.zeros(dim)
-    
+
     # Identify 1st cell centered reference point
     p0[0] = ccMesh[0,0]
     p0[1] = ccMesh[0,1]
@@ -107,30 +107,30 @@ def defineTwoLayeredConductivity(depth,ccMesh,condVals):
     p1[0] = ccMesh[-1,0]
     p1[1] = ccMesh[-1,1]
     p1[2] = ccMesh[-1,2] - depth;
-    
+
     ind   = getIndecesBlock(p0,p1,ccMesh)
-    
+
     sigma[ind] = condVals[0];
-        
+
     return sigma
- 
+
 def scalarConductivity(ccMesh,pFunction):
     """
-    Define the distribution conductivity in the mesh according to the 
-    analytical expression given in pFunction   
+    Define the distribution conductivity in the mesh according to the
+    analytical expression given in pFunction
     """
     xCC = ccMesh[:,0]
     yCC = ccMesh[:,1]
     zCC = ccMesh[:,2]
-     
+
     sigma = pFunction(xCC,yCC,zCC)
-     
+
     return sigma
 
 if __name__ == '__main__':
-    
+
     # Define the mesh
- 
+
     testDim = 3
     h1 = 0.3*np.ones(7)
     h1[0] = 0.5
@@ -149,44 +149,44 @@ if __name__ == '__main__':
         h = [h1, h2, h3]
 
     M = tm.TensorMesh(h, x0)
-    
+
     ccMesh = M.gridCC
-    
+
     # ------------------- Test conductivities! --------------------------
     print('Testing 1 block conductivity')
-    
+
     p0 = np.array([0.5,0.5,0.5])
     p1 = np.array([1.0,1.0,1.0])
     condVals = np.array([100,1e-6])
-    
-    sigma = defineBlockConductivity(p0,p1,ccMesh,condVals)    
+
+    sigma = defineBlockConductivity(p0,p1,ccMesh,condVals)
 
     # Plot sigma model
-    #M.plotImage(sigma)
-    print sigma
+    print sigma.shape
+    M.plotImage(sigma)
     print 'Done with block! :)'
-    
+
     # -----------------------------------------
-    print('Testing the two layered model') 
+    print('Testing the two layered model')
     condVals = np.array([100,1e-5]);
     depth    = 1.0;
-    
+
     sigma = defineTwoLayeredConductivity(depth,ccMesh,condVals)
-    
-    #M.plotImage(sigma)
+
+    M.plotImage(sigma)
     print sigma
     print 'layer model!'
-    
+
     # -----------------------------------------
     print('Testing scalar conductivity')
-    
+
     pFunction = lambda x,y,z: np.exp(x+y+z)
-    
+
     sigma = scalarConductivity(ccMesh,pFunction)
-    
+
     # Plot sigma model
     M.plotImage(sigma)
     print sigma
     print 'Scalar conductivity defined!'
-    
+
     # -----------------------------------------