code review pull request

The hydro-devel branch for code review