First attempt to merge CFD and GPU codes