Some consequences of non-linear effects on tides and gravity waves