Merge branch 'master' into openmp-master
ca4f23380212
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Dec 3 2011, 15:49.

Description

Merge branch 'master' into openmp-master

Resolved Conflicts:
lib/gpu/Makefile.firefly
lib/gpu/Makefile.firefly_opencl
lib/gpu/Nvidia.makefile
lib/gpu/Opencl.makefile
lib/gpu/lal_cg_cmm.cpp
lib/gpu/lal_cg_cmm.cu
lib/gpu/lal_cg_cmm.h
lib/gpu/lal_cg_cmm_ext.cpp
lib/gpu/lal_cg_cmm_long.cpp
lib/gpu/lal_cg_cmm_long.cu
lib/gpu/lal_cg_cmm_long.h
lib/gpu/lal_cg_cmm_long_ext.cpp
lib/gpu/lal_precision.h
lib/gpu/lal_preprocessor.h
src/GPU/Install.sh
src/GPU/pair_lj_cut_coul_long_gpu.cpp
src/GPU/pair_lj_sdk_coul_long_gpu.cpp
src/GPU/pair_lj_sdk_gpu.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Dec 3 2011, 15:49

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSeaf9944f4b02: update to dec 4 patch ahead of git update.
rLAMMPSd8449c71012e: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7296 f3b2605a-c512-4ea7…

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSca4f23380212: Merge branch 'master' into openmp-master (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Dec 3 2011, 15:49

Merged Changes

Commit	Author	Details	Committed
d8449c71012e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7296 f3b2605a-c512-4ea7…	Dec 2 2011
666e5f981568	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7294 f3b2605a-c512-4ea7…	Dec 2 2011
84c9ab280454	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7293 f3b2605a-c512-4ea7…	Dec 2 2011
5d94d8642a5f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7292 f3b2605a-c512-4ea7…	Dec 2 2011
9c9282d0242e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7291 f3b2605a-c512-4ea7…	Dec 2 2011
ab6e3568083a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7290 f3b2605a-c512-4ea7…	Dec 2 2011
eca63a1b690a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7289 f3b2605a-c512-4ea7…	Dec 2 2011
6bfa87dcb5c5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7287 f3b2605a-c512-4ea7…	Dec 2 2011
10fe5508e2d2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7286 f3b2605a-c512-4ea7…	Dec 2 2011
111f044b8584	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7285 f3b2605a-c512-4ea7…	Dec 2 2011
d1f2eaeb4d4b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7284 f3b2605a-c512-4ea7…	Dec 2 2011
2728aab0e5e1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7283 f3b2605a-c512-4ea7…	Dec 2 2011
2e2d4c0b8147	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7282 f3b2605a-c512-4ea7…	Dec 2 2011
7837edd51fbf	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7281 f3b2605a-c512-4ea7…	Dec 2 2011
00dc2b891f73	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7280 f3b2605a-c512-4ea7…	Dec 2 2011
4fe24446dec6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7279 f3b2605a-c512-4ea7…	Dec 2 2011
1783b93a0882	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7278 f3b2605a-c512-4ea7…	Dec 2 2011
37d7386667bc	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7277 f3b2605a-c512-4ea7…	Dec 2 2011
24a85166bf11	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7276 f3b2605a-c512-4ea7…	Dec 2 2011
37f098062b8f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7275 f3b2605a-c512-4ea7…	Dec 2 2011
a55728fa7486	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7274 f3b2605a-c512-4ea7…	Dec 2 2011
143aa917f201	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7273 f3b2605a-c512-4ea7…	Dec 2 2011

Changes (28)

				Path
	M			doc/Section_errors.html
	M			doc/Section_start.html
	M			doc/package.html
	M			doc/pair_coul.html
	D			lib/gpu/Makefile.firefly
	D			lib/gpu/Makefile.firefly_opencl
	M			lib/gpu/Makefile.lens
	M			lib/gpu/Nvidia.makefile
	D			lib/gpu/geryon/opencl
	D			lib/gpu/geryon/opencl/CL
	D			lib/gpu/geryon/opencl/CL/cl.h
	D			lib/gpu/geryon/opencl/CL/cl_ext.h
	D			lib/gpu/geryon/opencl/CL/cl_gl.h
	D			lib/gpu/geryon/opencl/CL/cl_gl_ext.h
	D			lib/gpu/geryon/opencl/CL/cl_platform.h
	D			lib/gpu/geryon/opencl/CL/clext.h
	D			lib/gpu/geryon/opencl/CL/opencl.h
	D			lib/gpu/geryon/opencl_1_0
	D			lib/gpu/geryon/opencl_1_0/CL
	D			lib/gpu/geryon/opencl_1_0/CL/cl.h
	D			lib/gpu/geryon/opencl_1_0/CL/cl_ext.h
	D			lib/gpu/geryon/opencl_1_0/CL/cl_gl.h
	D			lib/gpu/geryon/opencl_1_0/CL/cl_platform.h
	D			lib/gpu/geryon/opencl_1_0/CL/clext.h
	D			lib/gpu/replace_code.sh
	M			src/MAKE/Makefile.jaguar
	M			src/verlet.cpp
	M			src/version.h

Merge branch 'master' into openmp-masterca4f23380212Actions

Description

Details

Event Timeline

Merged Changes

Changes (28)

rLAMMPSca4f23380212

doc/Section_errors.html

doc/Section_start.html

doc/package.html

doc/pair_coul.html

lib/gpu/Makefile.firefly

lib/gpu/Makefile.firefly_opencl

lib/gpu/Makefile.lens

lib/gpu/Nvidia.makefile

lib/gpu/geryon/opencl

lib/gpu/geryon/opencl/CL

lib/gpu/geryon/opencl/CL/cl.h

lib/gpu/geryon/opencl/CL/cl_ext.h

lib/gpu/geryon/opencl/CL/cl_gl.h

lib/gpu/geryon/opencl/CL/cl_gl_ext.h

lib/gpu/geryon/opencl/CL/cl_platform.h

lib/gpu/geryon/opencl/CL/clext.h

lib/gpu/geryon/opencl/CL/opencl.h

lib/gpu/geryon/opencl_1_0

lib/gpu/geryon/opencl_1_0/CL

lib/gpu/geryon/opencl_1_0/CL/cl.h

lib/gpu/geryon/opencl_1_0/CL/cl_ext.h

lib/gpu/geryon/opencl_1_0/CL/cl_gl.h

lib/gpu/geryon/opencl_1_0/CL/cl_platform.h

lib/gpu/geryon/opencl_1_0/CL/clext.h

lib/gpu/replace_code.sh

src/MAKE/Makefile.jaguar

src/verlet.cpp

src/version.h

Merge branch 'master' into openmp-master
ca4f23380212
Actions