Merge branch 'simplifymodel' into 'NIFTy_7'

Amplitude -> Power spectrum

See merge request !558
12 jobs for NIFTy_7 in 13 minutes and 16 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Build Docker
passed #1116149
build_docker_from_cache

00:00:17

 
  Test
passed #1116151
test_mpi

00:00:19

passed #1116150
test_serial

00:05:17

86.0%
 
  Demo Runs
passed #1116158
run_bernoulli

00:00:30

passed #1116159
run_curve_fitting

00:00:30

passed #1116154
run_getting_started_1

00:00:35

passed #1116155
run_getting_started_2

00:01:02

passed #1116156
run_getting_started_3

00:02:15

passed #1116157
run_getting_started_mf

00:07:40

passed #1116152
run_ipynb0

00:01:38

passed #1116153
run_ipynb1

00:00:43

passed #1116160
run_visual_mgvi

00:01:30