Merge branch 'master' of https://github.com/simpeg/simpeg into dev

This commit is contained in:
Rowan Cockett
2016-01-28 22:29:59 -08:00
11 changed files with 129 additions and 31 deletions
+1 -1
View File
@@ -24,7 +24,7 @@ class BaseRegularization(object):
Utils.setKwargs(self, **kwargs)
self.mesh = mesh
assert isinstance(mesh, Mesh.BaseMesh), "mesh must be a SimPEG.Mesh object."
self.mapping = mapping or Maps.IdentityMap(mesh)
self.mapping = mapping or self.mapPair(mesh)
self.mapping._assertMatchesPair(self.mapPair)
self.indActive = indActive