Merge branch 'develop-bugs' into 'master'

Develop bugs

Hi,

   I have just corrected a bug in the ohc function. cdo sometimes change the name of the dimensions, in that case from x to x_2, which prevents the cdftools to work properly. I have corrected this renaming when it happens on tmpohc.nc in the ohc function.

Best regards
Virginie