Some correction to run with XIO. Note some variables where commented because they have more than 2 dimesions. It'll be easier to add them when later with XIOS2.