Incorporate bathymetry in unit test
Add fwave solver submodule to latest version