Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps…
9156ba4d57c2
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Apr 1 2015, 14:28.

Description

Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps-icms

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Apr 1 2015, 14:28

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
3895c409e772	Axel Kohlmeyer	reduce warnings from KOKKOS and fix compatibility issue KOKKOS/USER-CUDA	Mar 31 2015
e4a631c08454	Axel Kohlmeyer	compilation fixes to correct inconsistent changes in the git repo	Mar 31 2015
6bfac86da34f	Axel Kohlmeyer	Merge remote-tracking branch 'lammps-ro/master' into lammps-icms	Mar 31 2015

				Path
	M			src/KOKKOS/kokkos.cpp
	M			src/KOKKOS/kokkos_type.h
	M			src/KOKKOS/neigh_list_kokkos.h
	M			src/KOKKOS/neighbor_kokkos.cpp
	M			src/USER-CUDA/pppm_cuda.cpp
	M			src/USER-EFF/compute_temp_eff.cpp
	M			src/USER-MISC/compute_temp_rotate.cpp
	M			src/USER-REAXC/fix_reaxc_species.cpp