A spectral/hp element method for thermal convection