Added convective term to right hand side (conditional upon NS being chosen) for simulation type 2.