The Norwegian world No 1 will compete at Doha next week, a year after he was penalised for wearing jeans in New York