wassname/simpeg
1
0
Fork 0
mirror of https://github.com/wassname/simpeg.git synced 2026-07-12 00:33:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

remove txPair from fields obj.

Browse Source
This commit is contained in:
rowanc1
2014-05-15 09:14:41 -07:00
parent ebc2853615
commit 93f010bba9
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SimPEG/Survey.py
+4 -7
View File
@@ -219,10 +219,9 @@ class Fields(object):
"""
knownFields = None #: Known fields, a dict with locations, e.g. {"phi": "CC", "b": "F"}
aliasFields = None #: Aliased fields, a dict with [alias, location, and function or float], e.g. {"b":["e",lambda(F,e)]}
txPair = BaseTx
dtype = float #: dtype is the type of the storage matrix. This can be a dictionary.
knownFields = None #: Known fields, a dict with locations, e.g. {"e": "E", "phi": "CC"}
aliasFields = None #: Aliased fields, a dict with [alias, function], e.g. {"b":["e",lambda(F,e,ind)]}
dtype = float #: dtype is the type of the storage matrix. This can be a dictionary.
def __init__(self, mesh, survey, **kwargs):
self.survey = survey
@@ -269,8 +268,6 @@ class Fields(object):
if type(txTestList) is not list:
txTestList = [txTestList]
for txTest in txTestList:
if not isinstance(txTest, self.txPair):
raise KeyError('First index must be a Transmitter')
if txTest not in self.survey.txList:
raise KeyError('Invalid Transmitter, not in survey list.')
@@ -349,7 +346,7 @@ class Fields(object):
def _getAliasField(self, name, ind):
alias, func = self.aliasFields[name]
return func(self, self._fields[alias][:,ind])
return func(self, self._fields[alias][:,ind], ind)
def __contains__(self, other):
if other in self.aliasFields:
SimPEG/Tests/test_Survey.py
+1 -1
View File
@@ -124,7 +124,7 @@ class FieldsTest_Alias(unittest.TestCase):
txList = [Tx0,Tx1,Tx2,Tx3,Tx4]
survey = Survey.BaseSurvey(txList=txList)
self.D = Survey.Data(survey)
self.F = Survey.Fields(mesh, survey, knownFields={'e':'E'}, aliasFields={'b':['e',(lambda F, e: F.mesh.edgeCurl * e)]})
self.F = Survey.Fields(mesh, survey, knownFields={'e':'E'}, aliasFields={'b':['e',(lambda F, e, ind: F.mesh.edgeCurl * e)]})
self.Tx0 = Tx0
self.Tx1 = Tx1
self.mesh = mesh