rename advection kernels to include class name
Reomove double calccfl routine