Merge branch 'bugs' into 'master'

Bugs

Hi,

   I have just found a fatal typo in the master branch : grid_UV which does not exist instead of grid_U and I have corrected it. This should be merged as soon as possible because it prevents from running

Best regards
Virginie