From 412a24e678e86fe77155663141031c5594d95efe Mon Sep 17 00:00:00 2001 From: rowanc1 Date: Mon, 19 May 2014 11:00:10 -0700 Subject: [PATCH] Solver in Problem Class, now bfgs uses that. --- SimPEG/InvProblem.py | 6 +++--- SimPEG/Problem.py | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/SimPEG/InvProblem.py b/SimPEG/InvProblem.py index 4d0597a9..ccc1164f 100644 --- a/SimPEG/InvProblem.py +++ b/SimPEG/InvProblem.py @@ -63,9 +63,9 @@ class BaseInvProblem(object): self.curModel = m0 - print 'SimPEG.InvProblem is setting bfgsH0 to the inverse of the eval2Deriv. \n ***Done using direct methods***' - self.opt.bfgsH0 = Solver(self.reg.eval2Deriv(self.curModel)) - + print """SimPEG.InvProblem is setting bfgsH0 to the inverse of the eval2Deriv. + ***Done using same solver as the problem***""" + self.opt.bfgsH0 = self.prob.Solver(self.reg.eval2Deriv(self.curModel)) @property def warmstart(self): diff --git a/SimPEG/Problem.py b/SimPEG/Problem.py index 094616fe..dea83b1a 100644 --- a/SimPEG/Problem.py +++ b/SimPEG/Problem.py @@ -1,4 +1,5 @@ import Utils, Survey, Models, numpy as np, scipy.sparse as sp +Solver = Utils.SolverUtils.Solver import Maps, Mesh @@ -286,6 +287,9 @@ class BaseProblem(object): surveyPair = Survey.BaseSurvey #: A SimPEG.Survey Class mapPair = Maps.IdentityMap #: A SimPEG.Map Class + Solver = Solver #: A SimPEG Solver class. + solverOpts = {} #: Sovler options as a kwarg dict + mapping = None #: A SimPEG.Map instance. mesh = None #: A SimPEG.Mesh instance.