Added support for SWM6-NDP water model.

Change-Id: If7a2f6fd553de0619215e700728646b174d8528a