Merge branch 'patch_14_06_2014' into lammps-icms
bcec3c56e45e
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jun 15 2014, 13:25.

Description

Merge branch 'patch_14_06_2014' into lammps-icms

Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
lib/cuda/Makefile.lammps
src/pair.cpp

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jun 15 2014, 13:25

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSbcec3c56e45e: Merge branch 'patch_14_06_2014' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jun 15 2014, 13:25

	Commit			Author	Details	Committed
	598be75009d2			Axel Kohlmeyer	anticipate 14 June 2014 patch	Jun 15 2014

				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
	M			doc/read_data.html
	M			doc/read_data.txt
	M			doc/read_restart.html
	M			doc/read_restart.txt
	M			lib/cuda/Makefile.lammps
	M			lib/gpu/Makefile.linux.mixed
	M			src/KOKKOS/kokkos.cpp
	M			src/KOKKOS/kokkos.h
	M			src/USER-CUDA/comm_cuda.cpp
	M			src/USER-CUDA/pair_gran_hooke_cuda.cpp
	M			src/USER-OMP/fix_omp.cpp
	M			src/accelerator_kokkos.h
	M			src/comm_brick.cpp
	M			src/lammps.cpp
	M			src/pair.cpp
	M			src/read_restart.cpp
	M			src/version.h