Numerical and experimental investigation of propulsion in waves