Merge remote branch 'lammps-ro/master' into lammps-icms
2b1e3a30bd1a
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jun 28 2013, 13:09.

Description

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

Resolved Conflicts:
doc/Manual.txt
doc/fix_tune_kspace.txt
doc/group2ndx.txt
src/DIPOLE/atom_vec_dipole.cpp
src/DIPOLE/pair_lj_long_dipole_long.cpp
src/MOLECULE/atom_vec_angle.cpp
src/MOLECULE/atom_vec_bond.cpp
src/MOLECULE/atom_vec_full.cpp
src/MOLECULE/atom_vec_molecular.cpp
src/PERI/atom_vec_peri.cpp
src/USER-AWPMD/atom_vec_wavepacket.cpp
src/USER-COLVARS/README
src/USER-EFF/atom_vec_electron.cpp
src/USER-SPH/atom_vec_meso.cpp
src/atom.h
src/atom_vec_atomic.cpp
src/atom_vec_body.cpp
src/atom_vec_charge.cpp
src/atom_vec_ellipsoid.cpp
src/atom_vec_line.cpp
src/atom_vec_sphere.cpp
src/atom_vec_tri.cpp
src/fix_restrain.cpp
src/force.cpp
tools/restart2data.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jun 28 2013, 13:09

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSa92e8c271bcb: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10140 f3b2605a-c512-4ea7…
rLAMMPSf99231874be8: fix paths in build script and fix typo in fedora 19 detection

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS2b1e3a30bd1a: Merge remote branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jun 28 2013, 13:09

Merged Changes

Commit	Author	Details	Committed
a92e8c271bcb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10140 f3b2605a-c512-4ea7…	Jun 28 2013
89fc0b42d167	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10139 f3b2605a-c512-4ea7…	Jun 28 2013
ede1d487733b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10138 f3b2605a-c512-4ea7…	Jun 28 2013
df08f3e483fa	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10137 f3b2605a-c512-4ea7…	Jun 28 2013
83f360b90bc9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10136 f3b2605a-c512-4ea7…	Jun 28 2013
b292458b401c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10135 f3b2605a-c512-4ea7…	Jun 28 2013
c0acc33584ae	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10134 f3b2605a-c512-4ea7…	Jun 28 2013
45f0fb457d36	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10133 f3b2605a-c512-4ea7…	Jun 28 2013
cb90b71a13ea	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10132 f3b2605a-c512-4ea7…	Jun 28 2013
c0afb45368f7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10131 f3b2605a-c512-4ea7…	Jun 28 2013
440d38977984	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10130 f3b2605a-c512-4ea7…	Jun 28 2013
1e4b3bcf876a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10129 f3b2605a-c512-4ea7…	Jun 28 2013
3f5e6b3fab48	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10128 f3b2605a-c512-4ea7…	Jun 28 2013
cf667e892fb5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10126 f3b2605a-c512-4ea7…	Jun 28 2013
07c9a7f6a687	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10124 f3b2605a-c512-4ea7…	Jun 28 2013
5e57d70d408b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10123 f3b2605a-c512-4ea7…	Jun 28 2013
1d2961508066	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10122 f3b2605a-c512-4ea7…	Jun 28 2013
040ec54ecd58	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10121 f3b2605a-c512-4ea7…	Jun 28 2013
738d90076211	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10120 f3b2605a-c512-4ea7…	Jun 28 2013
6dc244769531	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10119 f3b2605a-c512-4ea7…	Jun 28 2013
4da20dce992f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10118 f3b2605a-c512-4ea7…	Jun 28 2013
38112d00635b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10117 f3b2605a-c512-4ea7…	Jun 28 2013
76c54d6e3a96	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10116 f3b2605a-c512-4ea7…	Jun 28 2013
5d0be9c5ffbe	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10115 f3b2605a-c512-4ea7…	Jun 28 2013
71a19e3883cd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10114 f3b2605a-c512-4ea7…	Jun 27 2013
8d699db7a887	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10113 f3b2605a-c512-4ea7…	Jun 27 2013
92e78a2f8ee4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10112 f3b2605a-c512-4ea7…	Jun 27 2013
069f071cf301	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10111 f3b2605a-c512-4ea7…	Jun 27 2013
3c0e5bf25c5b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10109 f3b2605a-c512-4ea7…	Jun 27 2013
5e15c24733b3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10108 f3b2605a-c512-4ea7…	Jun 27 2013
34b028f059a5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10107 f3b2605a-c512-4ea7…	Jun 27 2013
77866dd57800	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10105 f3b2605a-c512-4ea7…	Jun 27 2013
b92fa00337d0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10104 f3b2605a-c512-4ea7…	Jun 27 2013
2dbe3f80a2e8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10103 f3b2605a-c512-4ea7…	Jun 27 2013
0d6f0c69fd62	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10102 f3b2605a-c512-4ea7…	Jun 27 2013
e0211874ac3c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10101 f3b2605a-c512-4ea7…	Jun 27 2013
33e5f0e99ad0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10100 f3b2605a-c512-4ea7…	Jun 27 2013
8b031ab60933	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10099 f3b2605a-c512-4ea7…	Jun 27 2013

