Parametric maps renamed to ParametricXXXMap. Some Pep8-ing

This commit is contained in:
Lindsey Heagy
2016-07-18 10:31:25 -07:00
parent 62b3a3a218
commit 2c429f9dc2
2 changed files with 114 additions and 49 deletions
+8 -7
View File
@@ -120,7 +120,8 @@ class MapTests(unittest.TestCase):
M = Mesh.TensorMesh([2, 4], '0C')
expMap = Maps.ExpMap(M)
for actMap in [Maps.InjectActiveCells(M, M.vectorCCy <= 0, 10,
nC=M.nCy), Maps.ActiveCells(M, M.vectorCCy <= 0, 10, nC=M.nCy)]:
nC=M.nCy), Maps.ActiveCells(M, M.vectorCCy <= 0, 10,
nC=M.nCy)]:
# actMap = Maps.InjectActiveCells(M, M.vectorCCy <=0, 10, nC=M.nCy)
vertMap = Maps.SurjectVertical1D(M)
@@ -169,8 +170,8 @@ class MapTests(unittest.TestCase):
m = np.arange(m2to3.nP)
self.assertTrue(m2to3.test())
self.assertTrue(m2to3.testVec())
self.assertTrue(np.all(Utils.mkvc( (m2to3 * m).reshape(M3.vnC ,
order='F')[0, :, :] ) == m))
self.assertTrue(np.all(Utils.mkvc((m2to3 * m).reshape(M3.vnC,
order='F')[0, :, :]) == m))
def test_map2Dto3D_y(self):
M2 = Mesh.TensorMesh([3, 4])
@@ -183,8 +184,8 @@ class MapTests(unittest.TestCase):
m = np.arange(m2to3.nP)
self.assertTrue(m2to3.test())
self.assertTrue(m2to3.testVec())
self.assertTrue(np.all(Utils.mkvc( (m2to3 * m).reshape(M3.vnC,
order='F')[:, 0, :] ) == m))
self.assertTrue(np.all(Utils.mkvc((m2to3 * m).reshape(M3.vnC,
order='F')[:, 0, :]) == m))
def test_map2Dto3D_z(self):
M2 = Mesh.TensorMesh([3, 2])
@@ -198,8 +199,8 @@ class MapTests(unittest.TestCase):
m = np.arange(m2to3.nP)
self.assertTrue(m2to3.test())
self.assertTrue(m2to3.testVec())
self.assertTrue(np.all(Utils.mkvc( (m2to3 * m).reshape(M3.vnC,
order='F')[:, :, 0] ) == m))
self.assertTrue(np.all(Utils.mkvc((m2to3 * m).reshape(M3.vnC,
order='F')[:, :, 0]) == m))
if __name__ == '__main__':