Discharg1/2 issues in devs_leo branch

[leobpujol]

Issues with mass flux boundary conditions in current devs_leo version.
To fix by merging carefully with master branch (issue not present)

[leobpujol]

Issue related to zR definition in euler_first_b1.
Temporary fix in commit devs_leo commit d74cdbd