Antoine Griezmann is set to end all speculation linking him with a move to Manchester United by agreeing a new contract with Atletico Madrid.