Effect of combustor geometry and fuel injection scheme on the combustion process in a supersonic flow