WIP: Encapsulate the volume averaging

Open Ned Coltman requested to merge feature/encapsulateAveraging into master

move volume averaging to separate header

Merge request reports