Improved Capillary Desaturation Model for Carbonate Reservoirs