Combine grid eval

combines gird eval for advection (#20) and gets rid of all the plural names (#8)