Effects of Geometry on Strong Free-Surface Vortices in Subcritical Approach Flows