Merge branch 'master' into lammps-icms
90ce52e383b3
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Feb 29 2012, 16:29.

Description

Merge branch 'master' into lammps-icms

Resolved Conflicts:
doc/kspace_style.html
doc/kspace_style.txt
src/USER-EWALDN/ewald_n.h

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Feb 29 2012, 16:29

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS268a14f25190: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7860 f3b2605a-c512-4ea7…
rLAMMPS13813b9e6f74: undo bugfix for print statements with spaces

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS90ce52e383b3: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Feb 29 2012, 16:29

Merged Changes

Commit	Author	Details	Committed
268a14f25190	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7860 f3b2605a-c512-4ea7…	Feb 28 2012
2e686fb6cada	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7859 f3b2605a-c512-4ea7…	Feb 28 2012
6a544be9cffe	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7858 f3b2605a-c512-4ea7…	Feb 28 2012
00944a2b95f3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7856 f3b2605a-c512-4ea7…	Feb 28 2012
607ee0bc77ad	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7854 f3b2605a-c512-4ea7…	Feb 28 2012
20fa6da9e496	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7853 f3b2605a-c512-4ea7…	Feb 28 2012
77377e36da42	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7852 f3b2605a-c512-4ea7…	Feb 28 2012
c2777b94c214	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7851 f3b2605a-c512-4ea7…	Feb 28 2012
3450c008aa00	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7850 f3b2605a-c512-4ea7…	Feb 28 2012
52568d2738fb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7849 f3b2605a-c512-4ea7…	Feb 28 2012

Changes (136)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path
	M			doc/Section_howto.html
	M			doc/Section_howto.txt
	M			doc/create_atoms.html
	M			doc/create_atoms.txt
	M			doc/delete_bonds.html
	M			doc/delete_bonds.txt
	M			doc/kspace_modify.html
	M			doc/kspace_modify.txt
	M			doc/kspace_style.html
	M			doc/kspace_style.txt
	M			doc/pair_lj.html
	M			doc/pair_lj.txt
	M			doc/run.html
	M			doc/run.txt
	M			src/CLASS2/dihedral_class2.cpp
	M			src/CLASS2/improper_class2.cpp
	M			src/DIPOLE/atom_vec_dipole.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_coul_long_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_long_gpu.cpp
	M			src/GPU/pair_lj_cut_gpu.cpp
	M			src/GPU/pair_lj_expand_gpu.cpp
	M			src/GPU/pair_lj_sdk_coul_long_gpu.cpp
	M			src/GPU/pair_lj_sdk_gpu.cpp
	M			src/GPU/pair_morse_gpu.cpp
	M			src/GPU/pair_resquared_gpu.cpp
	M			src/GPU/pair_table_gpu.cpp
	M			src/GPU/pair_yukawa_gpu.cpp
	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/KSPACE/pppm.cpp
	M			src/KSPACE/pppm.h
	M			src/MAKE/Makefile.glory
	M			src/MAKE/Makefile.redsky
	M			src/MAKE/Makefile.tunnison
	M			src/MOLECULE/atom_vec_bond.cpp
	M			src/MOLECULE/atom_vec_full.cpp
	M			src/MOLECULE/atom_vec_molecular.cpp
	M			src/MOLECULE/bond_fene.cpp
	M			src/MOLECULE/bond_fene_expand.cpp
	M			src/MOLECULE/dihedral_helix.cpp
	M			src/MOLECULE/dihedral_multi_harmonic.cpp
	M			src/MOLECULE/dihedral_opls.cpp
	M			src/PERI/atom_vec_peri.cpp
	M			src/REAX/fix_reax_bonds.cpp
	M			src/REPLICA/fix_event_prd.cpp
	M			src/REPLICA/fix_event_tad.cpp
	M			src/REPLICA/temper.cpp
	M			src/USER-EWALDN/ewald_n.cpp
	M			src/USER-EWALDN/ewald_n.h
	M			src/USER-MISC/dihedral_table.cpp
	M			src/USER-OMP/angle_charmm_omp.cpp
	M			src/USER-OMP/angle_class2_omp.cpp
	M			src/USER-OMP/angle_cosine_delta_omp.cpp
	M			src/USER-OMP/angle_cosine_omp.cpp
	M			src/USER-OMP/angle_cosine_periodic_omp.cpp
	M			src/USER-OMP/angle_cosine_shift_exp_omp.cpp
	M			src/USER-OMP/angle_cosine_shift_omp.cpp
	M			src/USER-OMP/angle_cosine_squared_omp.cpp
	M			src/USER-OMP/angle_dipole_omp.cpp
	M			src/USER-OMP/angle_harmonic_omp.cpp
	M			src/USER-OMP/angle_sdk_omp.cpp
	M			src/USER-OMP/angle_table_omp.cpp
	M			src/USER-OMP/bond_class2_omp.cpp
	M			src/USER-OMP/bond_fene_expand_omp.cpp
	M			src/USER-OMP/bond_fene_omp.cpp
	M			src/USER-OMP/bond_harmonic_omp.cpp
	M			src/USER-OMP/bond_harmonic_shift_cut_omp.cpp
	M			src/USER-OMP/bond_harmonic_shift_omp.cpp
	M			src/USER-OMP/bond_morse_omp.cpp
	M			src/USER-OMP/bond_nonlinear_omp.cpp
	M			src/USER-OMP/bond_quartic_omp.cpp
	M			src/USER-OMP/bond_table_omp.cpp
	M			src/USER-OMP/dihedral_class2_omp.cpp
	M			src/USER-OMP/dihedral_cosine_shift_exp_omp.cpp
	M			src/USER-OMP/dihedral_harmonic_omp.cpp
	M			src/USER-OMP/dihedral_helix_omp.cpp
	M			src/USER-OMP/dihedral_multi_harmonic_omp.cpp
	M			src/USER-OMP/dihedral_opls_omp.cpp
	M			src/USER-OMP/dihedral_table_omp.cpp
	M			src/USER-OMP/fix_qeq_comb_omp.cpp
	M			src/USER-OMP/improper_class2_omp.cpp
	M			src/USER-OMP/improper_cvff_omp.cpp
	M			src/USER-OMP/improper_harmonic_omp.cpp
	M			src/USER-OMP/improper_umbrella_omp.cpp
	M			src/USER-REAXC/fix_reaxc_bonds.cpp
	M			src/XTC/dump_xtc.cpp
	M			src/atom_vec_atomic.cpp
	M			src/atom_vec_charge.cpp
	M			src/atom_vec_ellipsoid.cpp
	M			src/atom_vec_hybrid.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/compute_reduce.cpp
	M			src/create_atoms.cpp
	M			src/create_atoms.h
	M			src/delete_atoms.cpp
	M			src/delete_bonds.cpp
	M			src/dump_dcd.cpp
	M			src/fix_ave_atom.cpp
	M			src/fix_ave_correlate.cpp
	M			src/fix_ave_histo.cpp
	M			src/fix_ave_spatial.cpp
	M			src/fix_ave_time.cpp
	M			src/fix_box_relax.cpp
	M			src/force.cpp
	M			src/group.cpp
	M			src/input.cpp
	M			src/input.h
	M			src/integrate.cpp
	M			src/kspace.cpp
	M			src/kspace.h
	M			src/memory.cpp
	M			src/min.cpp
	M			src/minimize.cpp
	M			src/modify.cpp
	M			src/neigh_bond.cpp
	M			src/neigh_list.cpp
	M			src/output.cpp
	M			src/read_data.cpp
	M			src/replicate.cpp
	M			src/run.cpp
	M			src/update.cpp
	M			src/version.h