Merge branch 'revert-03cc7f7e' into 'master'

Revert "added some distribution_strategy's for mpirun, fixed some errors in WienerFilterEnergy"

See merge request !167
5 jobs for master in 15 minutes and 54 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #206761
test_min

00:03:28

passed #206762
test_mpi

00:05:59

passed #206763
test_mpi_fftw

00:06:18

passed #206764
test_mpi_fftw_hdf5

00:06:09

66.0%
 
  Release
passed #206765
release_image_master

00:07:12