Contributes to ticket #916 (hydraulic architecture) and contains some changes of the calculation of snags