remove SrcType, put rx list first in inputs for src

This commit is contained in:
Lindsey Heagy
2015-05-10 16:54:55 -07:00
parent 64574369c3
commit 3b427d8a85
3 changed files with 5 additions and 4 deletions
+3 -2
View File
@@ -6,8 +6,9 @@ class DipoleSrc(Survey.BaseSrc):
current = 1
def __init__(self, locA, locB, rxList, **kwargs):
super(DipoleSrc, self).__init__((locA, locB), 'dipole', rxList, **kwargs)
def __init__(self, rxList, locA, locB, **kwargs):
super(DipoleSrc, self).__init__(rxList, **kwargs)
self.loc = (locA, locB)
self._rhsDict = {}
def getRhs(self, mesh):
+1 -1
View File
@@ -23,7 +23,7 @@ def run(plotIt=False):
# ax.plot(xyz_rxN[:,0],xyz_rxN[:,1], 'r.', ms = 3)
rx = DC.DipoleRx(xyz_rxP, xyz_rxN)
src = DC.DipoleSrc([-200, 0, -12.5],[+200, 0, -12.5], [rx])
src = DC.DipoleSrc([rx], [-200, 0, -12.5],[+200, 0, -12.5])
survey = DC.SurveyDC([src])
problem = DC.ProblemDC(mesh)
problem.pair(survey)
+1 -1
View File
@@ -33,7 +33,7 @@ def getSrcList(nElecs, aSpacing, in2D=False, plotIt=False):
srcList = []
for i in range(WENNER.shape[0]):
rx = DC.DipoleRx(getLoc(i,1),getLoc(i,2))
src = DC.DipoleSrc(getLoc(i,0),getLoc(i,3), [rx])
src = DC.DipoleSrc([rx],getLoc(i,0),getLoc(i,3))
srcList += [src]
return srcList