merging with safran grid

The previous merge wasn't good because of the conversion file which end up with a grid wrongly projected.
I used the safran fil from the meteoRIT package.