Finite element modelling of transport and non-hydrostatic flow in environmental fluid mechanics