A study of non-swirling and swirling and their effects on spray flow fields and combustion in an optically-accessible, DI diesel engine