Began overhaul of functionals, also added missing mesh files to
channel-optimisation example