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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jan 27 2014, 03:35.

Description

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

Resolved Conflicts:
doc/Manual.txt
src/RIGID/fix_shake.cpp
src/variable.cpp
src/write_data.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jan 27 2014, 03:35

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS806a382bd096: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11339 f3b2605a-c512-4ea7…
rLAMMPSe126d82aaabf: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS39b159777882: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jan 27 2014, 03:35

Merged Changes

Commit	Author	Details	Committed
806a382bd096	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11339 f3b2605a-c512-4ea7…	Jan 26 2014
10064ce60345	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11337 f3b2605a-c512-4ea7…	Jan 26 2014
861b7fdd7f6b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11336 f3b2605a-c512-4ea7…	Jan 26 2014
28194a14eb82	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11335 f3b2605a-c512-4ea7…	Jan 26 2014
dc585528b200	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11334 f3b2605a-c512-4ea7…	Jan 26 2014
af931f23d0c0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11332 f3b2605a-c512-4ea7…	Jan 26 2014
90b672593dee	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11331 f3b2605a-c512-4ea7…	Jan 26 2014
69f4457f6561	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11330 f3b2605a-c512-4ea7…	Jan 26 2014
eec46d66ec98	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11329 f3b2605a-c512-4ea7…	Jan 26 2014
0ce16af78b12	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11328 f3b2605a-c512-4ea7…	Jan 25 2014
2f6a46a2bef2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11326 f3b2605a-c512-4ea7…	Jan 25 2014
158661bbe4b2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11325 f3b2605a-c512-4ea7…	Jan 25 2014
948c4145b90c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11324 f3b2605a-c512-4ea7…	Jan 25 2014
8ef19992c26b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11323 f3b2605a-c512-4ea7…	Jan 25 2014

