Removed code for interpolating velocity field based on intervals with constant velocity
Still working on nasty advection problem