Macrodispersion Approach for Upscaling of Two-Phase, Immiscible Flow in Heterogeneous Porous Media