Flow and sediment transport induced by tide propagation: 2. The wavy bottom case