From 9b67956630d3f9e977270b1a20577e1fa953adbf Mon Sep 17 00:00:00 2001 From: Rowan Cockett Date: Fri, 5 Feb 2016 14:01:20 -0800 Subject: [PATCH] Use the linear problem and survey class --- SimPEG/Examples/Inversion_Linear.py | 26 ++------------------------ SimPEG/Problem.py | 4 ++-- 2 files changed, 4 insertions(+), 26 deletions(-) diff --git a/SimPEG/Examples/Inversion_Linear.py b/SimPEG/Examples/Inversion_Linear.py index a8a0eddc..47d49c7f 100644 --- a/SimPEG/Examples/Inversion_Linear.py +++ b/SimPEG/Examples/Inversion_Linear.py @@ -10,28 +10,6 @@ def run(N=100, plotIt=True): """ - class LinearSurvey(Survey.BaseSurvey): - def projectFields(self, u): - return u - - class LinearProblem(Problem.BaseProblem): - - surveyPair = LinearSurvey - - def __init__(self, mesh, G, **kwargs): - Problem.BaseProblem.__init__(self, mesh, **kwargs) - self.G = G - - def fields(self, m, u=None): - return self.G.dot(m) - - def Jvec(self, m, v, u=None): - return self.G.dot(v) - - def Jtvec(self, m, v, u=None): - return self.G.T.dot(v) - - np.random.seed(1) mesh = Mesh.TensorMesh([N]) @@ -53,8 +31,8 @@ def run(N=100, plotIt=True): mtrue[mesh.vectorCCx > 0.45] = -0.5 mtrue[mesh.vectorCCx > 0.6] = 0 - prob = LinearProblem(mesh, G) - survey = LinearSurvey() + prob = Problem.LinearProblem(mesh, G) + survey = Survey.LinearSurvey() survey.pair(prob) survey.makeSyntheticData(mtrue, std=0.01) diff --git a/SimPEG/Problem.py b/SimPEG/Problem.py index f8d8257c..cd8a4aaa 100644 --- a/SimPEG/Problem.py +++ b/SimPEG/Problem.py @@ -214,11 +214,11 @@ class BaseTimeProblem(BaseProblem): del self._timeMesh class LinearProblem(BaseProblem): - + surveyPair = Survey.LinearSurvey def __init__(self, mesh, G, **kwargs): - Problem.BaseProblem.__init__(self, mesh, **kwargs) + BaseProblem.__init__(self, mesh, **kwargs) self.G = G def fields(self, m):