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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Mar 25 2015, 11:26.

Description

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

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Mar 25 2015, 11:26

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
1d7421d4122c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13284 f3b2605a-c512-4ea7…	Mar 24 2015
69841d9e85f0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13283 f3b2605a-c512-4ea7…	Mar 24 2015
25b928b2762a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@13282 f3b2605a-c512-4ea7…	Mar 24 2015

				Path
	M			src/DIPOLE/pair_lj_long_dipole_long.cpp
	M			src/DIPOLE/pair_lj_long_dipole_long.h
	M			src/GPU/pair_lj_sf_dipole_sf_gpu.h
	M			src/KOKKOS/bond_fene_kokkos.h
	M			src/KOKKOS/dihedral_charmm_kokkos.h
	M			src/KOKKOS/dihedral_opls_kokkos.h
	M			src/KOKKOS/improper_harmonic_kokkos.h
	M			src/KOKKOS/neigh_bond_kokkos.cpp
	M			src/KOKKOS/neigh_bond_kokkos.h
	M			src/KOKKOS/neighbor_kokkos.h
	M			src/KOKKOS/pair_lj_cut_coul_long_kokkos.h
	M			src/MC/fix_gcmc.h
	M			src/PYTHON/python.cpp
	M			src/QEQ/fix_qeq_point.h
	M			src/QEQ/fix_qeq_shielded.h
	M			src/QEQ/fix_qeq_slater.h
	M			src/RIGID/fix_rattle.cpp
	M			src/RIGID/fix_rattle.h
	M			src/RIGID/fix_rigid_npt_small.h
	M			src/SRD/fix_srd.cpp
	M			src/USER-MISC/fix_ave_spatial_sphere.cpp
	M			src/USER-MISC/fix_ave_spatial_sphere.h
	M			src/XTC/dump_xtc.h
	M			src/fix.h
	M			src/fix_ave_atom.cpp
	M			src/fix_ave_atom.h
	M			src/fix_ave_chunk.cpp
	M			src/fix_ave_chunk.h
	M			src/fix_ave_correlate.cpp
	M			src/fix_ave_correlate.h
	M			src/fix_ave_histo.cpp
	M			src/fix_ave_histo.h
	M			src/fix_ave_spatial.cpp
	M			src/fix_ave_spatial.h
	M			src/fix_ave_time.cpp
	M			src/fix_ave_time.h
	M			src/pair.cpp
	M			src/pair.h
	M			src/update.cpp