Just before merging NavierStokes with NavierStokesScalar