Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
8277217db6d2
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Aug 28 2014, 20:46.

Description

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

Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
doc/Section_accelerate.txt
src/KOKKOS/verlet_kokkos.cpp
src/version.h

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Aug 28 2014, 20:46

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSe800337c0ff8: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12377 f3b2605a-c512-4ea7…
rLAMMPS2f27eabe1be7: anticipate changes from patches 27 & 28 Aug 2014

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS8277217db6d2: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Aug 28 2014, 20:46

Merged Changes

Commit	Author	Details	Committed
e800337c0ff8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12377 f3b2605a-c512-4ea7…	Aug 27 2014
ead27110500e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12376 f3b2605a-c512-4ea7…	Aug 27 2014
b2740c77d6ba	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12375 f3b2605a-c512-4ea7…	Aug 27 2014
444053fa6ce2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12374 f3b2605a-c512-4ea7…	Aug 27 2014
dc5ad107ada0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12373 f3b2605a-c512-4ea7…	Aug 27 2014
647087980069	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12372 f3b2605a-c512-4ea7…	Aug 27 2014
6e57c3af07e5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12371 f3b2605a-c512-4ea7…	Aug 27 2014
048a267b9fc9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12370 f3b2605a-c512-4ea7…	Aug 27 2014
222d9ee151b6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12369 f3b2605a-c512-4ea7…	Aug 27 2014
71f5c17f676f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12368 f3b2605a-c512-4ea7…	Aug 27 2014
26fe85211baf	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12367 f3b2605a-c512-4ea7…	Aug 27 2014
7387b0cc62e4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12366 f3b2605a-c512-4ea7…	Aug 27 2014
d9f92faf40f2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12365 f3b2605a-c512-4ea7…	Aug 27 2014
d1e51c4359b3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12364 f3b2605a-c512-4ea7…	Aug 27 2014
b3f5ea4d8350	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12363 f3b2605a-c512-4ea7…	Aug 27 2014
4e82448ef5a0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12360 f3b2605a-c512-4ea7…	Aug 27 2014
6661ee718f31	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12359 f3b2605a-c512-4ea7…	Aug 27 2014
9b5124c54e3a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12358 f3b2605a-c512-4ea7…	Aug 27 2014
845f61931a35	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12356 f3b2605a-c512-4ea7…	Aug 27 2014
d44d13505f09	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12355 f3b2605a-c512-4ea7…	Aug 27 2014
00dab3251768	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12354 f3b2605a-c512-4ea7…	Aug 27 2014
bd0eaad6eca1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12353 f3b2605a-c512-4ea7…	Aug 27 2014

Changes (142)

		Path
