water equation improved and dynamic param added (frequency, amplitude, fi, direction)