Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
573db9e2f7e7
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Mar 12 2014, 22:43.

Description

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

Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
doc/fix_oneway.txt
doc/fix_temp_csvr.txt
src/fix_move.cpp
src/fix_nh.cpp
src/fix_temp_csvr.cpp
src/neigh_stencil.cpp
src/pair.cpp
src/pair_hybrid.cpp
src/read_data.cpp
tools/msi2lmp/src/msi2lmp.c
tools/msi2lmp/src/msi2lmp.h

Signed-off-by: Axel Kohlmeyer <akohlmey@gmail.com>

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Mar 12 2014, 22:43

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS039af550a04f: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11626 f3b2605a-c512-4ea7…
rLAMMPSc805aa4c6179: make writing style hints optional via flag for backward compatibility

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS573db9e2f7e7: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Mar 12 2014, 22:43

Merged Changes

Commit	Author	Details	Committed
039af550a04f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11626 f3b2605a-c512-4ea7…	Mar 10 2014
2b40fd234966	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11625 f3b2605a-c512-4ea7…	Mar 10 2014
d2b44d8c3b6c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11624 f3b2605a-c512-4ea7…	Mar 10 2014
82532b94bbcf	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11622 f3b2605a-c512-4ea7…	Mar 10 2014
91360a80a85d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11621 f3b2605a-c512-4ea7…	Mar 10 2014
f7a3672c367b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11620 f3b2605a-c512-4ea7…	Mar 10 2014
eeb3c26ddd5c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11619 f3b2605a-c512-4ea7…	Mar 10 2014
bfc2b92e3202	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11618 f3b2605a-c512-4ea7…	Mar 10 2014
5e1d34a23d50	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11617 f3b2605a-c512-4ea7…	Mar 10 2014
3d6ac732ad59	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11616 f3b2605a-c512-4ea7…	Mar 10 2014
df0c8d061fa3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11615 f3b2605a-c512-4ea7…	Mar 10 2014
de4737af3ae5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11614 f3b2605a-c512-4ea7…	Mar 10 2014
8fc989a6b1b3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11611 f3b2605a-c512-4ea7…	Mar 10 2014
99e6ed455467	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11610 f3b2605a-c512-4ea7…	Mar 10 2014
6a0abc7bfb45	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11609 f3b2605a-c512-4ea7…	Mar 10 2014
481778cb31ea	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11608 f3b2605a-c512-4ea7…	Mar 10 2014
ac6f5afc2ef6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11607 f3b2605a-c512-4ea7…	Mar 10 2014
0c22e8696abc	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11606 f3b2605a-c512-4ea7…	Mar 10 2014
3f7d79ab82ab	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11605 f3b2605a-c512-4ea7…	Mar 10 2014
88cd9113f091	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11604 f3b2605a-c512-4ea7…	Mar 10 2014
a1db9a1aaa54	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11603 f3b2605a-c512-4ea7…	Mar 7 2014
15ecab91a303	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11602 f3b2605a-c512-4ea7…	Mar 7 2014
dcab7801eb57	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11598 f3b2605a-c512-4ea7…	Mar 6 2014
37d3c55fca8e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11597 f3b2605a-c512-4ea7…	Mar 6 2014
99c18a722fd6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11595 f3b2605a-c512-4ea7…	Mar 6 2014
d7f0208ac9b7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11594 f3b2605a-c512-4ea7…	Mar 6 2014
d1fce2720c95	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11589 f3b2605a-c512-4ea7…	Mar 6 2014
2bcf10827cc2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11588 f3b2605a-c512-4ea7…	Mar 6 2014
ec9648ee9491	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11586 f3b2605a-c512-4ea7…	Mar 4 2014
2b350aaab9e5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11585 f3b2605a-c512-4ea7…	Mar 4 2014
f1e2227ed1cf	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11584 f3b2605a-c512-4ea7…	Mar 4 2014
d3ad8087022b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11583 f3b2605a-c512-4ea7…	Mar 4 2014

