Replaced the mass flux computation with a cleaner version.