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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Feb 5 2015, 16:36.

Description

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

Resolved Conflicts:
doc/Manual.html
doc/Manual.txt

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Feb 5 2015, 16:36

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS6c48e6f6d599: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13062 f3b2605a-c512-4ea7…
rLAMMPS31b8f8606c4f: update for OpenSuSE 13.2

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS4fdb97ee480f: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Feb 5 2015, 16:36

Merged Changes

Commit	Author	Details	Committed
6c48e6f6d599	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13062 f3b2605a-c512-4ea7…	Feb 4 2015
5f0be8b74a77	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13061 f3b2605a-c512-4ea7…	Feb 4 2015
88cd36c8a2f6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13060 f3b2605a-c512-4ea7…	Feb 4 2015
2b80ac3d86a5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13059 f3b2605a-c512-4ea7…	Feb 4 2015
0ed5c699cc51	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13058 f3b2605a-c512-4ea7…	Feb 4 2015
a2aa6c5be0d5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13057 f3b2605a-c512-4ea7…	Feb 4 2015
7e20001bcacb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13056 f3b2605a-c512-4ea7…	Feb 4 2015
1f77a147c342	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13055 f3b2605a-c512-4ea7…	Feb 4 2015
f3cf3cf588bc	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13054 f3b2605a-c512-4ea7…	Feb 4 2015
9c5fdbc81ac3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13053 f3b2605a-c512-4ea7…	Feb 4 2015
dee608a73a0c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13051 f3b2605a-c512-4ea7…	Feb 4 2015
ada635543f79	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13050 f3b2605a-c512-4ea7…	Feb 4 2015
da11db261f6b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13049 f3b2605a-c512-4ea7…	Feb 4 2015
bd600792ac56	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13046 f3b2605a-c512-4ea7…	Feb 4 2015
48f4fac6bacc	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13045 f3b2605a-c512-4ea7…	Feb 4 2015
6140416eba70	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13043 f3b2605a-c512-4ea7…	Feb 4 2015
0a2d3e80fbf4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13042 f3b2605a-c512-4ea7…	Feb 4 2015
9c4164eb1b48	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13041 f3b2605a-c512-4ea7…	Feb 4 2015
25e63c7a0894	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13037 f3b2605a-c512-4ea7…	Feb 4 2015
8c01327158f9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13036 f3b2605a-c512-4ea7…	Feb 4 2015
8f2c7cac4b18	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13035 f3b2605a-c512-4ea7…	Feb 4 2015
0f4f19220c6b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13034 f3b2605a-c512-4ea7…	Feb 4 2015
a695874c7ff0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13032 f3b2605a-c512-4ea7…	Feb 4 2015
75d4c092bb55	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13031 f3b2605a-c512-4ea7…	Feb 4 2015
f8254f5ae18c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13030 f3b2605a-c512-4ea7…	Feb 4 2015
616ec749a4ef	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13029 f3b2605a-c512-4ea7…	Feb 4 2015
f27d8d89e0d9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13025 f3b2605a-c512-4ea7…	Feb 4 2015

