Merge branch 'feat/GlobalProblem' of https://github.com/simpeg/simpeg into feat/GlobalProblem

Conflicts:
	SimPEG/Problem.py
This commit is contained in:
seogi_macbook
2016-01-28 18:54:43 -08:00
2 changed files with 23 additions and 4 deletions
+14
View File
@@ -320,10 +320,12 @@ class GlobalProblem(BaseProblem):
subMesh = self.meshes[ind]
# subMap = Maps.IdentityMap(subMesh) # this is probably a mesh2mesh mapping?
# subMap = self.getSubMap(subMesh, ind)
if self.PropMap is None:
prob = self.SubProblem(subMesh, mapping=subMap * self.mapping, **self.probKwargs)
else:
# This will not work with a fancier propmap...
prob = self.SubProblem(subMesh, mapping=subMap * self._propMapMapping, **self.probKwargs)
survey = self.survey.__class__(srcList=self.survey.srcList[self.groups[ind]], **self.surveyKwargs)
@@ -331,6 +333,18 @@ class GlobalProblem(BaseProblem):
return prob, survey
# Not sure we need this here ...
# def getSubMap(self, subMesh, ind):
# """The sub"""
# mesh2mesh = Maps.IdentityMap(subMesh) # this is probably a mesh2mesh mapping?
# if self.PropMap is None:
# subMap = mesh2mesh * self.mapping
# else:
# subMap = mesh2mesh * self._propMapMapping
# return subMap
if __name__ == '__main__':