lammps-ro
38faad75d478
Actions

Authored by Mike Brown <wb8@lens-login4.ccs.ornl.gov> on Apr 6 2011, 16:25.

Description

Merge branch 'master' of http://git.icms.temple.edu/lammps-ro

Conflicts:
src/GPU/pair_gayberne_gpu.cpp
src/GPU/pair_lj96_cut_gpu.cpp
src/GPU/pair_lj_charmm_coul_long_gpu.cpp
src/GPU/pair_lj_cut_coul_cut_gpu.cpp
src/GPU/pair_lj_cut_coul_long_gpu.cpp
src/GPU/pair_lj_cut_gpu.cpp

Commit	Author	Details	Committed
f3feb53326e7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5899 f3b2605a-c512-4ea7…	Apr 5 2011
8d92fd5fc415	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5898 f3b2605a-c512-4ea7…	Apr 5 2011
8983f9e8ffa4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5897 f3b2605a-c512-4ea7…	Apr 5 2011
eb7d28836001	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5896 f3b2605a-c512-4ea7…	Apr 5 2011
eecbb7e1e5a6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5894 f3b2605a-c512-4ea7…	Apr 4 2011
ad1023f10e2a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5893 f3b2605a-c512-4ea7…	Apr 4 2011

Merge branch 'master' of http://git.icms.temple.edu/lammps-ro38faad75d478Actions

Description

Details

Event Timeline

Merged Changes

Changes (103)Show All Changes

Very Large Commit

rLAMMPS38faad75d478

doc/special_bonds.html

doc/special_bonds.txt

lib/atc/LammpsInterface.cpp

lib/gpu/crml_gpu_kernel.cu

src/ASPHERE/pair_gayberne.cpp

src/ASPHERE/pair_resquared.cpp

src/CLASS2/pair_lj_class2.cpp

src/CLASS2/pair_lj_class2_coul_cut.cpp

src/CLASS2/pair_lj_class2_coul_long.cpp

src/COLLOID/pair_colloid.cpp

src/COLLOID/pair_lubricate.cpp

src/COLLOID/pair_yukawa_colloid.cpp

src/DIPOLE/pair_dipole_cut.cpp

src/GPU/pair_gayberne_gpu.cpp

src/GPU/pair_lj96_cut_gpu.cpp

src/GPU/pair_lj_charmm_coul_long_gpu.cpp

src/GPU/pair_lj_cut_coul_cut_gpu.cpp

src/GPU/pair_lj_cut_coul_long_gpu.cpp

src/GPU/pair_lj_cut_gpu.cpp

src/GRANULAR/pair_gran_hertz_history.cpp

src/GRANULAR/pair_gran_hooke.cpp

src/GRANULAR/pair_gran_hooke_history.cpp

src/KSPACE/pair_born_coul_long.cpp

src/KSPACE/pair_buck_coul_long.cpp

src/KSPACE/pair_coul_long.cpp

src/KSPACE/pair_lj_charmm_coul_long.cpp

src/KSPACE/pair_lj_cut_coul_long.cpp

src/KSPACE/pair_lj_cut_coul_long_tip4p.cpp

src/MANYBODY/pair_airebo.cpp

src/MANYBODY/pair_comb.cpp

src/MANYBODY/pair_eam.cpp

src/MANYBODY/pair_eim.cpp

src/MANYBODY/pair_sw.cpp

src/MANYBODY/pair_tersoff.cpp

src/MEAM/pair_meam.cpp

src/MEAM/pair_meam.h

src/MOLECULE/fix_bond_create.cpp

src/MOLECULE/fix_bond_swap.cpp

src/MOLECULE/pair_hbond_dreiding_lj.cpp

src/MOLECULE/pair_hbond_dreiding_morse.cpp

src/MOLECULE/pair_lj_charmm_coul_charmm.cpp

src/MOLECULE/pair_lj_charmm_coul_charmm_implicit.cpp

src/OPT/pair_lj_charmm_coul_long_opt.h

src/OPT/pair_lj_cut_opt.h

src/OPT/pair_morse_opt.h

src/PERI/fix_peri_neigh.cpp

src/PERI/pair_peri_lps.cpp

src/PERI/pair_peri_pmb.cpp

src/REAX/pair_reax.cpp

src/REPLICA/fix_neb.cpp

src/USER-ACKLAND/compute_ackland_atom.cpp

src/USER-CD-EAM/pair_cdeam.cpp

src/USER-CG-CMM/pair_cmm_common.cpp

src/USER-CG-CMM/pair_cmm_common.h

src/USER-EFF/pair_eff_cut.cpp

src/USER-EWALDN/pair_buck_coul.cpp

src/USER-EWALDN/pair_lj_coul.cpp

src/USER-REAXC/pair_reax_c.cpp

src/compute.h

src/compute_centro_atom.cpp

src/compute_cluster_atom.cpp

src/compute_cna_atom.cpp

src/compute_coord_atom.cpp

src/compute_group_group.cpp

src/compute_pair_local.cpp

src/compute_property_local.cpp

src/compute_rdf.cpp

src/delete_atoms.cpp

src/delete_atoms.h

src/fix_orient_fcc.cpp

src/fix_shear_history.cpp

src/force.cpp

Merge branch 'master' of http://git.icms.temple.edu/lammps-ro
38faad75d478
Actions

Changes (103)
Show All Changes