Towards an accurate fate and transport model for nonuniform surface waters