changed some details on the convection function, still needs to be tested on a 2D problem