Diffusion lammps f73d1bffe299

Merge branch 'master' into lammps-icms
f73d1bffe299
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jul 26 2012, 13:28.

Description

Merge branch 'master' into lammps-icms

Resolved Conflicts:
src/pair_lj_cut_coul_cut.h

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jul 26 2012, 13:28

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS601fb2f9a1df: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8512 f3b2605a-c512-4ea7…
rLAMMPSb1bdd74f88ac: Merge branch 'master' into lammps-icms

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSf73d1bffe299: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jul 26 2012, 13:28

Merged Changes

Commit	Author	Details	Committed
601fb2f9a1df	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8512 f3b2605a-c512-4ea7…	Jul 25 2012
c07472d404d6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8503 f3b2605a-c512-4ea7…	Jul 25 2012
052e83334eef	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8502 f3b2605a-c512-4ea7…	Jul 25 2012
6bfa697ae200	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8500 f3b2605a-c512-4ea7…	Jul 25 2012
52eba645ca8e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8499 f3b2605a-c512-4ea7…	Jul 25 2012
47552d40335e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8498 f3b2605a-c512-4ea7…	Jul 25 2012
912cfaca75dc	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8497 f3b2605a-c512-4ea7…	Jul 25 2012

Changes (78)

				Path
	M			doc/pair_hybrid.html
	M			doc/pair_hybrid.txt
	M			src/DIPOLE/atom_vec_dipole.cpp
	M			src/GPU/pair_eam_gpu.cpp
	M			src/GPU/pair_eam_gpu.h
	M			src/GRANULAR/pair_gran_hertz_history.cpp
	M			src/GRANULAR/pair_gran_hooke.cpp
	M			src/GRANULAR/pair_gran_hooke_history.cpp
	M			src/KSPACE/pair_lj_cut_coul_long.cpp
	M			src/KSPACE/pair_lj_cut_coul_long_tip4p.cpp
	M			src/MANYBODY/fix_qeq_comb.cpp
	M			src/MANYBODY/pair_bop.cpp
	M			src/MANYBODY/pair_bop.h
	M			src/MOLECULE/atom_vec_angle.cpp
	M			src/MOLECULE/atom_vec_bond.cpp
	M			src/MOLECULE/atom_vec_full.cpp
	M			src/MOLECULE/atom_vec_molecular.cpp
	M			src/PERI/atom_vec_peri.cpp
	M			src/REPLICA/fix_event.cpp
	M			src/REPLICA/tad.cpp
	M			src/USER-AWPMD/atom_vec_wavepacket.cpp
	D			src/USER-CUDA/pair_lj_sdk_coul_cut_cuda.cpp
	D			src/USER-CUDA/pair_lj_sdk_coul_cut_cuda.h
	D			src/USER-CUDA/pair_lj_sdk_coul_debye_cuda.cpp
	D			src/USER-CUDA/pair_lj_sdk_coul_debye_cuda.h
	M			src/USER-EFF/atom_vec_electron.cpp
	M			src/USER-MISC/bond_harmonic_shift.cpp
	M			src/USER-MISC/bond_harmonic_shift_cut.cpp
	M			src/USER-MOLFILE/dump_molfile.cpp
	M			src/USER-MOLFILE/dump_molfile.h
	M			src/USER-MOLFILE/molfile_interface.cpp
	M			src/USER-MOLFILE/molfile_interface.h
	M			src/USER-MOLFILE/molfile_plugin.h
	M			src/USER-MOLFILE/reader_molfile.cpp
	M			src/USER-MOLFILE/vmdplugin.h
	M			src/USER-OMP/bond_harmonic_shift_cut_omp.cpp
	M			src/USER-OMP/bond_harmonic_shift_omp.cpp
	M			src/USER-OMP/fix_qeq_comb_omp.cpp
	M			src/USER-OMP/neigh_half_bin_omp.cpp
	M			src/USER-OMP/neigh_half_nsq_omp.cpp
	M			src/USER-REAXC/fix_qeq_reax.cpp
	M			src/USER-REAXC/pair_reax_c.cpp
	M			src/USER-REAXC/reaxc_nonbonded.cpp
	M			src/USER-SPH/atom_vec_meso.cpp
	M			src/atom.cpp
	M			src/atom_vec_atomic.cpp
	M			src/atom_vec_charge.cpp
	M			src/atom_vec_ellipsoid.cpp
	M			src/atom_vec_line.cpp
	M			src/atom_vec_sphere.cpp
	M			src/atom_vec_tri.cpp
	M			src/balance.cpp
	M			src/balance.h
	M			src/compute_gyration.cpp
	M			src/compute_gyration_molecule.cpp
	M			src/create_atoms.cpp
	M			src/domain.cpp
	M			src/fix_aveforce.cpp
	M			src/fix_balance.cpp
	M			src/fix_balance.h
	M			src/fix_nh.cpp
	M			src/fix_rigid.cpp
	M			src/fix_shake.cpp
	M			src/lammps.cpp
	M			src/lmptype.h
	M			src/neigh_half_bin.cpp
	M			src/neigh_half_nsq.cpp
	M			src/neighbor.cpp
	M			src/output.cpp
	M			src/pair.h
	M			src/pair_lj_cut_coul_cut.cpp
	M			src/read_dump.cpp
	M			src/reader_xyz.cpp
	M			src/replicate.cpp
	M			src/rerun.cpp
	M			src/set.cpp
	M			src/variable.cpp
	M			src/version.h