changes for simulation
Merge pull request #124 from abubeck/hydro_dev

changes for simulation