Merge branch 'feature/freeflow-new-staggered-stokes' into 'master'
[freeflow] Add mass/energy model and donea/channel/sincos test with new staggered See merge request !2823
[freeflow] Add mass/energy model and donea/channel/sincos test with new staggered See merge request !2823