M		doc/Manual.html
M		doc/Manual.txt
M		doc/Section_accelerate.html
M		doc/Section_accelerate.txt
M		doc/Section_commands.html
M		doc/Section_commands.txt
M		doc/atom_style.html
M		doc/atom_style.txt
M		doc/fix_langevin.html
M		doc/fix_langevin.txt
M		doc/pair_lj.html
M		doc/pair_lj.txt
M		lib/kokkos/Makefile.lammps
A	(dir)	lib/kokkos/algorithms/
A	(dir)	lib/kokkos/algorithms/src/
A		lib/kokkos/algorithms/src/Kokkos_Random.hpp
M		lib/kokkos/containers/src/Kokkos_Bitset.hpp
M		lib/kokkos/containers/src/Kokkos_DualView.hpp
M		lib/kokkos/containers/src/Kokkos_UnorderedMap.hpp
M		lib/kokkos/containers/src/Kokkos_Vector.hpp
M		lib/kokkos/core/src/Cuda/Kokkos_CudaExec.hpp
M		lib/kokkos/core/src/Cuda/Kokkos_CudaSpace.cu
M		lib/kokkos/core/src/Cuda/Kokkos_Cuda_Impl.cu
M		lib/kokkos/core/src/Cuda/Kokkos_Cuda_Parallel.hpp
M		lib/kokkos/core/src/Cuda/Kokkos_Cuda_ReduceScan.hpp
M		lib/kokkos/core/src/Cuda/Kokkos_Cuda_Vectorization.hpp
M		lib/kokkos/core/src/Cuda/Kokkos_Cuda_View.hpp
M		lib/kokkos/core/src/Cuda/Kokkos_Cuda_abort.hpp
D		lib/kokkos/core/src/KokkosCore_config.h
M		lib/kokkos/core/src/Kokkos_Atomic.hpp
V		lib/kokkos/core/src/{Kokkos_Core.hpp ← Kokkos_ParallelReduce.hpp}
M		lib/kokkos/core/src/Kokkos_Cuda.hpp
M		lib/kokkos/core/src/Kokkos_CudaSpace.hpp
A		lib/kokkos/core/src/Kokkos_ExecPolicy.hpp
M		lib/kokkos/core/src/Kokkos_HostSpace.hpp
M		lib/kokkos/core/src/Kokkos_Layout.hpp
M		lib/kokkos/core/src/Kokkos_Macros.hpp
P		lib/kokkos/core/src/Kokkos_MemoryTraits.hpp Copied to multiple locations: lib/kokkos/core/src/Kokkos_ScratchSpace.hpp lib/kokkos/core/src/impl/Kokkos_Atomic_Assembly_X86.hpp lib/kokkos/core/src/impl/Kokkos_Tags.hpp
M		lib/kokkos/core/src/Kokkos_OpenMP.hpp
M		lib/kokkos/core/src/Kokkos_Parallel.hpp
V		lib/kokkos/core/src/{Kokkos_ParallelReduce.hpp → Kokkos_Core.hpp}
A		lib/kokkos/core/src/Kokkos_Qthread.hpp
P		lib/kokkos/core/src/Kokkos_ScratchSpace.hpp Copied from lib/kokkos/core/src/Kokkos_MemoryTraits.hpp
M		lib/kokkos/core/src/Kokkos_Serial.hpp
A		lib/kokkos/core/src/Kokkos_TaskPolicy.hpp
M		lib/kokkos/core/src/Kokkos_Threads.hpp
M		lib/kokkos/core/src/Kokkos_Vectorization.hpp
M		lib/kokkos/core/src/Kokkos_View.hpp
M		lib/kokkos/core/src/OpenMP/Kokkos_OpenMP_Parallel.hpp
M		lib/kokkos/core/src/OpenMP/Kokkos_OpenMPexec.cpp
M		lib/kokkos/core/src/OpenMP/Kokkos_OpenMPexec.hpp
A	(dir)	lib/kokkos/core/src/Qthread/
A		lib/kokkos/core/src/Qthread/Kokkos_QthreadExec.cpp
A		lib/kokkos/core/src/Qthread/Kokkos_QthreadExec.hpp
A		lib/kokkos/core/src/Qthread/Kokkos_Qthread_Parallel.hpp
A		lib/kokkos/core/src/Qthread/Kokkos_Qthread_TaskPolicy.cpp
A		lib/kokkos/core/src/Qthread/Kokkos_Qthread_TaskPolicy.hpp
M		lib/kokkos/core/src/Threads/Kokkos_ThreadsExec.cpp
M		lib/kokkos/core/src/Threads/Kokkos_ThreadsExec.hpp
M		lib/kokkos/core/src/Threads/Kokkos_ThreadsExec_base.cpp
M		lib/kokkos/core/src/Threads/Kokkos_Threads_Parallel.hpp
P		lib/kokkos/core/src/impl/Kokkos_Atomic_Assembly_X86.hpp Copied from lib/kokkos/core/src/Kokkos_MemoryTraits.hpp
M		lib/kokkos/core/src/impl/Kokkos_Atomic_Exchange.hpp
M		lib/kokkos/core/src/impl/Kokkos_Atomic_Fetch_Add.hpp
M		lib/kokkos/core/src/impl/Kokkos_Atomic_Fetch_And.hpp
M		lib/kokkos/core/src/impl/Kokkos_Atomic_Fetch_Or.hpp
A		lib/kokkos/core/src/impl/Kokkos_Atomic_Generic.hpp
A		lib/kokkos/core/src/impl/Kokkos_Atomic_View.hpp
M		lib/kokkos/core/src/impl/Kokkos_Compiler_Macros.hpp
A		lib/kokkos/core/src/impl/Kokkos_Core.cpp
M		lib/kokkos/core/src/impl/Kokkos_HostSpace.cpp
M		lib/kokkos/core/src/impl/Kokkos_MemoryTracking.hpp
M		lib/kokkos/core/src/impl/Kokkos_Memory_Fence.hpp
M		lib/kokkos/core/src/impl/Kokkos_Serial.cpp
A		lib/kokkos/core/src/impl/Kokkos_Serial_TaskPolicy.cpp
A		lib/kokkos/core/src/impl/Kokkos_Serial_TaskPolicy.hpp
M		lib/kokkos/core/src/impl/Kokkos_Shape.cpp
M		lib/kokkos/core/src/impl/Kokkos_Shape.hpp
P		lib/kokkos/core/src/impl/Kokkos_Tags.hpp Copied from lib/kokkos/core/src/Kokkos_MemoryTraits.hpp
M		lib/kokkos/core/src/impl/Kokkos_Timer.hpp
M		lib/kokkos/core/src/impl/Kokkos_Traits.hpp
M		lib/kokkos/core/src/impl/Kokkos_ViewDefault.hpp
M		lib/kokkos/core/src/impl/Kokkos_ViewOffset.hpp
M		lib/kokkos/core/src/impl/Kokkos_ViewSupport.hpp
M		lib/kokkos/core/src/impl/Kokkos_hwloc.cpp
M		lib/kokkos/core/src/impl/Kokkos_spinwait.cpp
M		lib/kokkos/core/src/impl/Kokkos_spinwait.hpp
M		src/KOKKOS/Install.sh
M		src/KOKKOS/atom_kokkos.cpp
M		src/KOKKOS/atom_kokkos.h
A		src/KOKKOS/atom_vec_angle_kokkos.cpp
A		src/KOKKOS/atom_vec_angle_kokkos.h
P		src/KOKKOS/atom_vec_atomic_kokkos.cpp Copied to multiple locations: src/KOKKOS/atom_vec_bond_kokkos.cpp src/KOKKOS/atom_vec_charge_kokkos.cpp
P		src/KOKKOS/atom_vec_bond_kokkos.cpp Copied from src/KOKKOS/atom_vec_atomic_kokkos.cpp
A		src/KOKKOS/atom_vec_bond_kokkos.h
P		src/KOKKOS/atom_vec_charge_kokkos.cpp Copied from src/KOKKOS/atom_vec_atomic_kokkos.cpp
A		src/KOKKOS/atom_vec_charge_kokkos.h
A		src/KOKKOS/atom_vec_full_kokkos.cpp
A		src/KOKKOS/atom_vec_full_kokkos.h
M		src/KOKKOS/atom_vec_kokkos.h
A		src/KOKKOS/atom_vec_molecular_kokkos.cpp
A		src/KOKKOS/atom_vec_molecular_kokkos.h
M		src/KOKKOS/comm_kokkos.cpp
M		src/KOKKOS/comm_kokkos.h
A		src/KOKKOS/fix_langevin_kokkos.cpp
A		src/KOKKOS/fix_langevin_kokkos.h
M		src/KOKKOS/fix_nve_kokkos.cpp
M		src/KOKKOS/kokkos.cpp
M		src/KOKKOS/kokkos_type.h
M		src/KOKKOS/neigh_full_kokkos.h
M		src/KOKKOS/neigh_list_kokkos.cpp
M		src/KOKKOS/neigh_list_kokkos.h
M		src/KOKKOS/neighbor_kokkos.cpp
M		src/KOKKOS/neighbor_kokkos.h
P		src/KOKKOS/pair_coul_cut_kokkos.cpp Copied from src/KOKKOS/pair_lj_cut_kokkos.cpp
A		src/KOKKOS/pair_coul_cut_kokkos.h
M		src/KOKKOS/pair_kokkos.h
P		src/KOKKOS/pair_lj_cut_coul_cut_kokkos.cpp Copied from src/KOKKOS/pair_lj_cut_kokkos.cpp
A		src/KOKKOS/pair_lj_cut_coul_cut_kokkos.h
A		src/KOKKOS/pair_lj_cut_coul_long_kokkos.cpp
A		src/KOKKOS/pair_lj_cut_coul_long_kokkos.h
P		src/KOKKOS/pair_lj_cut_kokkos.cpp Copied to multiple locations: src/KOKKOS/pair_coul_cut_kokkos.cpp src/KOKKOS/pair_lj_cut_coul_cut_kokkos.cpp
M		src/KOKKOS/pair_lj_cut_kokkos.h
M		src/KOKKOS/pair_table_kokkos.cpp
M		src/KOKKOS/pair_table_kokkos.h
M		src/KOKKOS/verlet_kokkos.cpp
M		src/angle.cpp
M		src/angle.h
M		src/atom.cpp
M		src/bond.cpp
M		src/bond.h
M		src/dihedral.cpp
M		src/dihedral.h
M		src/fix_langevin.cpp
M		src/fix_langevin.h
M		src/improper.cpp
M		src/improper.h
M		src/kspace.cpp
M		src/kspace.h
M		src/memory.h
M		src/pair.cpp
M		src/version.h