Title: Flow modelling using the shallow water equations in non-orthogonal boundary-fitted form