Diffusion lammps 052a84f81d89

Merge remote branch 'lammps-ro/master' into lammps-icms
052a84f81d89
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Sep 11 2014, 13:44.

Description

Merge remote branch 'lammps-ro/master' into lammps-icms

Resovled Conflicts:
src/lammps.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Sep 11 2014, 13:44

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS90d0ffba1dd2: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12480 f3b2605a-c512-4ea7…
rLAMMPSd76e6e3fa34f: additional bugfix from daniel

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS052a84f81d89: Merge remote branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Sep 11 2014, 13:44

Merged Changes

Commit	Author	Details	Committed
90d0ffba1dd2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12480 f3b2605a-c512-4ea7…	Sep 11 2014
7f8da4e667ec	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12479 f3b2605a-c512-4ea7…	Sep 11 2014
5c05d14e2133	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12478 f3b2605a-c512-4ea7…	Sep 10 2014
502ef1f93143	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12477 f3b2605a-c512-4ea7…	Sep 10 2014
b73b7a82533c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12476 f3b2605a-c512-4ea7…	Sep 10 2014
a266d1b3d05e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12475 f3b2605a-c512-4ea7…	Sep 10 2014
58a11d6bc2eb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12474 f3b2605a-c512-4ea7…	Sep 10 2014
ea0824620568	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12473 f3b2605a-c512-4ea7…	Sep 10 2014
f4421a1cb1b8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12472 f3b2605a-c512-4ea7…	Sep 10 2014
0eb045dc6a13	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12471 f3b2605a-c512-4ea7…	Sep 10 2014
fbad8a44c845	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12470 f3b2605a-c512-4ea7…	Sep 10 2014
8a80ed461256	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12469 f3b2605a-c512-4ea7…	Sep 10 2014
7728d4ecea7a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12468 f3b2605a-c512-4ea7…	Sep 10 2014
2424201d960f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12467 f3b2605a-c512-4ea7…	Sep 10 2014
9d11e531e75d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12466 f3b2605a-c512-4ea7…	Sep 10 2014
1025e266b12a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12465 f3b2605a-c512-4ea7…	Sep 10 2014
e8780fc49d81	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12464 f3b2605a-c512-4ea7…	Sep 10 2014

Changes (43)

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/Section_accelerate.html
	M			doc/Section_accelerate.txt
	M			doc/Section_start.html
	M			doc/Section_start.txt
	A			doc/accelerate_cuda.html
	A			doc/accelerate_cuda.txt
	A			doc/accelerate_gpu.html
	A			doc/accelerate_gpu.txt
	A			doc/accelerate_intel.html
	A			doc/accelerate_intel.txt
	A			doc/accelerate_kokkos.html
	A			doc/accelerate_kokkos.txt
	A			doc/accelerate_omp.html
	A			doc/accelerate_omp.txt
	A			doc/accelerate_opt.html
	A			doc/accelerate_opt.txt
	M			doc/package.html
	M			doc/package.txt
	M			examples/gpu/in.gpu.melt.2.5
	M			examples/gpu/in.gpu.melt.5.0
	M			examples/gpu/in.gpu.phosphate
	M			examples/gpu/in.gpu.rhodo
	M			examples/intel/in.intel.lc
	M			examples/intel/in.intel.rhodo
	M			src/GPU/fix_gpu.cpp
	M			src/KOKKOS/kokkos.cpp
	M			src/USER-CUDA/cuda.cpp
	M			src/USER-CUDA/cuda.h
	M			src/USER-CUDA/domain_cuda.cpp
	M			src/USER-CUDA/fix_shake_cuda.cpp
	M			src/USER-CUDA/pair_lj_charmm_coul_charmm_cuda.cpp
	M			src/USER-CUDA/pair_lj_charmm_coul_charmm_implicit_cuda.cpp
	M			src/USER-CUDA/pair_lj_charmm_coul_long_cuda.cpp
	M			src/USER-CUDA/pair_lj_gromacs_coul_gromacs_cuda.cpp
	M			src/USER-CUDA/pair_lj_gromacs_cuda.cpp
	M			src/USER-CUDA/pair_lj_smooth_cuda.cpp
	M			src/input.cpp
	M			src/lammps.cpp
	M			src/lammps.h
	M			src/modify.cpp
	M			src/neighbor.h