The effect of riser end geometry on gas-solid hydrodynamics in a CFB riser operating in the core annular and dilute homogeneous flow regimes