Commit c61dc799 authored by Martin Reinecke's avatar Martin Reinecke
Browse files

Merge branch 'NIFTy_5' into interpolated_inverse_gamma

parents c1678494 2455e563
......@@ -75,14 +75,13 @@ class FFTOperator(LinearOperator):
target.check_codomain(adom)
def apply(self, x, mode):
from pyfftw.interfaces.numpy_fft import fftn, ifftn
self._check_input(x, mode)
ncells = x.domain[self._space].size
if x.domain[self._space].harmonic: # harmonic -> position
func = fftn
func = fft.fftn
fct = 1.
else:
func = ifftn
func = fft.ifftn
fct = ncells
axes = x.domain.axes[self._space]
tdom = self._tgt(mode)
......
......@@ -219,7 +219,7 @@ class _OpSum(Operator):
lin1 = self._op1(Linearization.make_var(v1, wm))
lin2 = self._op2(Linearization.make_var(v2, wm))
op = lin1._jac._myadd(lin2._jac, False)
res = lin1.new(lin1._val+lin2._val, op(x.jac))
res = lin1.new(lin1._val.unite(lin2._val), op(x.jac))
if lin1._metric is not None and lin2._metric is not None:
res = res.add_metric(lin1._metric + lin2._metric)
return res
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment