From 57ef1b82df1f51f417b55aebd7991d0b48a9c35f Mon Sep 17 00:00:00 2001
From: Martin Reinecke <martin@mpa-garching.mpg.de>
Date: Sun, 12 Nov 2017 22:09:26 +0100
Subject: [PATCH] fixes
---
nifty/field.py | 2 +-
nifty/operators/diagonal_operator.py | 2 +-
nifty/operators/laplace_operator.py | 1 -
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/nifty/field.py b/nifty/field.py
index b5649ae36..78359b5f8 100644
--- a/nifty/field.py
+++ b/nifty/field.py
@@ -315,7 +315,7 @@ class Field(object):
wgt = wgt.reshape(new_shape)
# FIXME only temporary
if ind==0:
- wgt = dobj.local_data(dobj.from_global_data(wgt, distaxis=0))
+ wgt = dobj.local_data(dobj.from_global_data(wgt))
out *= wgt**power
fct = fct**power
if fct != 1.:
diff --git a/nifty/operators/diagonal_operator.py b/nifty/operators/diagonal_operator.py
index c55f777de..f739d4ca5 100644
--- a/nifty/operators/diagonal_operator.py
+++ b/nifty/operators/diagonal_operator.py
@@ -154,5 +154,5 @@ class DiagonalOperator(EndomorphicOperator):
reshaped_local_diagonal = np.reshape(dobj.to_global_data(diag.val), self._reshaper)
if 0 in self._spaces:
- reshaped_local_diagonal = dobj.local_data(dobj.from_global_data(reshaped_local_diagonal,distaxis=0))
+ reshaped_local_diagonal = dobj.local_data(dobj.from_global_data(reshaped_local_diagonal))
return Field(x.domain, val=x.val*reshaped_local_diagonal)
diff --git a/nifty/operators/laplace_operator.py b/nifty/operators/laplace_operator.py
index 395160c65..3d3a1e60e 100644
--- a/nifty/operators/laplace_operator.py
+++ b/nifty/operators/laplace_operator.py
@@ -89,7 +89,6 @@ class LaplaceOperator(EndomorphicOperator):
return self._logarithmic
def _times(self, x):
- val = dobj.to_global_data(x.val)
axes = x.domain.axes[self._space]
axis = axes[0]
locval = x.val
--
GitLab