Changes (171)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/atom_style.html
	M			doc/atom_style.txt
	M			doc/molecule.html
	M			doc/molecule.txt
	M			doc/read_data.html
	M			doc/read_data.txt
	M			lib/gpu/Makefile.linux
	M			lib/gpu/Makefile.linux_opencl
	M			lib/gpu/README
	M			lib/gpu/lal_atom.h
	M			lib/gpu/lal_base_atomic.cpp
	M			lib/gpu/lal_base_atomic.h
	M			lib/gpu/lal_base_charge.cpp
	M			lib/gpu/lal_base_charge.h
	M			lib/gpu/lal_base_dipole.cpp
	M			lib/gpu/lal_base_dipole.h
	M			lib/gpu/lal_base_ellipsoid.cpp
	M			lib/gpu/lal_base_ellipsoid.h
	M			lib/gpu/lal_base_three.cpp
	M			lib/gpu/lal_base_three.h
	M			lib/gpu/lal_beck_ext.cpp
	M			lib/gpu/lal_born_coul_long_ext.cpp
	M			lib/gpu/lal_born_coul_wolf_ext.cpp
	M			lib/gpu/lal_born_ext.cpp
	M			lib/gpu/lal_buck_coul_ext.cpp
	M			lib/gpu/lal_buck_coul_long_ext.cpp
	M			lib/gpu/lal_buck_ext.cpp
	M			lib/gpu/lal_cg_cmm_ext.cpp
	M			lib/gpu/lal_cg_cmm_long_ext.cpp
	M			lib/gpu/lal_charmm_long_ext.cpp
	M			lib/gpu/lal_colloid_ext.cpp
	M			lib/gpu/lal_coul_dsf_ext.cpp
	M			lib/gpu/lal_coul_long_ext.cpp
	M			lib/gpu/lal_device.cpp
	M			lib/gpu/lal_dipole_lj_ext.cpp
	M			lib/gpu/lal_dipole_lj_sf_ext.cpp
	M			lib/gpu/lal_eam.cpp
	M			lib/gpu/lal_eam.h
	M			lib/gpu/lal_eam_ext.cpp
	M			lib/gpu/lal_gauss_ext.cpp
	M			lib/gpu/lal_gayberne_ext.cpp
	M			lib/gpu/lal_lj96_ext.cpp
	M			lib/gpu/lal_lj_class2_long_ext.cpp
	M			lib/gpu/lal_lj_coul_debye_ext.cpp
	M			lib/gpu/lal_lj_coul_ext.cpp
	M			lib/gpu/lal_lj_coul_long_ext.cpp
	M			lib/gpu/lal_lj_coul_msm_ext.cpp
	M			lib/gpu/lal_lj_dsf_ext.cpp
	M			lib/gpu/lal_lj_expand_ext.cpp
	M			lib/gpu/lal_lj_ext.cpp
	M			lib/gpu/lal_lj_gromacs_ext.cpp
	M			lib/gpu/lal_mie_ext.cpp
	M			lib/gpu/lal_morse_ext.cpp
	M			lib/gpu/lal_neighbor.cpp
	M			lib/gpu/lal_neighbor.h
	M			lib/gpu/lal_neighbor_gpu.cu
	M			lib/gpu/lal_precision.h
	M			lib/gpu/lal_preprocessor.h
	M			lib/gpu/lal_re_squared_ext.cpp
	M			lib/gpu/lal_soft_ext.cpp
	M			lib/gpu/lal_sw.cu
	M			lib/gpu/lal_sw_ext.cpp
	M			lib/gpu/lal_table_ext.cpp
	M			lib/gpu/lal_yukawa_colloid.cpp
	M			lib/gpu/lal_yukawa_colloid.h
	M			lib/gpu/lal_yukawa_colloid_ext.cpp
	M			lib/gpu/lal_yukawa_ext.cpp
	M			src/GPU/fix_gpu.cpp
	M			src/GPU/pair_beck_gpu.cpp
	M			src/GPU/pair_born_coul_long_gpu.cpp
	M			src/GPU/pair_born_coul_wolf_gpu.cpp
	M			src/GPU/pair_born_gpu.cpp
	M			src/GPU/pair_buck_coul_cut_gpu.cpp
	M			src/GPU/pair_buck_coul_long_gpu.cpp
	M			src/GPU/pair_buck_gpu.cpp
	M			src/GPU/pair_colloid_gpu.cpp
	M			src/GPU/pair_coul_dsf_gpu.cpp
	M			src/GPU/pair_coul_long_gpu.cpp
	M			src/GPU/pair_eam_gpu.cpp
	M			src/GPU/pair_gauss_gpu.cpp
	M			src/GPU/pair_gayberne_gpu.cpp
	M			src/GPU/pair_lj96_cut_gpu.cpp
	M			src/GPU/pair_lj_charmm_coul_long_gpu.cpp
	M			src/GPU/pair_lj_class2_coul_long_gpu.cpp
	M			src/GPU/pair_lj_class2_gpu.cpp
	M			src/GPU/pair_lj_cut_coul_cut_gpu.cpp
	M			src/GPU/pair_lj_cut_coul_debye_gpu.cpp
	M			src/GPU/pair_lj_cut_coul_dsf_gpu.cpp
	M			src/GPU/pair_lj_cut_coul_long_gpu.cpp
	M			src/GPU/pair_lj_cut_coul_msm_gpu.cpp
	M			src/GPU/pair_lj_cut_dipole_cut_gpu.cpp
	M			src/GPU/pair_lj_cut_gpu.cpp
	M			src/GPU/pair_lj_expand_gpu.cpp
	M			src/GPU/pair_lj_gromacs_gpu.cpp
	M			src/GPU/pair_lj_sdk_coul_long_gpu.cpp
	M			src/GPU/pair_lj_sdk_gpu.cpp
	M			src/GPU/pair_lj_sf_dipole_sf_gpu.cpp
	M			src/GPU/pair_mie_cut_gpu.cpp
	M			src/GPU/pair_morse_gpu.cpp
	M			src/GPU/pair_resquared_gpu.cpp
	M			src/GPU/pair_soft_gpu.cpp
	M			src/GPU/pair_sw_gpu.cpp
	M			src/GPU/pair_table_gpu.cpp
	M			src/GPU/pair_yukawa_colloid_gpu.cpp
	M			src/GPU/pair_yukawa_gpu.cpp
	M			src/GRANULAR/fix_pour.cpp
	M			src/MC/fix_bond_break.cpp
	M			src/MC/fix_bond_create.cpp
	M			src/MC/fix_bond_swap.cpp
	M			src/MC/fix_gcmc.cpp
	M			src/MISC/fix_deposit.cpp
	M			src/MISC/fix_evaporate.cpp
	P			src/MOLECULE/atom_vec_template.cpp Copied from src/atom_vec_hybrid.cpp
	A			src/MOLECULE/atom_vec_template.h
	M			src/MOLECULE/bond_quartic.cpp
	M			src/MOLECULE/pair_hbond_dreiding_lj.cpp
	M			src/MOLECULE/pair_hbond_dreiding_morse.cpp
	M			src/MPIIO/dump_atom_mpiio.cpp
	M			src/MPIIO/dump_atom_mpiio.h
	M			src/MPIIO/dump_custom_mpiio.cpp
	M			src/MPIIO/dump_custom_mpiio.h
	M			src/MPIIO/dump_xyz_mpiio.cpp
	M			src/MPIIO/dump_xyz_mpiio.h
	M			src/MPIIO/restart_mpiio.cpp
	M			src/MPIIO/restart_mpiio.h
	M			src/RIGID/fix_shake.cpp
	M			src/RIGID/fix_shake.h
	M			src/SRD/fix_srd.cpp
	M			src/SRD/fix_srd.h
	M			src/atom.cpp
	M			src/atom.h
	M			src/atom_vec.cpp
	M			src/atom_vec.h
	M			src/atom_vec_body.cpp
	M			src/atom_vec_body.h
	P			src/atom_vec_hybrid.cpp Copied to src/MOLECULE/atom_vec_template.cpp
	M			src/atom_vec_hybrid.h
	M			src/compute_angle_local.cpp
	M			src/compute_bond_local.cpp
	M			src/compute_dihedral_local.cpp
	M			src/compute_improper_local.cpp
	M			src/compute_property_local.cpp
	M			src/create_atoms.cpp
	M			src/delete_bonds.cpp
	M			src/domain.cpp
	M			src/domain.h
	M			src/dump.cpp
	M			src/dump_image.cpp
	M			src/finish.cpp
	M			src/input.cpp
	M			src/molecule.cpp
	M			src/molecule.h
	M			src/neigh_bond.cpp
	M			src/neigh_full.cpp
	M			src/neigh_half_bin.cpp
	M			src/neigh_half_multi.cpp
	M			src/neigh_half_nsq.cpp
	M			src/neigh_respa.cpp
	M			src/neighbor.cpp
	M			src/neighbor.h
	M			src/read_data.cpp
	M			src/read_restart.cpp
	M			src/read_restart.h
	M			src/replicate.cpp
	M			src/set.cpp
	M			src/variable.cpp
	M			src/version.h
	M			src/write_data.cpp
	M			src/write_restart.cpp