Split form advection

Parent post: