Feature/improve flux over surface

Merged Kilian Weishaupt requested to merge feature/improve-flux-over-surface into master

Merge request reports