From acfeacf2860c3891cfbc35a4c041c16a6433d964 Mon Sep 17 00:00:00 2001 From: fourndo Date: Tue, 25 Oct 2022 14:01:26 -0700 Subject: [PATCH] Stash reg deriv2 operators --- SimPEG/dask/inverse_problem.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/SimPEG/dask/inverse_problem.py b/SimPEG/dask/inverse_problem.py index 8da2ac2bab..41b8e30d90 100644 --- a/SimPEG/dask/inverse_problem.py +++ b/SimPEG/dask/inverse_problem.py @@ -190,7 +190,7 @@ def dask_evalFunction(self, m, return_g=True, return_H=True): phi_d = np.asarray(phi_d) # print(self.dpred[0]) - # self.reg2Deriv = [obj.deriv2(m) for obj in self.reg.objfcts] + self.reg2Deriv = [obj.deriv2(m) for obj in self.reg.objfcts] # reg = np.linalg.norm(self.reg2Deriv * self.reg._delta_m(m)) phi_m = self.reg(m) @@ -244,10 +244,7 @@ def dask_evalFunction(self, m, return_g=True, return_H=True): def H_fun(v): phi_d2Deriv = self.dmisfit.deriv2(m, v) - # if hasattr(self.reg.objfcts[0], "space") and self.reg.objfcts[0].space == "spherical": - phi_m2Deriv = self.reg.deriv2(m, v=v) - # else: - # phi_m2Deriv = np.sum([reg2Deriv * v for reg2Deriv in self.reg2Deriv]) + phi_m2Deriv = np.sum([reg2Deriv * v for reg2Deriv in self.reg2Deriv], axis=0) H = phi_d2Deriv + self.beta * phi_m2Deriv