A Generalized Dynamic Wake Model with Wake Distortion Effects