Studies on Hydraulic Jump in Prismatic and Non-Prismatic Channels