Improvements in 3-D Modeling of Diesel Engine Intake Flow and Combustion