Minor changes to make the diagnostics more user-friendly. Removed old diagnostics. Added measurement of time consumed by each diagnostic class

Options to compute indices for the convective activity in the four main convection sites, the strength of the barotropic gyres, and of the Antarctic Circumpolar Curren