Modelling Trapped Gas Expansion in Water-Drive Reservoirs