A comparison of critical heat flux in tubes and annuli