Adding a few variables (intercepted water and routing variables) as a temporary fix until the merger with the trunk and the ability to use XIOS.