From 428e34f631384a28f5ca9fc7c709dca2c887132e Mon Sep 17 00:00:00 2001 From: Lindsey Date: Wed, 6 May 2015 13:16:56 -0700 Subject: [PATCH 1/3] removed SrcType --- SimPEG/Survey.py | 3 +-- SimPEG/Tests/test_Survey.py | 40 ++++++++++++++++++------------------- 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/SimPEG/Survey.py b/SimPEG/Survey.py index 10e4c76f..05a2ad37 100644 --- a/SimPEG/Survey.py +++ b/SimPEG/Survey.py @@ -119,14 +119,13 @@ class BaseSrc(object): rxList = None #: SimPEG Receiver List rxPair = BaseRx - def __init__(self, loc, srcType, rxList, **kwargs): + def __init__(self, loc, rxList, **kwargs): assert type(rxList) is list, 'rxList must be a list' for rx in rxList: assert isinstance(rx, self.rxPair), 'rxList must be a %s'%self.rxPair.__name__ assert len(set(rxList)) == len(rxList), 'The rxList must be unique' self.loc = loc - self.srcType = srcType self.rxList = rxList Utils.setKwargs(self, **kwargs) diff --git a/SimPEG/Tests/test_Survey.py b/SimPEG/Tests/test_Survey.py index f93395ce..7372a686 100644 --- a/SimPEG/Tests/test_Survey.py +++ b/SimPEG/Tests/test_Survey.py @@ -9,14 +9,14 @@ class DataAndFieldsTest(unittest.TestCase): XYZ = Utils.ndgrid(x,x,np.r_[0.]) srcLoc = np.r_[0,0,0.] rxList0 = Survey.BaseRx(XYZ, 'exi') - Src0 = Survey.BaseSrc(srcLoc, 'VMD', [rxList0]) + Src0 = Survey.BaseSrc(srcLoc, [rxList0]) rxList1 = Survey.BaseRx(XYZ, 'bxi') - Src1 = Survey.BaseSrc(srcLoc, 'VMD', [rxList1]) + Src1 = Survey.BaseSrc(srcLoc, [rxList1]) rxList2 = Survey.BaseRx(XYZ, 'bxi') - Src2 = Survey.BaseSrc(srcLoc, 'VMD', [rxList2]) + Src2 = Survey.BaseSrc(srcLoc, [rxList2]) rxList3 = Survey.BaseRx(XYZ, 'bxi') - Src3 = Survey.BaseSrc(srcLoc, 'VMD', [rxList3]) - Src4 = Survey.BaseSrc(srcLoc, 'VMD', [rxList0, rxList1, rxList2, rxList3]) + Src3 = Survey.BaseSrc(srcLoc, [rxList3]) + Src4 = Survey.BaseSrc(srcLoc, [rxList0, rxList1, rxList2, rxList3]) srcList = [Src0,Src1,Src2,Src3,Src4] survey = Survey.BaseSurvey(srcList=srcList) self.D = Survey.Data(survey) @@ -122,14 +122,14 @@ class FieldsTest_Alias(unittest.TestCase): XYZ = Utils.ndgrid(x,x,np.r_[0.]) srcLoc = np.r_[0,0,0.] rxList0 = Survey.BaseRx(XYZ, 'exi') - Src0 = Survey.BaseSrc(srcLoc, 'VMD', [rxList0]) + Src0 = Survey.BaseSrc(srcLoc, [rxList0]) rxList1 = Survey.BaseRx(XYZ, 'bxi') - Src1 = Survey.BaseSrc(srcLoc, 'VMD', [rxList1]) + Src1 = Survey.BaseSrc(srcLoc, [rxList1]) rxList2 = Survey.BaseRx(XYZ, 'bxi') - Src2 = Survey.BaseSrc(srcLoc, 'VMD', [rxList2]) + Src2 = Survey.BaseSrc(srcLoc, [rxList2]) rxList3 = Survey.BaseRx(XYZ, 'bxi') - Src3 = Survey.BaseSrc(srcLoc, 'VMD', [rxList3]) - Src4 = Survey.BaseSrc(srcLoc, 'VMD', [rxList0, rxList1, rxList2, rxList3]) + Src3 = Survey.BaseSrc(srcLoc, [rxList3]) + Src4 = Survey.BaseSrc(srcLoc, [rxList0, rxList1, rxList2, rxList3]) srcList = [Src0,Src1,Src2,Src3,Src4] survey = Survey.BaseSurvey(srcList=srcList) self.D = Survey.Data(survey) @@ -193,14 +193,14 @@ class FieldsTest_Time(unittest.TestCase): XYZ = Utils.ndgrid(x,x,np.r_[0.]) srcLoc = np.r_[0,0,0.] rxList0 = Survey.BaseRx(XYZ, 'exi') - Src0 = Survey.BaseSrc(srcLoc, 'VMD', [rxList0]) + Src0 = Survey.BaseSrc(srcLoc, [rxList0]) rxList1 = Survey.BaseRx(XYZ, 'bxi') - Src1 = Survey.BaseSrc(srcLoc, 'VMD', [rxList1]) + Src1 = Survey.BaseSrc(srcLoc, [rxList1]) rxList2 = Survey.BaseRx(XYZ, 'bxi') - Src2 = Survey.BaseSrc(srcLoc, 'VMD', [rxList2]) + Src2 = Survey.BaseSrc(srcLoc, [rxList2]) rxList3 = Survey.BaseRx(XYZ, 'bxi') - Src3 = Survey.BaseSrc(srcLoc, 'VMD', [rxList3]) - Src4 = Survey.BaseSrc(srcLoc, 'VMD', [rxList0, rxList1, rxList2, rxList3]) + Src3 = Survey.BaseSrc(srcLoc, [rxList3]) + Src4 = Survey.BaseSrc(srcLoc, [rxList0, rxList1, rxList2, rxList3]) srcList = [Src0,Src1,Src2,Src3,Src4] survey = Survey.BaseSurvey(srcList=srcList) prob = Problem.BaseTimeProblem(mesh, timeSteps=[(10.,3), (20.,2)]) @@ -295,14 +295,14 @@ class FieldsTest_Time_Aliased(unittest.TestCase): XYZ = Utils.ndgrid(x,x,np.r_[0.]) srcLoc = np.r_[0,0,0.] rxList0 = Survey.BaseRx(XYZ, 'exi') - Src0 = Survey.BaseSrc(srcLoc, 'VMD', [rxList0]) + Src0 = Survey.BaseSrc(srcLoc, [rxList0]) rxList1 = Survey.BaseRx(XYZ, 'bxi') - Src1 = Survey.BaseSrc(srcLoc, 'VMD', [rxList1]) + Src1 = Survey.BaseSrc(srcLoc, [rxList1]) rxList2 = Survey.BaseRx(XYZ, 'bxi') - Src2 = Survey.BaseSrc(srcLoc, 'VMD', [rxList2]) + Src2 = Survey.BaseSrc(srcLoc, [rxList2]) rxList3 = Survey.BaseRx(XYZ, 'bxi') - Src3 = Survey.BaseSrc(srcLoc, 'VMD', [rxList3]) - Src4 = Survey.BaseSrc(srcLoc, 'VMD', [rxList0, rxList1, rxList2, rxList3]) + Src3 = Survey.BaseSrc(srcLoc, [rxList3]) + Src4 = Survey.BaseSrc(srcLoc, [rxList0, rxList1, rxList2, rxList3]) srcList = [Src0,Src1,Src2,Src3,Src4] survey = Survey.BaseSurvey(srcList=srcList) prob = Problem.BaseTimeProblem(mesh, timeSteps=[(10.,3), (20.,2)]) From 1f58f5ef377179dc682ac40c950bb75811d0844a Mon Sep 17 00:00:00 2001 From: Lindsey Date: Wed, 6 May 2015 15:27:58 -0700 Subject: [PATCH 2/3] loc is now a kwarg --- SimPEG/Tests/test_Survey.py | 40 ++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/SimPEG/Tests/test_Survey.py b/SimPEG/Tests/test_Survey.py index 7372a686..f5109b71 100644 --- a/SimPEG/Tests/test_Survey.py +++ b/SimPEG/Tests/test_Survey.py @@ -9,14 +9,14 @@ class DataAndFieldsTest(unittest.TestCase): XYZ = Utils.ndgrid(x,x,np.r_[0.]) srcLoc = np.r_[0,0,0.] rxList0 = Survey.BaseRx(XYZ, 'exi') - Src0 = Survey.BaseSrc(srcLoc, [rxList0]) + Src0 = Survey.BaseSrc([rxList0], loc=srcLoc) rxList1 = Survey.BaseRx(XYZ, 'bxi') - Src1 = Survey.BaseSrc(srcLoc, [rxList1]) + Src1 = Survey.BaseSrc([rxList1], loc=srcLoc) rxList2 = Survey.BaseRx(XYZ, 'bxi') - Src2 = Survey.BaseSrc(srcLoc, [rxList2]) + Src2 = Survey.BaseSrc([rxList2], loc=srcLoc) rxList3 = Survey.BaseRx(XYZ, 'bxi') - Src3 = Survey.BaseSrc(srcLoc, [rxList3]) - Src4 = Survey.BaseSrc(srcLoc, [rxList0, rxList1, rxList2, rxList3]) + Src3 = Survey.BaseSrc([rxList3], loc=srcLoc) + Src4 = Survey.BaseSrc([rxList0, rxList1, rxList2, rxList3], loc=srcLoc) srcList = [Src0,Src1,Src2,Src3,Src4] survey = Survey.BaseSurvey(srcList=srcList) self.D = Survey.Data(survey) @@ -122,14 +122,14 @@ class FieldsTest_Alias(unittest.TestCase): XYZ = Utils.ndgrid(x,x,np.r_[0.]) srcLoc = np.r_[0,0,0.] rxList0 = Survey.BaseRx(XYZ, 'exi') - Src0 = Survey.BaseSrc(srcLoc, [rxList0]) + Src0 = Survey.BaseSrc([rxList0],loc=srcLoc) rxList1 = Survey.BaseRx(XYZ, 'bxi') - Src1 = Survey.BaseSrc(srcLoc, [rxList1]) + Src1 = Survey.BaseSrc([rxList1],loc=srcLoc) rxList2 = Survey.BaseRx(XYZ, 'bxi') - Src2 = Survey.BaseSrc(srcLoc, [rxList2]) + Src2 = Survey.BaseSrc([rxList2],loc=srcLoc) rxList3 = Survey.BaseRx(XYZ, 'bxi') - Src3 = Survey.BaseSrc(srcLoc, [rxList3]) - Src4 = Survey.BaseSrc(srcLoc, [rxList0, rxList1, rxList2, rxList3]) + Src3 = Survey.BaseSrc([rxList3],loc=srcLoc) + Src4 = Survey.BaseSrc([rxList0, rxList1, rxList2, rxList3],loc=srcLoc) srcList = [Src0,Src1,Src2,Src3,Src4] survey = Survey.BaseSurvey(srcList=srcList) self.D = Survey.Data(survey) @@ -193,14 +193,14 @@ class FieldsTest_Time(unittest.TestCase): XYZ = Utils.ndgrid(x,x,np.r_[0.]) srcLoc = np.r_[0,0,0.] rxList0 = Survey.BaseRx(XYZ, 'exi') - Src0 = Survey.BaseSrc(srcLoc, [rxList0]) + Src0 = Survey.BaseSrc([rxList0], loc=srcLoc) rxList1 = Survey.BaseRx(XYZ, 'bxi') - Src1 = Survey.BaseSrc(srcLoc, [rxList1]) + Src1 = Survey.BaseSrc([rxList1], loc=srcLoc) rxList2 = Survey.BaseRx(XYZ, 'bxi') - Src2 = Survey.BaseSrc(srcLoc, [rxList2]) + Src2 = Survey.BaseSrc([rxList2], loc=srcLoc) rxList3 = Survey.BaseRx(XYZ, 'bxi') - Src3 = Survey.BaseSrc(srcLoc, [rxList3]) - Src4 = Survey.BaseSrc(srcLoc, [rxList0, rxList1, rxList2, rxList3]) + Src3 = Survey.BaseSrc([rxList3], loc=srcLoc) + Src4 = Survey.BaseSrc([rxList0, rxList1, rxList2, rxList3], loc=srcLoc) srcList = [Src0,Src1,Src2,Src3,Src4] survey = Survey.BaseSurvey(srcList=srcList) prob = Problem.BaseTimeProblem(mesh, timeSteps=[(10.,3), (20.,2)]) @@ -295,14 +295,14 @@ class FieldsTest_Time_Aliased(unittest.TestCase): XYZ = Utils.ndgrid(x,x,np.r_[0.]) srcLoc = np.r_[0,0,0.] rxList0 = Survey.BaseRx(XYZ, 'exi') - Src0 = Survey.BaseSrc(srcLoc, [rxList0]) + Src0 = Survey.BaseSrc( [rxList0],loc=srcLoc) rxList1 = Survey.BaseRx(XYZ, 'bxi') - Src1 = Survey.BaseSrc(srcLoc, [rxList1]) + Src1 = Survey.BaseSrc( [rxList1],loc=srcLoc) rxList2 = Survey.BaseRx(XYZ, 'bxi') - Src2 = Survey.BaseSrc(srcLoc, [rxList2]) + Src2 = Survey.BaseSrc( [rxList2],loc=srcLoc) rxList3 = Survey.BaseRx(XYZ, 'bxi') - Src3 = Survey.BaseSrc(srcLoc, [rxList3]) - Src4 = Survey.BaseSrc(srcLoc, [rxList0, rxList1, rxList2, rxList3]) + Src3 = Survey.BaseSrc( [rxList3],loc=srcLoc) + Src4 = Survey.BaseSrc( [rxList0, rxList1, rxList2, rxList3],loc=srcLoc) srcList = [Src0,Src1,Src2,Src3,Src4] survey = Survey.BaseSurvey(srcList=srcList) prob = Problem.BaseTimeProblem(mesh, timeSteps=[(10.,3), (20.,2)]) From 6f487e17d005a1973f3805965ae0298e34b8c218 Mon Sep 17 00:00:00 2001 From: Lindsey Date: Wed, 6 May 2015 16:34:24 -0700 Subject: [PATCH 3/3] forgot to stage Survey.py --- SimPEG/Survey.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/SimPEG/Survey.py b/SimPEG/Survey.py index 05a2ad37..29bdb452 100644 --- a/SimPEG/Survey.py +++ b/SimPEG/Survey.py @@ -119,13 +119,12 @@ class BaseSrc(object): rxList = None #: SimPEG Receiver List rxPair = BaseRx - def __init__(self, loc, rxList, **kwargs): + def __init__(self, rxList, **kwargs): assert type(rxList) is list, 'rxList must be a list' for rx in rxList: assert isinstance(rx, self.rxPair), 'rxList must be a %s'%self.rxPair.__name__ assert len(set(rxList)) == len(rxList), 'The rxList must be unique' - self.loc = loc self.rxList = rxList Utils.setKwargs(self, **kwargs)