diff --git a/.travis.yml b/.travis.yml index 310a44e3..da15daf2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,16 @@ python: sudo: false +addons: + apt: + packages: + - gcc + - gfortran + - libopenmpi-dev + - libmumps-seq-dev + - libblas-dev + - liblapack-dev + # Setup anaconda before_install: - 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 @@ -28,12 +38,6 @@ install: - cd ../ - echo export PYTHONPATH=$PYTHONPATH:/home/travis/build/simpeg/simpeg >> .bashrc - source .bashrc - - git clone https://github.com/simpeg/simpegem.git - - cd simpegem/ - - python setup.py build_ext --inplace - - cd ../ - - echo export PYTHONPATH=$PYTHONPATH:/home/travis/build/simpeg/simpegem >> .bashrc - - source .bashrc - cd simpegmt # Run test diff --git a/simpegMT/BaseMT.py b/simpegMT/BaseMT.py index 7eb2573f..f04fc5f1 100644 --- a/simpegMT/BaseMT.py +++ b/simpegMT/BaseMT.py @@ -1,8 +1,9 @@ -from simpegEM.FDEM import BaseFDEMProblem +from SimPEG import SolverLU as SimpegSolver, PropMaps, Utils, mkvc, sp, np +from SimPEG.EM.FDEM.FDEM import BaseFDEMProblem from SurveyMT import SurveyMT from DataMT import DataMT from FieldsMT import FieldsMT -from SimPEG import SolverLU as SimpegSolver, PropMaps, Utils, mkvc, sp, np + class BaseMTProblem(BaseFDEMProblem): diff --git a/simpegMT/FieldsMT.py b/simpegMT/FieldsMT.py index c5d605d5..206d982f 100644 --- a/simpegMT/FieldsMT.py +++ b/simpegMT/FieldsMT.py @@ -2,7 +2,7 @@ from SimPEG import Survey, Utils, Problem, np, sp, mkvc from scipy.constants import mu_0 import sys from numpy.lib import recfunctions as recFunc -from simpegEM.Utils.EMUtils import omega +from SimPEG.EM.Utils import omega ############## ### Fields ### diff --git a/simpegMT/ProblemMT1D/Problems.py b/simpegMT/ProblemMT1D/Problems.py index f237a086..a2c36bed 100644 --- a/simpegMT/ProblemMT1D/Problems.py +++ b/simpegMT/ProblemMT1D/Problems.py @@ -1,4 +1,4 @@ -from simpegEM.Utils.EMUtils import omega +from SimPEG.EM.Utils import omega from SimPEG import mkvc from scipy.constants import mu_0 from simpegMT.BaseMT import BaseMTProblem diff --git a/simpegMT/ProblemMT3D/Problems.py b/simpegMT/ProblemMT3D/Problems.py index 2ae646b1..5bbafc62 100644 --- a/simpegMT/ProblemMT3D/Problems.py +++ b/simpegMT/ProblemMT3D/Problems.py @@ -1,5 +1,5 @@ from SimPEG import Survey, Problem, Utils, Models, np, sp, mkvc, SolverLU as SimpegSolver -from simpegEM.Utils.EMUtils import omega +from SimPEG.EM.Utils import omega from scipy.constants import mu_0 from simpegMT.BaseMT import BaseMTProblem from simpegMT.SurveyMT import SurveyMT diff --git a/simpegMT/SurveyMT.py b/simpegMT/SurveyMT.py index 33c28d71..703030a7 100644 --- a/simpegMT/SurveyMT.py +++ b/simpegMT/SurveyMT.py @@ -1,6 +1,6 @@ from SimPEG import Survey, Utils, Problem, Maps, np, sp, mkvc -from simpegEM.FDEM.SurveyFDEM import SrcFDEM -from simpegEM.Utils.EMUtils import omega +from SimPEG.EM.FDEM.SrcFDEM import BaseSrc as FDEMBaseSrc +from SimPEG.EM.Utils import omega from scipy.constants import mu_0 import sys from numpy.lib import recfunctions as recFunc @@ -315,7 +315,7 @@ class RxMT(Survey.BaseRx): ### Sources ### ############### -class srcMT(SrcFDEM): # Survey.BaseSrc): +class srcMT(FDEMBaseSrc): # Survey.BaseSrc): ''' Sources for the MT problem. Use the SimPEG BaseSrc, since the source fields share properties with the transmitters.