Re-enable merged diffusion routine
Bugfix in merged LES diffusion, used incorrect boundary values for v
diffusion