Moving the choice for all solvers to NS_parameters + some more DivFunction/GradFunction
Add flux
Merge remote-tracking branch 'mikael/master'