Unverified Commit 18a0cd3e authored by Axel Kohlmeyer's avatar Axel Kohlmeyer Committed by GitHub
Browse files

Merge pull request #1817 from akohlmey/collected-small-fixes 

Collected small bugfixes and updates
parents d3eed9db 2d71d9d4

.github/CODEOWNERS

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ src/exceptions.h @rbberger 
src/fix_nh.*              @athomps

src/info.*                @akohlmey @rbberger

src/timer.*               @akohlmey

src/min*                  @sjplimp @stanmoore1



# tools

tools/msi2lmp/*       @akohlmey

doc/src/fix_ave_atom.rst

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ command creates a per-atom array with 6 columns: 


   compute my_stress all stress/atom NULL

   fix 1 all ave/atom 10 20 1000 c_my_stress[\*]

   fix 1 all ave/atom 10 20 1000 c_my_stress[1] c_my_stress[1] &

   fix 1 all ave/atom 10 20 1000 c_my_stress[1] c_my_stress[2] &

                                 c_my_stress[3] c_my_stress[4] &

                                 c_my_stress[5] c_my_stress[6]

doc/txt/fix_ave_atom.txt

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ command creates a per-atom array with 6 columns: 


compute my_stress all stress/atom NULL

fix 1 all ave/atom 10 20 1000 c_my_stress\[*\]

fix 1 all ave/atom 10 20 1000 c_my_stress\[1\] c_my_stress\[1\] &

fix 1 all ave/atom 10 20 1000 c_my_stress\[1\] c_my_stress\[2\] &

                              c_my_stress\[3\] c_my_stress\[4\] &

                              c_my_stress\[5\] c_my_stress\[6\] :pre

lib/gpu/geryon/ocl_device.h

+8 −0
Original line number Diff line number Diff line
@@ -28,6 +28,14 @@ 
#include <vector>

#include <iostream>



/* We default to OpenCL 1.2 as target version for now as

 * there are known issues with OpenCL 2.0 and later.

 * This is also to silence warnings from generic OpenCL headers */



#if !defined(CL_TARGET_OPENCL_VERSION)

#define CL_TARGET_OPENCL_VERSION 120

#endif



#ifdef __APPLE__

#include <OpenCL/cl.h>

#include <OpenCL/cl_platform.h>

lib/gpu/geryon/ocl_macros.h

+8 −0
Original line number Diff line number Diff line
@@ -4,6 +4,14 @@ 
#include <cstdio>

#include <cassert>



/* We default to OpenCL 1.2 as target version for now as

 * there are known issues with OpenCL 2.0 and later.

 * This is also to silence warnings from generic OpenCL headers */



#if !defined(CL_TARGET_OPENCL_VERSION)

#define CL_TARGET_OPENCL_VERSION 120

#endif



#ifdef __APPLE__

#include <OpenCL/cl.h>

#else

CRA Git | Maintained and supported by SUSTech CRA and CCSE