Put the grid in the new format
Use forward declaration in the advection class