Merge branch 'master' into lammps-icms
fa493de199e2
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jan 13 2011, 19:14.

Description

Merge branch 'master' into lammps-icms

Conflicts resolved in following files.
lib/gpu/cmm_cut_gpu.cpp
lib/gpu/cmmc_long_gpu.cpp
lib/gpu/gb_gpu.cpp
lib/gpu/gb_gpu_memory.cpp
lib/gpu/lj96_cut_gpu.cpp
lib/gpu/lj_cut_gpu.cpp
lib/gpu/ljc_cut_gpu.cpp
lib/gpu/ljcl_cut_gpu.cpp
lib/gpu/pair_gpu_balance.h
lib/gpu/pair_gpu_device.cpp
lib/gpu/pair_gpu_device.h
src/GPU/fix_gpu.cpp
tools/restart2data.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jan 13 2011, 19:14

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSa499b28469f3: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5545 f3b2605a-c512-4ea7…
rLAMMPScd9477979f85: Merge branch 'master' into lammps-icms

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSfa493de199e2: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jan 13 2011, 19:14

Merged Changes

Commit	Author	Details	Committed
a499b28469f3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5545 f3b2605a-c512-4ea7…	Jan 12 2011
9e1bc37b778e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5543 f3b2605a-c512-4ea7…	Jan 12 2011
11e80405e13f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5542 f3b2605a-c512-4ea7…	Jan 12 2011
c837659cdb7f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5541 f3b2605a-c512-4ea7…	Jan 12 2011
52e878248216	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5540 f3b2605a-c512-4ea7…	Jan 12 2011
c29290159488	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5539 f3b2605a-c512-4ea7…	Jan 12 2011
2228473d0321	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5538 f3b2605a-c512-4ea7…	Jan 12 2011
8f2257ecbf12	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5537 f3b2605a-c512-4ea7…	Jan 12 2011
9cd3b0f28dc1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5535 f3b2605a-c512-4ea7…	Jan 12 2011

Changes (70)

				Path
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/pair_charmm.html
	M			doc/pair_charmm.txt
	M			doc/pair_coeff.html
	M			doc/pair_coeff.txt
	M			doc/pair_lj.html
	M			doc/pair_lj.txt
	M			doc/pair_style.html
	M			doc/pair_style.txt
	M			lib/gpu/Makefile.fermi
	M			lib/gpu/Makefile.lens
	M			lib/gpu/Makefile.lincoln
	M			lib/gpu/Makefile.linux
	M			lib/gpu/Makefile.linux_opencl
	M			lib/gpu/Makefile.longhorn
	M			lib/gpu/Makefile.mac
	M			lib/gpu/Makefile.mac_opencl
	M			lib/gpu/Nvidia.makefile
	M			lib/gpu/Opencl.makefile
	M			lib/gpu/cmm_cut_gpu.cpp
	M			lib/gpu/cmm_cut_gpu_kernel.cu
	M			lib/gpu/cmmc_long_gpu.cpp
	M			lib/gpu/cmmc_long_gpu_kernel.cu
	P			lib/gpu/crml_gpu.cpp Copied from lib/gpu/ljcl_cut_gpu.cpp
	P			lib/gpu/crml_gpu_kernel.cu Copied from lib/gpu/ljcl_cut_gpu_kernel.cu
	P			lib/gpu/crml_gpu_memory.cpp Copied from lib/gpu/ljcl_cut_gpu_memory.cpp
	P			lib/gpu/crml_gpu_memory.h Copied from lib/gpu/ljcl_cut_gpu_memory.h
	M			lib/gpu/gb_gpu.cpp
	M			lib/gpu/gb_gpu_kernel.cu
	M			lib/gpu/gb_gpu_kernel_lj.cu
	M			lib/gpu/gb_gpu_memory.cpp
	M			lib/gpu/geryon/nvc_device.h
	M			lib/gpu/geryon/nvc_macros.h
	M			lib/gpu/geryon/nvd_device.h
	M			lib/gpu/geryon/nvd_macros.h
	M			lib/gpu/geryon/nvd_memory.h
	M			lib/gpu/geryon/nvd_timer.h
	M			lib/gpu/geryon/ocl_device.h
	M			lib/gpu/geryon/ocl_kernel.h
	M			lib/gpu/geryon/ocl_timer.h
	M			lib/gpu/lj96_cut_gpu.cpp
	M			lib/gpu/lj96_cut_gpu_kernel.cu
	M			lib/gpu/lj_cut_gpu.cpp
	M			lib/gpu/lj_cut_gpu_kernel.cu
	D			lib/gpu/lj_gpu.cu
	M			lib/gpu/ljc_cut_gpu.cpp
	M			lib/gpu/ljc_cut_gpu_kernel.cu
	P			lib/gpu/ljcl_cut_gpu.cpp Copied to lib/gpu/crml_gpu.cpp
	P			lib/gpu/ljcl_cut_gpu_kernel.cu Copied to lib/gpu/crml_gpu_kernel.cu
	M			lib/gpu/pair_gpu_atom.cpp
	M			lib/gpu/pair_gpu_atom.h
	M			lib/gpu/pair_gpu_balance.h
	M			lib/gpu/pair_gpu_device.cpp
	M			lib/gpu/pair_gpu_device.h
	M			lib/gpu/pair_gpu_precision.h
	M			src/GPU/Install.sh
	M			src/GPU/fix_gpu.cpp
	M			src/GPU/pair_cg_cmm_coul_long_gpu.cpp
	M			src/GPU/pair_cg_cmm_gpu.cpp
	M			src/GPU/pair_gayberne_gpu.cpp
	M			src/GPU/pair_lj96_cut_gpu.cpp
	P			src/GPU/pair_lj_charmm_coul_long_gpu.cpp Copied from src/GPU/pair_lj_cut_coul_long_gpu.cpp
	P			src/GPU/pair_lj_charmm_coul_long_gpu.h Copied from src/GPU/pair_lj96_cut_gpu.h
	M			src/GPU/pair_lj_cut_coul_cut_gpu.cpp
	P			src/GPU/pair_lj_cut_coul_long_gpu.cpp Copied to src/GPU/pair_lj_charmm_coul_long_gpu.cpp
	M			src/GPU/pair_lj_cut_gpu.cpp
	M			src/REAX/fix_reax_bonds.h
	M			src/version.h
	M			tools/restart2data.cpp

