Moved flux calc into 2 separate kernels