diff --git a/geoscilabs/dcip/DCIP_overburden_PseudoSection.py b/geoscilabs/dcip/DCIP_overburden_PseudoSection.py index 9219afe..4f18d39 100644 --- a/geoscilabs/dcip/DCIP_overburden_PseudoSection.py +++ b/geoscilabs/dcip/DCIP_overburden_PseudoSection.py @@ -25,10 +25,10 @@ from discretize import TensorMesh -from SimPEG import maps, SolverLU, utils -from SimPEG.utils import extract_core_mesh -from SimPEG.electromagnetics.static import resistivity as DC -from SimPEG.electromagnetics.static import induced_polarization as IP +from simpeg import maps, SolverLU, utils +from simpeg.utils import extract_core_mesh +from simpeg.electromagnetics.static import resistivity as DC +from simpeg.electromagnetics.static import induced_polarization as IP from pymatsolver import Pardiso from ..base import widgetify diff --git a/geoscilabs/dcip/DCLayers.py b/geoscilabs/dcip/DCLayers.py index 40eeef2..5309d70 100644 --- a/geoscilabs/dcip/DCLayers.py +++ b/geoscilabs/dcip/DCLayers.py @@ -9,7 +9,7 @@ from discretize import TensorMesh -from SimPEG import maps, utils +from simpeg import maps, utils from pymatsolver import Pardiso from ..base import widgetify @@ -153,7 +153,7 @@ def rho_a(VM, VN, A, B, M, N): def solve_2D_potentials(rho1, rho2, h, A, B): """ - Here we solve the 2D DC problem for potentials (using SimPEG Mesg Class) + Here we solve the 2D DC problem for potentials (using simpeg Mesg Class) """ sigma = 1.0 / rho2 * np.ones(mesh.nC) sigma[mesh.gridCC[:, 1] >= -h] = 1.0 / rho1 # since the model is 2D diff --git a/geoscilabs/dcip/DCWidgetPlate2_5D.py b/geoscilabs/dcip/DCWidgetPlate2_5D.py index ce06b3e..ed2ce68 100644 --- a/geoscilabs/dcip/DCWidgetPlate2_5D.py +++ b/geoscilabs/dcip/DCWidgetPlate2_5D.py @@ -15,9 +15,9 @@ from pymatsolver import Pardiso from discretize import TensorMesh -from SimPEG import maps, SolverLU, utils -from SimPEG.utils import extract_core_mesh -from SimPEG.electromagnetics.static import resistivity as DC +from simpeg import maps, SolverLU, utils +from simpeg.utils import extract_core_mesh +from simpeg.electromagnetics.static import resistivity as DC from ..base import widgetify # Mesh, mapping can be globals global @@ -272,7 +272,7 @@ def sumPlateCharges(xc, zc, dx, dz, rotAng, qSecondary): return qPosSum, qNegSum, qPosAvgLoc, qNegAvgLoc -# The only thing we need to make it work is a 2.5D field object in SimPEG +# The only thing we need to make it work is a 2.5D field object in simpeg def getSensitivity(survey, A, B, M, N, model): diff --git a/geoscilabs/dcip/DCWidgetPlate_2D.py b/geoscilabs/dcip/DCWidgetPlate_2D.py index 57e84e0..3c8c3a1 100644 --- a/geoscilabs/dcip/DCWidgetPlate_2D.py +++ b/geoscilabs/dcip/DCWidgetPlate_2D.py @@ -14,9 +14,9 @@ from pymatsolver import Pardiso from discretize import TensorMesh -from SimPEG import maps, SolverLU, utils -from SimPEG.utils import extract_core_mesh -from SimPEG.electromagnetics.static import resistivity as DC +from simpeg import maps, SolverLU, utils +from simpeg.utils import extract_core_mesh +from simpeg.electromagnetics.static import resistivity as DC from ..base import widgetify diff --git a/geoscilabs/dcip/DCWidgetResLayer2D.py b/geoscilabs/dcip/DCWidgetResLayer2D.py index 37ce065..617912b 100644 --- a/geoscilabs/dcip/DCWidgetResLayer2D.py +++ b/geoscilabs/dcip/DCWidgetResLayer2D.py @@ -1,8 +1,8 @@ from discretize import TensorMesh -from SimPEG import maps, SolverLU, utils -from SimPEG.utils import extract_core_mesh +from simpeg import maps, SolverLU, utils +from simpeg.utils import extract_core_mesh import numpy as np -from SimPEG.electromagnetics.static import resistivity as DC +from simpeg.electromagnetics.static import resistivity as DC import matplotlib import matplotlib.pyplot as plt import matplotlib.pylab as pylab diff --git a/geoscilabs/dcip/DCWidgetResLayer2_5D.py b/geoscilabs/dcip/DCWidgetResLayer2_5D.py index b757adc..eed4ea4 100644 --- a/geoscilabs/dcip/DCWidgetResLayer2_5D.py +++ b/geoscilabs/dcip/DCWidgetResLayer2_5D.py @@ -10,9 +10,9 @@ from matplotlib.path import Path import matplotlib.patches as patches -from SimPEG import maps, SolverLU, utils -from SimPEG.utils import extract_core_mesh -from SimPEG.electromagnetics.static import resistivity as DC +from simpeg import maps, SolverLU, utils +from simpeg.utils import extract_core_mesh +from simpeg.electromagnetics.static import resistivity as DC from pymatsolver import Pardiso from discretize import TensorMesh @@ -331,7 +331,7 @@ def sumCylinderCharges(xc, zc, r, qSecondary): return qPosSum, qNegSum, qPosAvgLoc, qNegAvgLoc -# The only thing we need to make it work is a 2.5D field object in SimPEG +# The only thing we need to make it work is a 2.5D field object in simpeg def getSensitivity(survey, A, B, M, N, model): diff --git a/geoscilabs/dcip/DCWidget_Overburden_2_5D.py b/geoscilabs/dcip/DCWidget_Overburden_2_5D.py index b345d80..e929044 100644 --- a/geoscilabs/dcip/DCWidget_Overburden_2_5D.py +++ b/geoscilabs/dcip/DCWidget_Overburden_2_5D.py @@ -21,9 +21,9 @@ ) from discretize import TensorMesh -from SimPEG import maps, utils -from SimPEG.utils import extract_core_mesh -from SimPEG.electromagnetics.static import resistivity as DC +from simpeg import maps, utils +from simpeg.utils import extract_core_mesh +from simpeg.electromagnetics.static import resistivity as DC from pymatsolver import Pardiso diff --git a/geoscilabs/dcip/DC_Pseudosections.py b/geoscilabs/dcip/DC_Pseudosections.py index 47b53b2..82c1324 100644 --- a/geoscilabs/dcip/DC_Pseudosections.py +++ b/geoscilabs/dcip/DC_Pseudosections.py @@ -20,10 +20,10 @@ from discretize import TensorMesh from pymatsolver import Pardiso -from SimPEG import maps, SolverLU, utils -from SimPEG.electromagnetics.static import resistivity as DC -from SimPEG.maps import IdentityMap -from SimPEG.electromagnetics.static.utils import static_utils +from simpeg import maps, SolverLU, utils +from simpeg.electromagnetics.static import resistivity as DC +from simpeg.maps import IdentityMap +from simpeg.electromagnetics.static.utils import static_utils from ..base import widgetify @@ -248,7 +248,7 @@ def PseudoSectionPlotfnc(i, j, survey, flag="PoleDipole"): :param int i: source index :param int j: receiver index - :param SimPEG.survey survey: SimPEG survey object + :param simpeg.survey survey: simpeg survey object :param str flag: Survey Type 'PoleDipole', 'DipoleDipole', 'DipolePole' """ matplotlib.rcParams["font.size"] = 14 @@ -436,7 +436,7 @@ def PseudoSectionWidget(survey, flag): associated with a particular survey for each pair source-receiver - :param SimPEG.survey survey: Survey object + :param simpeg.survey survey: Survey object :param str flag: Survey Type 'PoleDipole', 'DipoleDipole', 'DipolePole' """ dx = 5 @@ -496,8 +496,8 @@ def DC2Dfwdfun( over a known geological model :param TensorMesh mesh: discretization of the model - :param SimPEG.Simulation sim: simulation object - :param SimPEG.SigmaMap mapping: sigmamap of the model + :param simpeg.Simulation sim: simulation object + :param simpeg.SigmaMap mapping: sigmamap of the model :param numpy.array xr: electrodes positions :param numpy.array xzlocs: pseudolocations :param float rhohalf: Resistivity of the half-space diff --git a/geoscilabs/dcip/DC_cylinder.py b/geoscilabs/dcip/DC_cylinder.py index b9ff4ee..7183848 100644 --- a/geoscilabs/dcip/DC_cylinder.py +++ b/geoscilabs/dcip/DC_cylinder.py @@ -10,9 +10,9 @@ from pymatsolver import Pardiso from discretize import TensorMesh -from SimPEG import maps, utils -from SimPEG.utils import extract_core_mesh, mkvc -from SimPEG.electromagnetics.static import resistivity as DC +from simpeg import maps, utils +from simpeg.utils import extract_core_mesh, mkvc +from simpeg.electromagnetics.static import resistivity as DC from ipywidgets import interact, IntSlider, FloatSlider, FloatText, ToggleButtons, BoundedFloatText diff --git a/geoscilabs/dcip/sphereElectrostatic_example.py b/geoscilabs/dcip/sphereElectrostatic_example.py index b8e3c5d..7065527 100644 --- a/geoscilabs/dcip/sphereElectrostatic_example.py +++ b/geoscilabs/dcip/sphereElectrostatic_example.py @@ -3,7 +3,7 @@ import matplotlib.pyplot as plt import matplotlib.colors as colors -from SimPEG.utils import ndgrid, mkvc +from simpeg.utils import ndgrid, mkvc """ Authors: Thibaut Astic, Lindsey Heagy, Sanna Tyrvainen, Ronghua Peng diff --git a/geoscilabs/em/BiotSavart.py b/geoscilabs/em/BiotSavart.py index b50dfdf..93b5592 100644 --- a/geoscilabs/em/BiotSavart.py +++ b/geoscilabs/em/BiotSavart.py @@ -1,6 +1,6 @@ import numpy as np import scipy.sparse as sp -from SimPEG import utils +from simpeg import utils from scipy.constants import mu_0 diff --git a/geoscilabs/em/DipoleWidget1D.py b/geoscilabs/em/DipoleWidget1D.py index 99b5e39..e522fab 100644 --- a/geoscilabs/em/DipoleWidget1D.py +++ b/geoscilabs/em/DipoleWidget1D.py @@ -1,5 +1,5 @@ import numpy as np -from SimPEG import electromagnetics as EM +from simpeg import electromagnetics as EM import matplotlib.pyplot as plt import matplotlib.ticker as ticker import matplotlib @@ -8,7 +8,7 @@ from ipywidgets import ToggleButtons, FloatSlider from geoscilabs.base import widgetify -from SimPEG.view import DataView +from simpeg.view import DataView matplotlib.rcParams["font.size"] = 12 diff --git a/geoscilabs/em/DipoleWidgetFD.py b/geoscilabs/em/DipoleWidgetFD.py index 252a5c6..3ddce96 100644 --- a/geoscilabs/em/DipoleWidgetFD.py +++ b/geoscilabs/em/DipoleWidgetFD.py @@ -1,6 +1,6 @@ import numpy as np -# from SimPEG.electromagnetics import frequency_domain as EM +# from simpeg.electromagnetics import frequency_domain as EM import matplotlib.pyplot as plt import matplotlib.ticker as ticker import matplotlib diff --git a/geoscilabs/em/FDEMDipolarfields.py b/geoscilabs/em/FDEMDipolarfields.py index 1a81963..1fe1c3a 100644 --- a/geoscilabs/em/FDEMDipolarfields.py +++ b/geoscilabs/em/FDEMDipolarfields.py @@ -1,7 +1,7 @@ import numpy as np from scipy.constants import mu_0, pi, epsilon_0 from scipy.special import erf -from SimPEG import utils +from simpeg import utils def omega(f): diff --git a/geoscilabs/em/FDEMPlanewave.py b/geoscilabs/em/FDEMPlanewave.py index ff75739..da0a760 100644 --- a/geoscilabs/em/FDEMPlanewave.py +++ b/geoscilabs/em/FDEMPlanewave.py @@ -1,6 +1,6 @@ import numpy as np from scipy.constants import mu_0, pi, epsilon_0 -from SimPEG import utils +from simpeg import utils def omega(f): diff --git a/geoscilabs/em/HarmonicVMDCylWidget.py b/geoscilabs/em/HarmonicVMDCylWidget.py index 47e19b7..dc3b8fa 100644 --- a/geoscilabs/em/HarmonicVMDCylWidget.py +++ b/geoscilabs/em/HarmonicVMDCylWidget.py @@ -1,7 +1,7 @@ from ipywidgets import widgets from discretize import CylindricalMesh, TensorMesh -from SimPEG import maps, utils -from SimPEG.electromagnetics import frequency_domain as fdem +from simpeg import maps, utils +from simpeg.electromagnetics import frequency_domain as fdem from pymatsolver import Pardiso # from pymatsolver import PardisoSolver diff --git a/geoscilabs/em/PlanewaveWidgetFD.py b/geoscilabs/em/PlanewaveWidgetFD.py index ecbf2ba..5a91f43 100644 --- a/geoscilabs/em/PlanewaveWidgetFD.py +++ b/geoscilabs/em/PlanewaveWidgetFD.py @@ -1,5 +1,5 @@ import numpy as np -from SimPEG.electromagnetics.utils import waveform_utils +from simpeg.electromagnetics.utils import waveform_utils import matplotlib.pyplot as plt import matplotlib.ticker as ticker import matplotlib diff --git a/geoscilabs/em/TDEMDipolarfields.py b/geoscilabs/em/TDEMDipolarfields.py index 3ce4d15..38ce028 100644 --- a/geoscilabs/em/TDEMDipolarfields.py +++ b/geoscilabs/em/TDEMDipolarfields.py @@ -2,7 +2,7 @@ from scipy.constants import mu_0, pi, epsilon_0 from scipy.special import erfc, erf from discretize.utils import as_array_n_by_dim -from SimPEG import utils +from simpeg import utils # TODO: # r = lambda dx, dy, dz: np.sqrt( dx**2. + dy**2. + dz**2.) diff --git a/geoscilabs/em/TDEMGroundedSource.py b/geoscilabs/em/TDEMGroundedSource.py index 2f72b28..5ce8ad3 100644 --- a/geoscilabs/em/TDEMGroundedSource.py +++ b/geoscilabs/em/TDEMGroundedSource.py @@ -3,7 +3,7 @@ import matplotlib.pyplot as plt import deepdish as dd from discretize import TensorMesh -from SimPEG import utils +from simpeg import utils import tarfile import os @@ -83,11 +83,11 @@ def choose_model(model): def run_simulation(fname="tdem_gs_half.h5", sigma_block=0.01, sigma_halfspace=0.01): - from SimPEG.electromagnetics import time_domain as tdem - from SimPEG.electromagnetics.utils import waveform_utils + from simpeg.electromagnetics import time_domain as tdem + from simpeg.electromagnetics.utils import waveform_utils from scipy.constants import mu_0 import numpy as np - from SimPEG import maps, utils + from simpeg import maps, utils from pymatsolver import Pardiso cs = 20 diff --git a/geoscilabs/em/TDEMHorizontalLoopCylWidget.py b/geoscilabs/em/TDEMHorizontalLoopCylWidget.py index e012dae..cef4d8c 100644 --- a/geoscilabs/em/TDEMHorizontalLoopCylWidget.py +++ b/geoscilabs/em/TDEMHorizontalLoopCylWidget.py @@ -1,7 +1,7 @@ from ipywidgets import widgets, FloatText from discretize import TensorMesh, CylindricalMesh -from SimPEG import maps, utils -from SimPEG.electromagnetics import time_domain as tdem +from simpeg import maps, utils +from simpeg.electromagnetics import time_domain as tdem # from pymatsolver import PardisoSolver import matplotlib.pyplot as plt diff --git a/geoscilabs/em/TDEMInductiveSource.py b/geoscilabs/em/TDEMInductiveSource.py index 893eac6..6246dd9 100644 --- a/geoscilabs/em/TDEMInductiveSource.py +++ b/geoscilabs/em/TDEMInductiveSource.py @@ -2,7 +2,7 @@ import matplotlib.pyplot as plt import deepdish as dd from discretize import TensorMesh -from SimPEG import utils +from simpeg import utils import tarfile import os @@ -67,10 +67,10 @@ def choose_source(src_type): def run_simulation(fname="tdem_vmd.h5", sigma_halfspace=0.01, src_type="VMD"): - from SimPEG.electromagnetics import time_domain + from simpeg.electromagnetics import time_domain from scipy.constants import mu_0 import numpy as np - from SimPEG import maps + from simpeg import maps from pymatsolver import Pardiso cs = 20.0 diff --git a/geoscilabs/em/TDEMPlanewave.py b/geoscilabs/em/TDEMPlanewave.py index 35dc462..f8ea31b 100644 --- a/geoscilabs/em/TDEMPlanewave.py +++ b/geoscilabs/em/TDEMPlanewave.py @@ -1,6 +1,6 @@ import numpy as np from scipy.constants import mu_0, pi, epsilon_0 -from SimPEG import utils +from simpeg import utils def e_field_from_sheet_current( diff --git a/geoscilabs/em/UXO_TEM_Widget.py b/geoscilabs/em/UXO_TEM_Widget.py index e3a0a69..900fac7 100644 --- a/geoscilabs/em/UXO_TEM_Widget.py +++ b/geoscilabs/em/UXO_TEM_Widget.py @@ -1,6 +1,6 @@ import numpy as np from scipy.sparse import linalg -from SimPEG import mkvc +from simpeg import mkvc import scipy.optimize as op from ..base import widgetify from ipywidgets import ( diff --git a/geoscilabs/inversion/LinearInversionCG.py b/geoscilabs/inversion/LinearInversionCG.py index 9a379ef..4575678 100644 --- a/geoscilabs/inversion/LinearInversionCG.py +++ b/geoscilabs/inversion/LinearInversionCG.py @@ -1,14 +1,14 @@ import numpy as np import discretize -from SimPEG.simulation import LinearSimulation -from SimPEG.survey import LinearSurvey -from SimPEG.data import Data -from SimPEG import data_misfit -from SimPEG import directives -from SimPEG import optimization -from SimPEG import regularization -from SimPEG import inverse_problem -from SimPEG import inversion +from simpeg.simulation import LinearSimulation +from simpeg.survey import LinearSurvey +from simpeg.data import Data +from simpeg import data_misfit +from simpeg import directives +from simpeg import optimization +from simpeg import regularization +from simpeg import inverse_problem +from simpeg import inversion import matplotlib.pyplot as plt import matplotlib.gridspec as gridspec diff --git a/geoscilabs/inversion/LinearInversionDirect.py b/geoscilabs/inversion/LinearInversionDirect.py index 683bc9e..57798ed 100644 --- a/geoscilabs/inversion/LinearInversionDirect.py +++ b/geoscilabs/inversion/LinearInversionDirect.py @@ -1,6 +1,6 @@ import numpy as np from discretize import TensorMesh -from SimPEG import ( +from simpeg import ( maps, simulation, survey, diff --git a/geoscilabs/inversion/TomographyInversion.py b/geoscilabs/inversion/TomographyInversion.py index 1c1c85e..5045013 100644 --- a/geoscilabs/inversion/TomographyInversion.py +++ b/geoscilabs/inversion/TomographyInversion.py @@ -1,6 +1,6 @@ import numpy as np from discretize import TensorMesh -from SimPEG import ( +from simpeg import ( maps, utils, simulation, @@ -28,7 +28,7 @@ SelectMultiple, ) import ipywidgets as widgets -import SimPEG.seismic.straight_ray_tomography as seismic +import simpeg.seismic.straight_ray_tomography as seismic from pylab import hist diff --git a/geoscilabs/mag/Mag.py b/geoscilabs/mag/Mag.py index bcae376..6cea673 100644 --- a/geoscilabs/mag/Mag.py +++ b/geoscilabs/mag/Mag.py @@ -2,8 +2,8 @@ from scipy.constants import mu_0 import re import numpy as np -from SimPEG import utils, data -from SimPEG.potential_fields import magnetics as mag +from simpeg import utils, data +from simpeg.potential_fields import magnetics as mag class Simulation(object): @@ -316,7 +316,7 @@ def Intrgl_Fwr_Op(xn, yn, zn, rxLoc): def createMagSurvey(xyzd, B): """ - Create SimPEG magnetic survey pbject + Create simpeg magnetic survey pbject INPUT :param array: xyzd, n-by-4 array of observation points and data diff --git a/geoscilabs/mag/MagDipoleApp.py b/geoscilabs/mag/MagDipoleApp.py index 1fa447c..8edb4bb 100644 --- a/geoscilabs/mag/MagDipoleApp.py +++ b/geoscilabs/mag/MagDipoleApp.py @@ -2,7 +2,7 @@ from scipy.interpolate import interp1d from discretize import TensorMesh from discretize.utils import closest_points_index -from SimPEG import utils +from simpeg import utils from geoana import em from ipywidgets import widgets from ipywidgets import Layout @@ -222,7 +222,7 @@ def simulate_prism( fit_model=False ): self.component = component - self.inclination = -inclination # -ve accounts for LH modeling in SimPEG + self.inclination = -inclination # -ve accounts for LH modeling in simpeg self.declination = declination self.length = length self.dx = dx @@ -253,7 +253,7 @@ def simulate_prism( z = np.r_[1.0] B = np.r_[ B0, -inclination, declination - ] # -ve accounts for LH modeling in SimPEG + ] # -ve accounts for LH modeling in simpeg # Project to the direction of earth field if component == "Bt": diff --git a/geoscilabs/mag/Simulator.py b/geoscilabs/mag/Simulator.py index 1e075fc..804222a 100644 --- a/geoscilabs/mag/Simulator.py +++ b/geoscilabs/mag/Simulator.py @@ -9,8 +9,8 @@ from mpl_toolkits.mplot3d.art3d import Poly3DCollection from scipy.interpolate import griddata, interp1d -from SimPEG.potential_fields import magnetics as mag -from SimPEG import utils, data +from simpeg.potential_fields import magnetics as mag +from simpeg import utils, data from scipy.constants import mu_0 diff --git a/geoscilabs/seismic/NMOwidget.py b/geoscilabs/seismic/NMOwidget.py index a943917..9127abd 100644 --- a/geoscilabs/seismic/NMOwidget.py +++ b/geoscilabs/seismic/NMOwidget.py @@ -1,6 +1,6 @@ from IPython.display import set_matplotlib_formats import matplotlib -from SimPEG.utils import download, mkvc, sub2ind +from simpeg.utils import download, mkvc, sub2ind import numpy as np import scipy.io from ipywidgets import (