wassname/simpeg
1
0
Fork 0
mirror of https://github.com/wassname/simpeg.git synced 2026-08-08 11:26:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix depenencies in notebooks and got tests to work.

Browse Source
This commit is contained in:
GudniRos
2015-07-07 09:24:53 -07:00
parent c78d5beef8
commit 2b37f27602
10 changed files with 750 additions and 397 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simpegMT/ProblemMT3D/Problems.py
+9 -30
View File
@@ -23,40 +23,19 @@ class eForm_ps(BaseMTProblem):
_fieldType = 'e'
_eqLocs = 'FE'
fieldsPair = FieldsMT_3D
# Need to add the src ....
# Set new properties
# Background model
# Shouldn't need the commented block.
# @property
# def backModel(self):
# """
# Sets the model, and removes dependent mass matrices.
# """
# return getattr(self, '_backModel', None)
# @backModel.setter
# def backModel(self, value):
# if value is self.backModel:
# return # it is the same!
# self._backModel = Models.Model(value, self.mapping)
# for prop in self.deleteTheseOnModelUpdate:
# if hasattr(self, prop):
# delattr(self, prop)
# @property
# def MeDeltaSigma(self):
# #TODO: hardcoded to sigma as the model
# if getattr(self, '_MeDeltaSigma', None) is None:
# sigma = self.curModel
# sigmaBG = self.backModel
# self._MeDeltaSigma = self.mesh.getEdgeInnerProduct(sigma - sigmaBG)
# return self._MeDeltaSigma
_sigmaPrimary = None
def __init__(self, mesh, **kwargs):
BaseMTProblem.__init__(self, mesh, **kwargs)
@property
def sigmaPrimary(self):
return self._sigmaPrimary
@sigmaPrimary.setter
def sigmaPrimary(self, val):
# Note: TODO add logic for val, make sure it is the correct size.
self._sigmaPrimary = val
def getA(self, freq):
"""
Function to get the A matrix.
simpegMT/Tests/test_Problem1D_againstAnalyticHalfspace.py
+4 -4
View File
@@ -36,7 +36,7 @@ def setupSurvey(sigmaHalf,tD=True):
srcList.append(simpegmt.SurveyMT.srcMT_polxy_1DhomotD(rxList,freq))
else:
for freq in freqs:
srcList.append(simpegmt.SurveyMT.srcMT_polxy_1Dprimary(rxList,freq,sigma))
srcList.append(simpegmt.SurveyMT.srcMT_polxy_1Dprimary(rxList,freq))
survey = simpegmt.SurveyMT.SurveyMT(srcList)
return survey, sigma, m1d
@@ -63,7 +63,7 @@ def appRes_TotalFieldNorm(sigmaHalf):
# Make the survey
survey, sigma, mesh = setupSurvey(sigmaHalf)
problem = simpegmt.ProblemMT1D.eForm_TotalField(mesh,sigma)
problem = simpegmt.ProblemMT1D.eForm_TotalField(mesh)
problem.pair(survey)
# Get the fields
@@ -99,7 +99,7 @@ def appRes_psFieldNorm(sigmaHalf):
# Make the survey
survey, sigma, mesh = setupSurvey(sigmaHalf,False)
problem = simpegmt.ProblemMT1D.eForm_psField(mesh)
problem = simpegmt.ProblemMT1D.eForm_psField(mesh, sigmaPrimary = sigma)
problem.pair(survey)
# Get the fields
@@ -117,7 +117,7 @@ def appPhs_psFieldNorm(sigmaHalf):
# Make the survey
survey, sigma, mesh = setupSurvey(sigmaHalf,False)
problem = simpegmt.ProblemMT1D.eForm_psField(mesh)
problem = simpegmt.ProblemMT1D.eForm_psField(mesh, sigmaPrimary = sigma)
problem.pair(survey)
# Get the fields
simpegMT/Tests/test_Problem1D_totalDvsPSvsAnalytic.py
+1 -1
View File
@@ -109,7 +109,7 @@ def dataMis_AnalyticPrimarySecondary(sigmaHalf):
# Make the survey
# Primary secondary
surveyPS, sigmaPS, mesh = setupSurvey(sigmaHalf,False)
problemPS = simpegmt.ProblemMT1D.eForm_psField(mesh,sigma)
problemPS = simpegmt.ProblemMT1D.eForm_psField(mesh,sigmaPS)
problemPS.pair(surveyPS)
# Analytic data
dataAna = calculateAnalyticSolution(surveyPS.srcList,mesh,sigma)
simpegMT/Tests/test_Problem3D_againstAnalytic.py
+11 -11
View File
@@ -18,7 +18,7 @@ def getInputs():
# M = simpeg.Mesh.TensorMesh([[(100,5,-1.5),(100.,10),(100,5,1.5)],[(100,5,-1.5),(100.,10),(100,5,1.5)],[(100,5,1.6),(100.,10),(100,3,2)]], x0=['C','C',-3529.5360])
M = simpeg.Mesh.TensorMesh([[(1000,6,-1.5),(1000.,6),(1000,6,1.5)],[(1000,6,-1.5),(1000.,2),(1000,6,1.5)],[(1000,10,-1.3),(1000.,2),(1000,10,1.3)]], x0=['C','C','C'])# Setup the model
# Set the frequencies
freqs = np.logspace(3,-3,7)
freqs = np.logspace(1,-3,5)
elev = 0
## Setup the the survey object
@@ -73,12 +73,12 @@ def runSimpegMTfwd_eForm_ps(inputsProblem):
srcList =[]
sigma1d = M.r(sigBG,'CC','CC','M')[0,0,:]
for freq in freqs:
srcList.append(simpegmt.SurveyMT.srcMT_polxy_1Dprimary(rxList,freq,sigma1d))
srcList.append(simpegmt.SurveyMT.srcMT_polxy_1Dprimary(rxList,freq))
# Survey MT
survey = simpegmt.SurveyMT.SurveyMT(srcList)
## Setup the problem object
problem = simpegmt.ProblemMT3D.eForm_ps(M)
problem = simpegmt.ProblemMT3D.eForm_ps(M,sigmaPrimary=sigma1d)
problem.verbose = False
from pymatsolver import MumpsSolver
problem.Solver = MumpsSolver
@@ -106,19 +106,19 @@ def appResPhsHalfspace_eFrom_ps_Norm(sigmaHalf,appR=True):
# Calculate the app phs
app_rpxy, app_rpyx = np.array(getAppResPhs(data))
if appR:
return np.linalg.norm(np.abs(app_rpxy[0,:] - np.ones(survey.nFreq)/sigmaHalf) * sigmaHalf)
return np.all(np.abs(app_rpxy[0,:] - np.ones(survey.nFreq)/sigmaHalf) * sigmaHalf < .35)
else:
return np.linalg.norm(np.abs(app_rpxy[1,:] + np.ones(survey.nFreq)*135) / 135)
return np.all(np.abs(app_rpxy[1,:] + np.ones(survey.nFreq)*135) / 135 < .35)
class TestAnalytics(unittest.TestCase):
def setUp(self):
pass
def test_appRes2en1(self):self.assertLess(appResPhsHalfspace_eFrom_ps_Norm(2e-1), TOLr)
def test_appRes2en2(self):self.assertLess(appResPhsHalfspace_eFrom_ps_Norm(2e-2), TOLr)
def test_appRes2en3(self):self.assertLess(appResPhsHalfspace_eFrom_ps_Norm(2e-3), TOLr)
def test_appRes2en1(self):self.assertLess(appResPhsHalfspace_eFrom_ps_Norm(2e-1,False), TOLr)
def test_appRes2en2(self):self.assertLess(appResPhsHalfspace_eFrom_ps_Norm(2e-2,False), TOLr)
def test_appRes2en3(self):self.assertLess(appResPhsHalfspace_eFrom_ps_Norm(2e-3,False), TOLr)
# def test_appRes2en1(self):self.assertTrue(appResPhsHalfspace_eFrom_ps_Norm(2e-1))
def test_appRes1en2(self):self.assertTrue(appResPhsHalfspace_eFrom_ps_Norm(1e-2))
def test_appRes1en3(self):self.assertTrue(appResPhsHalfspace_eFrom_ps_Norm(1e-3))
# def test_appRes2en1(self):self.assertTrue(appResPhsHalfspace_eFrom_ps_Norm(2e-1,False))
def test_appPhs1en2(self):self.assertTrue(appResPhsHalfspace_eFrom_ps_Norm(1e-2,False))
def test_appPhs1en3(self):self.assertTrue(appResPhsHalfspace_eFrom_ps_Norm(1e-3,False))
if __name__ == '__main__':
unittest.main()
simpegMT/Utils/dataUtils.py
+5 -1
View File
@@ -121,4 +121,8 @@ def plotMT1DModelData(problem,models,symList=None):
for ax in [axM,axR,axP]:
ax.xaxis.set_tick_params(labelsize=fontSize)
ax.yaxis.set_tick_params(labelsize=fontSize)
return fig
return fig
def printTime():
import time
print time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.localtime())