Use the correct definitions when CUDA is enabled
Merge remote-tracking branch 'chiel/cuda' into cuda_advec
Added error handling CUDA