Upscaling of two-phase flow in oil-gas systems