Advanced wave modeling, including wave-current interaction