Merge branch 'master' into lammps-icmsfa493de199e2Actions

Description

Details

Event Timeline

Merged Changes

Changes (70)

rLAMMPSfa493de199e2

doc/Section_commands.html

doc/Section_commands.txt

doc/pair_charmm.html

doc/pair_charmm.txt

doc/pair_coeff.html

doc/pair_coeff.txt

doc/pair_lj.html

doc/pair_lj.txt

doc/pair_style.html

doc/pair_style.txt

lib/gpu/Makefile.fermi

lib/gpu/Makefile.lens

lib/gpu/Makefile.lincoln

lib/gpu/Makefile.linux

lib/gpu/Makefile.linux_opencl

lib/gpu/Makefile.longhorn

lib/gpu/Makefile.mac

lib/gpu/Makefile.mac_opencl

lib/gpu/Nvidia.makefile

lib/gpu/Opencl.makefile

lib/gpu/cmm_cut_gpu.cpp

lib/gpu/cmm_cut_gpu_kernel.cu

lib/gpu/cmmc_long_gpu.cpp

lib/gpu/cmmc_long_gpu_kernel.cu

lib/gpu/crml_gpu.cpp

lib/gpu/crml_gpu_kernel.cu

lib/gpu/crml_gpu_memory.cpp

lib/gpu/crml_gpu_memory.h

lib/gpu/gb_gpu.cpp

lib/gpu/gb_gpu_kernel.cu

lib/gpu/gb_gpu_kernel_lj.cu

lib/gpu/gb_gpu_memory.cpp

lib/gpu/geryon/nvc_device.h

lib/gpu/geryon/nvc_macros.h

lib/gpu/geryon/nvd_device.h

lib/gpu/geryon/nvd_macros.h

lib/gpu/geryon/nvd_memory.h

lib/gpu/geryon/nvd_timer.h

lib/gpu/geryon/ocl_device.h

lib/gpu/geryon/ocl_kernel.h

lib/gpu/geryon/ocl_timer.h

lib/gpu/lj96_cut_gpu.cpp

lib/gpu/lj96_cut_gpu_kernel.cu

lib/gpu/lj_cut_gpu.cpp

lib/gpu/lj_cut_gpu_kernel.cu

lib/gpu/lj_gpu.cu

lib/gpu/ljc_cut_gpu.cpp

lib/gpu/ljc_cut_gpu_kernel.cu

lib/gpu/ljcl_cut_gpu.cpp

lib/gpu/ljcl_cut_gpu_kernel.cu

lib/gpu/pair_gpu_atom.cpp

lib/gpu/pair_gpu_atom.h

lib/gpu/pair_gpu_balance.h

lib/gpu/pair_gpu_device.cpp

lib/gpu/pair_gpu_device.h

lib/gpu/pair_gpu_precision.h

src/GPU/Install.sh

src/GPU/fix_gpu.cpp

src/GPU/pair_cg_cmm_coul_long_gpu.cpp

src/GPU/pair_cg_cmm_gpu.cpp

src/GPU/pair_gayberne_gpu.cpp

src/GPU/pair_lj96_cut_gpu.cpp

src/GPU/pair_lj_charmm_coul_long_gpu.cpp

src/GPU/pair_lj_charmm_coul_long_gpu.h

src/GPU/pair_lj_cut_coul_cut_gpu.cpp

src/GPU/pair_lj_cut_coul_long_gpu.cpp

src/GPU/pair_lj_cut_gpu.cpp

src/REAX/fix_reax_bonds.h

src/version.h

tools/restart2data.cpp

Merge branch 'master' into lammps-icms
fa493de199e2
Actions