Changes (234)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
A		doc/Eqs/fix_ttm_blast.jpg
A		doc/Eqs/fix_ttm_blast.tex
A		doc/Eqs/fix_ttm_blast1.jpg
A		doc/Eqs/fix_ttm_blast1.tex
A		doc/Eqs/fix_ttm_ce.jpg
A		doc/Eqs/fix_ttm_ce.tex
A		doc/Eqs/fix_ttm_mod.jpg
A		doc/Eqs/fix_ttm_mod.tex
M		doc/Manual.html
M		doc/Manual.txt
M		doc/Section_commands.html
M		doc/Section_commands.txt
M		doc/Section_intro.html
M		doc/Section_intro.txt
M		doc/accelerate_kokkos.html
M		doc/accelerate_kokkos.txt
M		doc/compute_pressure.html
M		doc/compute_pressure.txt
M		doc/compute_stress_atom.html
M		doc/compute_stress_atom.txt
M		doc/fix_langevin.html
M		doc/fix_langevin.txt
A		doc/fix_tfmc.html
A		doc/fix_tfmc.txt
M		doc/fix_ttm.html
M		doc/fix_ttm.txt
M		doc/pair_buck.html
M		doc/pair_buck.txt
M		doc/pair_coul.html
M		doc/pair_coul.txt
M		doc/pair_eam.html
M		doc/pair_eam.txt
M		lib/kokkos/Makefile.lammps
M		lib/kokkos/README
A		lib/kokkos/TPL/KokkosTPL_dummy.cpp
A	(dir)	lib/kokkos/TPL/cmake/
A		lib/kokkos/TPL/cmake/Dependencies.cmake
M		lib/kokkos/TPL/cub/block/block_discontinuity.cuh
M		lib/kokkos/TPL/cub/block/block_exchange.cuh
M		lib/kokkos/TPL/cub/block/block_histogram.cuh
M		lib/kokkos/TPL/cub/block/block_load.cuh
M		lib/kokkos/TPL/cub/block/block_radix_rank.cuh
M		lib/kokkos/TPL/cub/block/block_radix_sort.cuh
M		lib/kokkos/TPL/cub/block/block_raking_layout.cuh
M		lib/kokkos/TPL/cub/block/block_reduce.cuh
M		lib/kokkos/TPL/cub/block/block_scan.cuh
M		lib/kokkos/TPL/cub/block/block_store.cuh
M		lib/kokkos/TPL/cub/block/specializations/block_histogram_atomic.cuh
M		lib/kokkos/TPL/cub/block/specializations/block_histogram_sort.cuh
M		lib/kokkos/TPL/cub/block/specializations/block_reduce_raking.cuh
M		lib/kokkos/TPL/cub/block/specializations/block_reduce_warp_reductions.cuh
M		lib/kokkos/TPL/cub/block/specializations/block_scan_raking.cuh
M		lib/kokkos/TPL/cub/block/specializations/block_scan_warp_scans.cuh
M		lib/kokkos/TPL/cub/cub.cuh
M		lib/kokkos/TPL/cub/device/block/block_histo_tiles.cuh
M		lib/kokkos/TPL/cub/device/block/block_partition_tiles.cuh
M		lib/kokkos/TPL/cub/device/block/block_radix_sort_downsweep_tiles.cuh
M		lib/kokkos/TPL/cub/device/block/block_radix_sort_upsweep_tiles.cuh
M		lib/kokkos/TPL/cub/device/block/block_reduce_by_key_tiles.cuh
M		lib/kokkos/TPL/cub/device/block/block_reduce_tiles.cuh
M		lib/kokkos/TPL/cub/device/block/block_scan_tiles.cuh
M		lib/kokkos/TPL/cub/device/block/scan_tiles_types.cuh
M		lib/kokkos/TPL/cub/device/block/specializations/block_histo_tiles_gatomic.cuh
M		lib/kokkos/TPL/cub/device/block/specializations/block_histo_tiles_satomic.cuh
M		lib/kokkos/TPL/cub/device/block/specializations/block_histo_tiles_sort.cuh
M		lib/kokkos/TPL/cub/device/device_histogram.cuh
M		lib/kokkos/TPL/cub/device/device_radix_sort.cuh
M		lib/kokkos/TPL/cub/device/device_reduce.cuh
M		lib/kokkos/TPL/cub/device/device_reduce_by_key.cuh
M		lib/kokkos/TPL/cub/device/device_reorder.cuh
M		lib/kokkos/TPL/cub/device/device_scan.cuh
M		lib/kokkos/TPL/cub/grid/grid_barrier.cuh
M		lib/kokkos/TPL/cub/grid/grid_even_share.cuh
M		lib/kokkos/TPL/cub/grid/grid_mapping.cuh
M		lib/kokkos/TPL/cub/grid/grid_queue.cuh
M		lib/kokkos/TPL/cub/host/spinlock.cuh
M		lib/kokkos/TPL/cub/thread/thread_load.cuh
M		lib/kokkos/TPL/cub/thread/thread_operators.cuh
M		lib/kokkos/TPL/cub/thread/thread_reduce.cuh
M		lib/kokkos/TPL/cub/thread/thread_scan.cuh
M		lib/kokkos/TPL/cub/thread/thread_store.cuh
M		lib/kokkos/TPL/cub/util_allocator.cuh
M		lib/kokkos/TPL/cub/util_arch.cuh
M		lib/kokkos/TPL/cub/util_debug.cuh
M		lib/kokkos/TPL/cub/util_device.cuh
M		lib/kokkos/TPL/cub/util_iterator.cuh
M		lib/kokkos/TPL/cub/util_macro.cuh
M		lib/kokkos/TPL/cub/util_namespace.cuh
M		lib/kokkos/TPL/cub/util_ptx.cuh
M		lib/kokkos/TPL/cub/util_type.cuh
M		lib/kokkos/TPL/cub/util_vector.cuh
M		lib/kokkos/TPL/cub/warp/specializations/warp_reduce_shfl.cuh
M		lib/kokkos/TPL/cub/warp/specializations/warp_reduce_smem.cuh
M		lib/kokkos/TPL/cub/warp/specializations/warp_scan_shfl.cuh
M		lib/kokkos/TPL/cub/warp/specializations/warp_scan_smem.cuh
M		lib/kokkos/TPL/cub/warp/warp_reduce.cuh
M		lib/kokkos/TPL/cub/warp/warp_scan.cuh
M		lib/kokkos/algorithms/src/Kokkos_Random.hpp
A		lib/kokkos/algorithms/src/Kokkos_Sort.hpp
M		lib/kokkos/containers/src/Kokkos_Bitset.hpp
M		lib/kokkos/containers/src/Kokkos_DualView.hpp
M		lib/kokkos/containers/src/Kokkos_Functional.hpp
A		lib/kokkos/containers/src/Kokkos_SegmentedView.hpp
M		lib/kokkos/containers/src/Kokkos_StaticCrsGraph.hpp
M		lib/kokkos/containers/src/Kokkos_UnorderedMap.hpp
M		lib/kokkos/containers/src/Kokkos_Vector.hpp
M		lib/kokkos/containers/src/impl/Kokkos_Bitset_impl.hpp
M		lib/kokkos/containers/src/impl/Kokkos_Functional_impl.hpp
M		lib/kokkos/containers/src/impl/Kokkos_StaticCrsGraph_factory.hpp
M		lib/kokkos/containers/src/impl/Kokkos_UnorderedMap_impl.cpp
M		lib/kokkos/containers/src/impl/Kokkos_UnorderedMap_impl.hpp
M		lib/kokkos/core/src/Cuda/Kokkos_CudaExec.hpp
A		lib/kokkos/core/src/Cuda/Kokkos_CudaSpace.cpp
D		lib/kokkos/core/src/Cuda/Kokkos_CudaSpace.cu
V		lib/kokkos/core/src/Cuda/{Kokkos_Cuda_Impl.cpp ← Kokkos_Cuda_Impl.cu}
V		lib/kokkos/core/src/Cuda/{Kokkos_Cuda_Impl.cu → Kokkos_Cuda_Impl.cpp}
M		lib/kokkos/core/src/Cuda/Kokkos_Cuda_Internal.hpp
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
M		lib/kokkos/core/src/Kokkos_Atomic.hpp
M		lib/kokkos/core/src/Kokkos_Core.hpp
P		lib/kokkos/core/src/Kokkos_Core_fwd.hpp Copied from lib/kokkos/core/src/Kokkos_Macros.hpp
M		lib/kokkos/core/src/Kokkos_CrsArray.hpp
M		lib/kokkos/core/src/Kokkos_Cuda.hpp
M		lib/kokkos/core/src/Kokkos_CudaSpace.hpp
M		lib/kokkos/core/src/Kokkos_CudaTypes.hpp
M		lib/kokkos/core/src/Kokkos_ExecPolicy.hpp
M		lib/kokkos/core/src/Kokkos_HostSpace.hpp
M		lib/kokkos/core/src/Kokkos_Layout.hpp
P		lib/kokkos/core/src/Kokkos_Macros.hpp Copied to lib/kokkos/core/src/Kokkos_Core_fwd.hpp
M		lib/kokkos/core/src/Kokkos_MemoryTraits.hpp
M		lib/kokkos/core/src/Kokkos_OpenMP.hpp
M		lib/kokkos/core/src/Kokkos_Pair.hpp
M		lib/kokkos/core/src/Kokkos_Parallel.hpp
M		lib/kokkos/core/src/Kokkos_Qthread.hpp
M		lib/kokkos/core/src/Kokkos_ScratchSpace.hpp
M		lib/kokkos/core/src/Kokkos_Serial.hpp
M		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/Kokkos_hwloc.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
M		lib/kokkos/core/src/Qthread/Kokkos_QthreadExec.cpp
M		lib/kokkos/core/src/Qthread/Kokkos_QthreadExec.hpp
M		lib/kokkos/core/src/Qthread/Kokkos_Qthread_Parallel.hpp
M		lib/kokkos/core/src/Qthread/Kokkos_Qthread_TaskPolicy.cpp
M		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
A		lib/kokkos/core/src/build.cuda.mac
A		lib/kokkos/core/src/build_common.sh
M		lib/kokkos/core/src/impl/Kokkos_AnalyzeShape.hpp
M		lib/kokkos/core/src/impl/Kokkos_Atomic_Assembly_X86.hpp
M		lib/kokkos/core/src/impl/Kokkos_Atomic_Compare_Exchange_Strong.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
M		lib/kokkos/core/src/impl/Kokkos_Atomic_Generic.hpp
M		lib/kokkos/core/src/impl/Kokkos_Atomic_View.hpp
V		lib/kokkos/core/src/impl/Kokkos_Compiler_Macros.hpp
M		lib/kokkos/core/src/impl/Kokkos_Core.cpp
M		lib/kokkos/core/src/impl/Kokkos_CrsArray_factory.hpp
M		lib/kokkos/core/src/impl/Kokkos_Error.cpp
M		lib/kokkos/core/src/impl/Kokkos_Error.hpp
A		lib/kokkos/core/src/impl/Kokkos_FunctorAdapter.hpp
M		lib/kokkos/core/src/impl/Kokkos_HostSpace.cpp
D		lib/kokkos/core/src/impl/Kokkos_MemoryTracking.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_PhysicalLayout.hpp
M		lib/kokkos/core/src/impl/Kokkos_Serial.cpp
M		lib/kokkos/core/src/impl/Kokkos_Serial_TaskPolicy.cpp
M		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
M		lib/kokkos/core/src/impl/Kokkos_StaticAssert.hpp
M		lib/kokkos/core/src/impl/Kokkos_Tags.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_ViewTileLeft.hpp
M		lib/kokkos/core/src/impl/Kokkos_Volatile_Load.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
M		src/KOKKOS/comm_kokkos.cpp
M		src/KOKKOS/comm_kokkos.h
M		src/KOKKOS/fix_langevin_kokkos.h
M		src/KOKKOS/kokkos.cpp
M		src/KOKKOS/kokkos_type.h
M		src/KOKKOS/memory_kokkos.h
M		src/KOKKOS/neighbor_kokkos.h
A		src/KOKKOS/pair_buck_kokkos.cpp
A		src/KOKKOS/pair_buck_kokkos.h
A		src/KOKKOS/pair_coul_dsf_kokkos.cpp
A		src/KOKKOS/pair_coul_dsf_kokkos.h
A		src/KOKKOS/pair_coul_wolf_kokkos.cpp
A		src/KOKKOS/pair_coul_wolf_kokkos.h
A		src/KOKKOS/pair_eam_kokkos.cpp
A		src/KOKKOS/pair_eam_kokkos.h
M		src/KOKKOS/pair_kokkos.h
M		src/MANYBODY/pair_eam.cpp
M		src/MANYBODY/pair_eam.h
A		src/MC/fix_tfmc.cpp
A		src/MC/fix_tfmc.h
M		src/USER-MISC/README
A		src/USER-MISC/fix_ttm_mod.cpp
A		src/USER-MISC/fix_ttm_mod.h
M		src/accelerator_kokkos.h
M		src/fix.cpp
M		src/fix.h
M		src/fix_shear_history.cpp
M		src/pair.cpp
M		src/pair.h
M		src/pair_buck.cpp
M		src/pair_buck.h
M		src/pair_coul_dsf.cpp
M		src/pair_coul_wolf.cpp
M		src/read_data.cpp
M		src/version.h