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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jul 2 2015, 14:34.

Description

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

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jul 2 2015, 14:34

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
38af3b0ffb75	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13508 f3b2605a-c512-4ea7…	Jul 2 2015
5db1b37955a6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13507 f3b2605a-c512-4ea7…	Jul 2 2015
ade2dca6af71	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13506 f3b2605a-c512-4ea7…	Jul 2 2015
7579964db779	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13505 f3b2605a-c512-4ea7…	Jul 2 2015
b3242e1962d9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13504 f3b2605a-c512-4ea7…	Jul 2 2015
7abe03a595fb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13503 f3b2605a-c512-4ea7…	Jul 2 2015
90d0dd27d288	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13502 f3b2605a-c512-4ea7…	Jul 2 2015
65f55e702397	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13501 f3b2605a-c512-4ea7…	Jul 2 2015
a67cb068562f	stamoor	Fixing small Kokkos bug	Jul 1 2015
2b605e29db7b	athomps	Describes new QUIP directory structure	Jul 1 2015
fe0bf706ece1	stamoor	Small bug fix for Kokkos charmm pair styles	Jul 1 2015
afd2f6bde817	stamoor	Fixing small bug in run-style verlet split	Jul 1 2015
721b312498d6	stamoor	Fixing small bug in Kokkos pair styles with long-range Coulombics	Jul 1 2015

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/pair_kim.html
	M			doc/pair_kim.txt
	V			examples/kim/{log.kim.lj.27Jul14.ubuntu.1 → log.kim.lj.28jun15.ubuntu.1}
	V			examples/kim/{log.kim.lj.27Jul14.ubuntu.4 → log.kim.lj.28jun15.ubuntu.4}
	V			examples/kim/{log.kim.lj.28jun15.ubuntu.1 ← log.kim.lj.27Jul14.ubuntu.1}
	V			examples/kim/{log.kim.lj.28jun15.ubuntu.4 ← log.kim.lj.27Jul14.ubuntu.4}
	V			examples/kim/{log.kim.lj.lmp.27Jul14.ubuntu.1 → log.kim.lj.lmp.28jun15.ubuntu.1}
	V			examples/kim/{log.kim.lj.lmp.27Jul14.ubuntu.4 → log.kim.lj.lmp.28jun15.ubuntu.4}
	V			examples/kim/{log.kim.lj.lmp.28jun15.ubuntu.1 ← log.kim.lj.lmp.27Jul14.ubuntu.1}
	V			examples/kim/{log.kim.lj.lmp.28jun15.ubuntu.4 ← log.kim.lj.lmp.27Jul14.ubuntu.4}
	M			lib/kim/Makefile.lammps
	M			lib/kim/README
	A			lib/kim/pair-kim.release.info
	M			lib/quip/README
	M			src/KIM/README
	M			src/KIM/pair_kim.cpp
	M			src/KIM/pair_kim.h
	M			src/KOKKOS/improper_harmonic_kokkos.h
	M			src/KOKKOS/pair_buck_coul_long_kokkos.cpp
	M			src/KOKKOS/pair_coul_long_kokkos.cpp
	M			src/KOKKOS/pair_lj_charmm_coul_charmm_implicit_kokkos.cpp
	M			src/KOKKOS/pair_lj_charmm_coul_charmm_kokkos.cpp
	M			src/KOKKOS/pair_lj_charmm_coul_long_kokkos.cpp
	M			src/KOKKOS/pair_lj_class2_coul_long_kokkos.cpp
	M			src/KOKKOS/pair_lj_cut_coul_long_kokkos.cpp
	M			src/REPLICA/verlet_split.cpp
	M			src/version.h