Regional Upscaling: A New Method To Upscale Waterflooding in Heterogeneous Reservoirs for a Range of Capillary and Gravity Effects