This paper reports the development of a model of diesel combustion and NO emissions, based on a modified eddy dissipation concept (EDC), and its implementation into the KIVA-3V multidimensional simulation. The EDC model allows for more realistic representation of the thin sub-grid scale reaction zone as well as the small-scale molecular mixing processes. Realistic chemical kinetic mechanisms for n-heptane combustion and NOx formation processes are fully incorporated. A model based on the normalized fuel mass fraction is implemented to transition between ignition and combustion. The modeling approach has been validated by comparison with experimental data for a range of operating conditions. Predicted cylinder pressure and heat release rates agree well with measurements. The predictions for NO concentration show a consistent trend with experiments. Overall, the results demonstrate the improved capability of the model for predictions of the combustion process.