Modelling the changes in waveform in combined wave-current flow