Updated version of the Free-Surface using primitive variable