Treating the nvd cluster differently
Merge branch 'develop' of github.com:arashb/turbulent_lbm_multigpu into develop
Merge conflict fixed