added diag
Merge branch 'develop' of github.com:mwiesenberger/feltor into develop