Scheduled maintenance on Monday 2019-06-24 between 10:00-11:00 CEST

Commit a7325040 authored by Martin Reinecke's avatar Martin Reinecke

slightly less invasive fix

parent bfd678e9
Pipeline #47569 passed with stages
in 8 minutes and 17 seconds
......@@ -191,21 +191,15 @@ class PoissonianEnergy(EnergyOperator):
def apply(self, x):
self._check_input(x)
if isinstance(x, Linearization):
inp_vals = x.val.local_data
else:
inp_vals = x.local_data
fix_inf = False
if np.any(inp_vals==np.inf):
if not np.any(np.isnan(inp_vals)):
fix_inf=True #Note: This will break for MPI if there are NaNs in some threads but not others
res = x.sum()
tmp = (res.val.local_data if isinstance(res, Linearization)
else res.local_data)
# if we have no infinity here, we can continue with the calculation;
# otherwise we know that the result must also be infinity
if not np.any(np.isinf(tmp)):
res = res - x.log().vdot(self._d)
if not isinstance(x, Linearization):
if fix_inf:
res = np.inf
return Field.scalar(res)
res = x.sum() - x.log().vdot(self._d)
if fix_inf:
res = Linearization(Field.scalar(np.inf), res.jac)
if not x.want_metric:
return res
metric = SandwichOperator.make(x.jac, makeOp(1./x.val))
......
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