Initial transfer from SVN

fixed a bug on the version that imposes water height at inflow

git-svn-id: svn://svn.sissa.it/openship@567 958231e9-8e66-0410-a4a0-f664109d2741