Douglas J E Barnes

Although this is probably a little late for your project (sorry), for people searching, this might help.

There is an online swale calculator to help with the design process.

Hi Adi, I have seen people employ circular swales on flat sites in semi-arid regions.

For what you are after, I'd stick with Michael's suggestions, and perhaps tack in some others like cassava.