Discretization on Non-Orthogonal, Curvilinear Grids for Multi-Phase Flow