Changes (74)

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/Section_howto.html
	M			doc/Section_howto.txt
	P			doc/fix_oneway.html Copied from doc/fix_nve_noforce.html
	M			doc/fix_oneway.txt
	P			doc/fix_temp_csvr.html Copied from doc/fix_temp_berendsen.html
	M			doc/fix_temp_csvr.txt
	M			doc/fix_wall_reflect.html
	M			doc/fix_wall_reflect.txt
	M			doc/lattice.html
	M			doc/lattice.txt
	M			doc/read_data.html
	M			doc/read_data.txt
	M			src/KSPACE/ewald.cpp
	M			src/KSPACE/ewald_disp.cpp
	M			src/KSPACE/msm.cpp
	M			src/KSPACE/pppm.cpp
	M			src/KSPACE/pppm_disp.cpp
	M			src/KSPACE/pppm_old.cpp
	M			src/MISC/fix_deposit.cpp
	V			src/{MISC ← USER-MISC}/fix_oneway.cpp
	V			src/{MISC ← USER-MISC}/fix_oneway.h
	M			src/USER-CUDA/pppm_cuda.cpp
	V			src/{USER-MISC → MISC}/fix_oneway.cpp
	V			src/{USER-MISC → MISC}/fix_oneway.h
	M			src/atom.cpp
	M			src/atom.h
	M			src/atom_vec_body.cpp
	M			src/balance.cpp
	M			src/change_box.cpp
	M			src/compute_angle_local.cpp
	M			src/compute_bond_local.cpp
	M			src/compute_cluster_atom.cpp
	M			src/compute_dihedral_local.cpp
	M			src/compute_gyration_molecule.cpp
	M			src/compute_improper_local.cpp
	M			src/compute_property_local.cpp
	M			src/compute_reduce.cpp
	M			src/compute_temp_profile.cpp
	M			src/dump.cpp
	M			src/dump_image.cpp
	M			src/fix.h
	M			src/fix_box_relax.cpp
	M			src/fix_move.cpp
	M			src/fix_nh.cpp
	M			src/fix_press_berendsen.cpp
	M			src/fix_temp_csvr.cpp
	M			src/image.cpp
	M			src/irregular.cpp
	M			src/lmptype.h
	M			src/min_linesearch.cpp
	M			src/molecule.cpp
	M			src/molecule.h
	M			src/my_page.h
	M			src/neigh_stencil.cpp
	M			src/pair.cpp
	M			src/pair_born_coul_wolf.cpp
	M			src/pair_coul_wolf.cpp
	M			src/pair_gauss.cpp
	M			src/pair_hybrid.cpp
	M			src/pair_lj_smooth_linear.cpp
	M			src/procmap.cpp
	M			src/read_data.cpp
	M			src/read_data.h
	M			src/read_restart.cpp
	M			src/set.cpp
	M			src/universe.cpp
	M			src/variable.cpp
	M			src/version.h
	M			src/write_data.cpp
	M			tools/msi2lmp/src/msi2lmp.c

Merge remote-tracking branch 'lammps-ro/master' into lammps-icms573db9e2f7e7Actions

Description

Details

Event Timeline

Merged Changes

Changes (74)

rLAMMPS573db9e2f7e7

doc/Manual.html

doc/Manual.txt

doc/Section_commands.html

doc/Section_commands.txt

doc/Section_howto.html

doc/Section_howto.txt

doc/fix_oneway.html

doc/fix_oneway.txt

doc/fix_temp_csvr.html

doc/fix_temp_csvr.txt

doc/fix_wall_reflect.html

doc/fix_wall_reflect.txt

doc/lattice.html

doc/lattice.txt

doc/read_data.html

doc/read_data.txt

src/KSPACE/ewald.cpp

src/KSPACE/ewald_disp.cpp

src/KSPACE/msm.cpp

src/KSPACE/pppm.cpp

src/KSPACE/pppm_disp.cpp

src/KSPACE/pppm_old.cpp

src/MISC/fix_deposit.cpp

src/MISC/fix_oneway.cpp

src/MISC/fix_oneway.h

src/USER-CUDA/pppm_cuda.cpp

src/USER-MISC/fix_oneway.cpp

src/USER-MISC/fix_oneway.h

src/atom.cpp

src/atom.h

src/atom_vec_body.cpp

src/balance.cpp

src/change_box.cpp

src/compute_angle_local.cpp

src/compute_bond_local.cpp

src/compute_cluster_atom.cpp

src/compute_dihedral_local.cpp

src/compute_gyration_molecule.cpp

src/compute_improper_local.cpp

src/compute_property_local.cpp

src/compute_reduce.cpp

src/compute_temp_profile.cpp

src/dump.cpp

src/dump_image.cpp

src/fix.h

src/fix_box_relax.cpp

src/fix_move.cpp

src/fix_nh.cpp

src/fix_press_berendsen.cpp

src/fix_temp_csvr.cpp

src/image.cpp

src/irregular.cpp

src/lmptype.h

src/min_linesearch.cpp

src/molecule.cpp

src/molecule.h

src/my_page.h

src/neigh_stencil.cpp

src/pair.cpp

src/pair_born_coul_wolf.cpp

src/pair_coul_wolf.cpp

src/pair_gauss.cpp

src/pair_hybrid.cpp

src/pair_lj_smooth_linear.cpp

src/procmap.cpp

src/read_data.cpp

src/read_data.h

src/read_restart.cpp

src/set.cpp

src/universe.cpp

src/variable.cpp

src/version.h

src/write_data.cpp

Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
573db9e2f7e7
Actions