Vortices and waves in planar and disk flows