Changes (70)

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/Section_accelerate.html
	M			doc/Section_accelerate.txt
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/Section_howto.html
	M			doc/Section_howto.txt
	M			doc/fix_colvars.html
	M			doc/fix_tune_kspace.html
	M			doc/fix_tune_kspace.txt
	A			doc/group2ndx.html
	M			doc/group2ndx.txt
	M			doc/kspace_style.html
	M			doc/kspace_style.txt
	M			doc/pair_sph_taitwater_morris.html
	M			doc/pair_tersoff_zbl.html
	M			doc/tad.html
	M			doc/thermo_style.html
	M			doc/thermo_style.txt
	P			lib/colvars/Makefile.lammps.debug Copied from lib/colvars/Makefile.lammps.empty
	M			src/DIPOLE/atom_vec_dipole.cpp
	M			src/DIPOLE/pair_lj_long_dipole_long.cpp
	M			src/KSPACE/pppm.cpp
	M			src/KSPACE/pppm.h
	A			src/KSPACE/pppm_stagger.cpp
	P			src/KSPACE/pppm_stagger.h Copied from src/KSPACE/pppm_cg.h
	M			src/MANYBODY/pair_adp.cpp
	M			src/MANYBODY/pair_airebo.cpp
	M			src/MANYBODY/pair_bop.cpp
	M			src/MANYBODY/pair_comb.cpp
	M			src/MANYBODY/pair_eam.cpp
	M			src/MANYBODY/pair_eam_alloy.cpp
	M			src/MANYBODY/pair_eam_fs.cpp
	M			src/MANYBODY/pair_eim.cpp
	M			src/MANYBODY/pair_lcbop.cpp
	M			src/MANYBODY/pair_sw.cpp
	M			src/MANYBODY/pair_tersoff.cpp
	M			src/MEAM/pair_meam.cpp
	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/REAX/pair_reax.cpp
	M			src/USER-AWPMD/atom_vec_wavepacket.cpp
	M			src/USER-COLVARS/README
	M			src/USER-EFF/atom_vec_electron.cpp
	M			src/USER-MISC/pair_edip.cpp
	M			src/USER-MISC/pair_meam_spline.cpp
	M			src/USER-MISC/pair_meam_sw_spline.cpp
	M			src/USER-MISC/pair_tersoff_table.cpp
	M			src/USER-REAXC/pair_reax_c.cpp
	M			src/USER-SPH/atom_vec_meso.cpp
	M			src/atom.h
	M			src/atom_vec_atomic.cpp
	M			src/atom_vec_body.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/force.cpp
	M			src/kspace.cpp
	M			src/kspace.h
	M			src/pair.cpp
	M			src/pair.h
	M			src/pair_hybrid.cpp
	M			src/version.h
	M			tools/binary2txt.cpp

Merge remote branch 'lammps-ro/master' into lammps-icms2b1e3a30bd1aActions

Description

Details

Event Timeline

Merged Changes

Changes (70)

rLAMMPS2b1e3a30bd1a

doc/Manual.html

doc/Manual.txt

doc/Section_accelerate.html

doc/Section_accelerate.txt

doc/Section_commands.html

doc/Section_commands.txt

doc/Section_howto.html

doc/Section_howto.txt

doc/fix_colvars.html

doc/fix_tune_kspace.html

doc/fix_tune_kspace.txt

doc/group2ndx.html

doc/group2ndx.txt

doc/kspace_style.html

doc/kspace_style.txt

doc/pair_sph_taitwater_morris.html

doc/pair_tersoff_zbl.html

doc/tad.html

doc/thermo_style.html

doc/thermo_style.txt

lib/colvars/Makefile.lammps.debug

src/DIPOLE/atom_vec_dipole.cpp

src/DIPOLE/pair_lj_long_dipole_long.cpp

src/KSPACE/pppm.cpp

src/KSPACE/pppm.h

src/KSPACE/pppm_stagger.cpp

src/KSPACE/pppm_stagger.h

src/MANYBODY/pair_adp.cpp

src/MANYBODY/pair_airebo.cpp

src/MANYBODY/pair_bop.cpp

src/MANYBODY/pair_comb.cpp

src/MANYBODY/pair_eam.cpp

src/MANYBODY/pair_eam_alloy.cpp

src/MANYBODY/pair_eam_fs.cpp

src/MANYBODY/pair_eim.cpp

src/MANYBODY/pair_lcbop.cpp

src/MANYBODY/pair_sw.cpp

src/MANYBODY/pair_tersoff.cpp

src/MEAM/pair_meam.cpp

src/MOLECULE/atom_vec_angle.cpp

src/MOLECULE/atom_vec_bond.cpp

src/MOLECULE/atom_vec_full.cpp

src/MOLECULE/atom_vec_molecular.cpp

src/PERI/atom_vec_peri.cpp

src/REAX/pair_reax.cpp

src/USER-AWPMD/atom_vec_wavepacket.cpp

src/USER-COLVARS/README

src/USER-EFF/atom_vec_electron.cpp

src/USER-MISC/pair_edip.cpp

src/USER-MISC/pair_meam_spline.cpp

src/USER-MISC/pair_meam_sw_spline.cpp

src/USER-MISC/pair_tersoff_table.cpp

src/USER-REAXC/pair_reax_c.cpp

src/USER-SPH/atom_vec_meso.cpp

src/atom.h

src/atom_vec_atomic.cpp

src/atom_vec_body.cpp

src/atom_vec_charge.cpp

src/atom_vec_ellipsoid.cpp

src/atom_vec_line.cpp

src/atom_vec_sphere.cpp

src/atom_vec_tri.cpp

src/force.cpp

src/kspace.cpp

src/kspace.h

src/pair.cpp

src/pair.h

src/pair_hybrid.cpp

src/version.h

tools/binary2txt.cpp

Merge remote branch 'lammps-ro/master' into lammps-icms
2b1e3a30bd1a
Actions