Diffusion lammps daa6b1a6a773

lammps-ro
daa6b1a6a773
Actions

Authored by Mike Brown <wb8@yona-login1.ccs.ornl.gov> on Dec 22 2011, 19:44.

Description

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

Conflicts:
doc/Section_errors.txt

Details

Committed

Mike Brown <wb8@yona-login1.ccs.ornl.gov>

Dec 22 2011, 19:44

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS6844100cbbb9: Fixing some bugs introduced in the last commit for PPPM.
rLAMMPS9921d2078894: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7381 f3b2605a-c512-4ea7…

Branches

Unknown

Tags

Unknown

Event Timeline

Mike Brown <wb8@yona-login1.ccs.ornl.gov> committed rLAMMPSdaa6b1a6a773: Merge branch 'master' of http://git.icms.temple.edu/lammps-ro (authored by Mike Brown <wb8@yona-login1.ccs.ornl.gov>).Dec 22 2011, 19:44

Merged Changes

Commit	Author	Details	Committed
9921d2078894	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7381 f3b2605a-c512-4ea7…	Dec 19 2011
5a644b0e5de4	athomps	Added protection for zero atoms case	Dec 19 2011
4f48544d4198	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7379 f3b2605a-c512-4ea7…	Dec 16 2011
70316a8f775e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7377 f3b2605a-c512-4ea7…	Dec 16 2011
06f040f25df4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7376 f3b2605a-c512-4ea7…	Dec 16 2011
d99b580613d6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7375 f3b2605a-c512-4ea7…	Dec 16 2011

Changes (83)

				Path
	M			doc/Section_errors.html
	M			doc/Section_errors.txt
	M			src/CLASS2/dihedral_class2.h
	M			src/CLASS2/improper_class2.h
	M			src/CLASS2/pair_lj_class2_coul_long.cpp
	M			src/CLASS2/pair_lj_class2_coul_long.h
	M			src/KSPACE/pair_born_coul_long.cpp
	M			src/KSPACE/pair_born_coul_long.h
	M			src/KSPACE/pair_buck_coul_long.cpp
	M			src/KSPACE/pair_buck_coul_long.h
	M			src/KSPACE/pair_coul_long.cpp
	M			src/KSPACE/pair_coul_long.h
	M			src/KSPACE/pair_lj_charmm_coul_long.cpp
	M			src/KSPACE/pair_lj_charmm_coul_long.h
	M			src/KSPACE/pair_lj_cut_coul_long.cpp
	M			src/KSPACE/pair_lj_cut_coul_long.h
	M			src/KSPACE/pair_lj_cut_coul_long_tip4p.cpp
	M			src/KSPACE/pair_lj_cut_coul_long_tip4p.h
	M			src/MC/fix_bond_swap.cpp
	M			src/MEAM/pair_meam.cpp
	M			src/MOLECULE/bond_fene.h
	M			src/MOLECULE/bond_fene_expand.h
	M			src/MOLECULE/dihedral_charmm.h
	M			src/MOLECULE/dihedral_harmonic.h
	M			src/MOLECULE/dihedral_helix.h
	M			src/MOLECULE/dihedral_multi_harmonic.h
	M			src/MOLECULE/dihedral_opls.h
	M			src/MOLECULE/improper_cvff.h
	M			src/MOLECULE/improper_harmonic.h
	M			src/MOLECULE/improper_umbrella.h
	M			src/MOLECULE/pair_lj_charmm_coul_charmm.cpp
	M			src/MOLECULE/pair_lj_charmm_coul_charmm.h
	M			src/REPLICA/compute_event_displace.cpp
	M			src/REPLICA/compute_event_displace.h
	M			src/REPLICA/prd.cpp
	M			src/REPLICA/tad.cpp
	M			src/SHOCK/fix_append_atoms.cpp
	M			src/SHOCK/fix_append_atoms.h
	M			src/SHOCK/fix_msst.cpp
	M			src/compute.cpp
	M			src/compute.h
	M			src/compute_pressure.cpp
	M			src/compute_pressure.h
	M			src/dump_atom.cpp
	M			src/dump_cfg.h
	M			src/dump_image.cpp
	M			src/dump_image.h
	M			src/dump_local.cpp
	M			src/error.cpp
	M			src/error.h
	M			src/fix_nh.cpp
	M			src/fix_shake.h
	M			src/input.cpp
	M			src/kspace.cpp
	M			src/kspace.h
	M			src/memory.h
	M			src/min.cpp
	M			src/modify.cpp
	M			src/modify.h
	M			src/neigh_bond.h
	M			src/pair.h
	M			src/pair_born.cpp
	M			src/pair_born.h
	M			src/pair_buck.cpp
	M			src/pair_buck.h
	M			src/pair_coul_cut.cpp
	M			src/pair_coul_cut.h
	M			src/pair_gauss.cpp
	M			src/pair_gauss.h
	M			src/pair_hybrid.cpp
	M			src/pair_hybrid.h
	M			src/pair_lj_cut.cpp
	M			src/pair_lj_cut.h
	M			src/pair_soft.cpp
	M			src/pair_soft.h
	M			src/pair_table.cpp
	M			src/pair_table.h
	M			src/read_data.cpp
	M			src/read_data.h
	M			src/thermo.cpp
	M			src/velocity.cpp
	M			src/velocity.h
	M			src/version.h