From 1ed4d5bc8dce814570733eba02dbd95de5b5e652 Mon Sep 17 00:00:00 2001
From: Rowan Cockett <rowan@3ptscience.com>
Date: Tue, 24 Feb 2015 17:19:17 -0500
Subject: [PATCH 1/2] update miniconda

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 33b40e49..5c3d8ede 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ python:
 
 # Setup anaconda
 before_install:
-  - if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then wget http://repo.continuum.io/miniconda/Miniconda-3.3.0-Linux-x86_64.sh -O miniconda.sh; else wget http://repo.continuum.io/miniconda/Miniconda3-3.3.0-Linux-x86_64.sh -O miniconda.sh; fi
+  - if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then wget http://repo.continuum.io/miniconda/Miniconda-3.8.3-Linux-x86_64.sh -O miniconda.sh; else wget http://repo.continuum.io/miniconda/Miniconda3-3.8.3-Linux-x86_64.sh -O miniconda.sh; fi
   - chmod +x miniconda.sh
   - ./miniconda.sh -b
   - export PATH=/home/travis/anaconda/bin:/home/travis/miniconda/bin:$PATH

From 3b427d8a85fd677e35b5574a540bce35f7a2d9ad Mon Sep 17 00:00:00 2001
From: Lindsey Heagy <lheagy@eos.ubc.ca>
Date: Sun, 10 May 2015 16:54:55 -0700
Subject: [PATCH 2/2] remove SrcType, put rx list first in inputs for src

---
 simpegDC/BaseDC.py                | 5 +++--
 simpegDC/Examples/Verification.py | 2 +-
 simpegDC/Examples/WennerArray.py  | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/simpegDC/BaseDC.py b/simpegDC/BaseDC.py
index c873a1a4..650f8112 100644
--- a/simpegDC/BaseDC.py
+++ b/simpegDC/BaseDC.py
@@ -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):
diff --git a/simpegDC/Examples/Verification.py b/simpegDC/Examples/Verification.py
index 00e3bd62..7296d00a 100644
--- a/simpegDC/Examples/Verification.py
+++ b/simpegDC/Examples/Verification.py
@@ -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)
diff --git a/simpegDC/Examples/WennerArray.py b/simpegDC/Examples/WennerArray.py
index 4e0edb24..4777e0bd 100644
--- a/simpegDC/Examples/WennerArray.py
+++ b/simpegDC/Examples/WennerArray.py
@@ -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