Fixed float 3 issue with f,fshift and shift_vec
On going changes on kernel AND reference for debugging purposes
Merge branch 'asc' into dk-dev

Conflicts:
	src/gromacs/gmxlib/gpu_utils/gpu_utils.cpp
	src/gromacs/legacyheaders/gpu_utils.h
	src/gromacs/legacyheaders/types/hw_info.h
	src/gromacs/mdlib/forcerec.c
	src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_data_mgmt.cpp
	src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_kernel_nvidia.clh
Fix automerge issues
Bad automerge on kernel
Merge branch 'dk' into dk-dev

Conflicts:
	src/gromacs/gmxlib/ocl_tools/vectype_ops.clh
	src/gromacs/legacyheaders/types/hw_info.h
	src/gromacs/mdlib/nbnxn_kernels/nbnxn_kernel_gpu_ref.c
	src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_data_mgmt.cpp
	src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_kernel_nvidia.clh
	src/gromacs/mdlib/nbnxn_ocl/nbnxn_ocl_kernel_utils.clh
Correct small merge differences (whitespaces)
Replace memset_f3 with memset_f to initialise buffer atdat->f, as the first will cause memory corruption
(fixes #40)
Merge branch 'asc' of https://github.com/StreamComputing/gromacs into dk-dev
Other fixed. Manual merge from dk-dev-warps.

    Fix wrong const in kernel.
    Assert and compilation warning for ocl_is_ewald_analytical
 Other fixes. Manual merge from dk-dev-warps.

    Fix wrong const in kernel.
Merge pull request #45 from StreamComputing/dk

Dk
IN/OUT comments for the OpenCL kernel parameters
f, fshift log to file after first kernel run

f and fshift arrays are written to file after the first kernel
execution.

For the OpenCL version. the results are also compared to the CUDA
results, if the corresponding files are found.

OpenCL: see
#define DEBUG_DUMP_F_OCL
#define DEBUG_DUMP_FSHIFT_OCL
Output files: ocl_f.txt and ocl_fshift.txt

CUDA: see
#define DEBUG_DUMP_F_CUDA
#define DEBUG_DUMP_FSHIFT_CUDA
Output files: cuda_f.txt and cuda_fshift.txt
Fixed nbst.fshift allocation and D2H copy

fshift is a field inside the cl_nb_staging_t data structure.
It is declared as float*, but actually each of its elements is a float3.
Adjusted the allocation and the D2H copy accordingly.
Needs clean-up.
Merge pull request #6 from StreamComputing/asc

Asc