Free-Surface Tracking with the Harmonic Polynomial Cell Method : Two Alternative Strategies