Toward free-surface flow simulations with correct energy evolution