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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jul 24 2013, 13:33.

Description

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

Resolved Conflicts:
doc/Manual.txt
src/input.cpp
tools/msi2lmp/test/reference/crambin-class1.data~lammps-ro_master~2
tools/msi2lmp/test/reference/nylon-class1.data~lammps-ro_master~2
tools/restart2data.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jul 24 2013, 13:33

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSb8d24cb627ab: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10316 f3b2605a-c512-4ea7…
rLAMMPSe9820ddf724a: add error message description to the header

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSf6484736ec08: Merge remote branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jul 24 2013, 13:33

Merged Changes

Commit	Author	Details	Committed
b8d24cb627ab	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10316 f3b2605a-c512-4ea7…	Jul 24 2013
5796e10597b4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10315 f3b2605a-c512-4ea7…	Jul 24 2013
abd9b1b7fbbc	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10313 f3b2605a-c512-4ea7…	Jul 23 2013
ec60529f4098	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10312 f3b2605a-c512-4ea7…	Jul 23 2013
87d674ca21ec	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10311 f3b2605a-c512-4ea7…	Jul 23 2013
cb7f385d4312	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10310 f3b2605a-c512-4ea7…	Jul 23 2013
4b21fc7c81e8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10306 f3b2605a-c512-4ea7…	Jul 23 2013
c37e912a2374	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10304 f3b2605a-c512-4ea7…	Jul 23 2013
d79e49443590	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10303 f3b2605a-c512-4ea7…	Jul 23 2013
04b2bbfc4383	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10302 f3b2605a-c512-4ea7…	Jul 23 2013
7b96d1c2f836	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10301 f3b2605a-c512-4ea7…	Jul 23 2013
dda38788f74d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10300 f3b2605a-c512-4ea7…	Jul 23 2013
ffa635cb9117	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10298 f3b2605a-c512-4ea7…	Jul 23 2013
d7ce1099e620	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10297 f3b2605a-c512-4ea7…	Jul 23 2013
196c284e00d6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10295 f3b2605a-c512-4ea7…	Jul 23 2013
b7f02b970973	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10294 f3b2605a-c512-4ea7…	Jul 23 2013
21fe3ece3872	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10293 f3b2605a-c512-4ea7…	Jul 23 2013
ad2266e4bf6b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10292 f3b2605a-c512-4ea7…	Jul 23 2013
ba877e83ca68	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10291 f3b2605a-c512-4ea7…	Jul 23 2013
42408bc41dbd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10290 f3b2605a-c512-4ea7…	Jul 23 2013
2584cbe902e1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10289 f3b2605a-c512-4ea7…	Jul 23 2013
fd39535f88d7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10288 f3b2605a-c512-4ea7…	Jul 23 2013
1d95bd961d33	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10287 f3b2605a-c512-4ea7…	Jul 23 2013
8f9c6b5a0214	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10286 f3b2605a-c512-4ea7…	Jul 23 2013
b49a5519f2f0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10285 f3b2605a-c512-4ea7…	Jul 23 2013
366484eb34e9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10284 f3b2605a-c512-4ea7…	Jul 23 2013
481bcc774b67	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10283 f3b2605a-c512-4ea7…	Jul 23 2013
2135141fe968	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10282 f3b2605a-c512-4ea7…	Jul 23 2013
6412ac85435b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10281 f3b2605a-c512-4ea7…	Jul 23 2013

Changes (47)

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/fix_tune_kspace.html
	M			doc/kspace_modify.html
	M			doc/kspace_modify.txt
	M			doc/kspace_style.html
	M			doc/pair_coul.html
	M			src/KSPACE/fix_tune_kspace.cpp
	M			src/KSPACE/fix_tune_kspace.h
	M			src/KSPACE/msm.cpp
	M			src/KSPACE/msm.h
	M			src/KSPACE/pppm.cpp
	M			src/Make.sh
	M			src/REPLICA/tad.cpp
	M			src/RIGID/fix_rigid_nph.cpp
	M			src/RIGID/fix_rigid_npt.cpp
	M			src/SHOCK/fix_append_atoms.cpp
	M			src/SHOCK/fix_msst.cpp
	M			src/SHOCK/fix_wall_piston.cpp
	M			src/SRD/fix_srd.cpp
	M			src/domain.cpp
	M			src/domain.h
	M			src/dump_image.cpp
	M			src/dump_image.h
	M			src/fix.cpp
	M			src/fix.h
	M			src/fix_ave_spatial.cpp
	M			src/fix_balance.cpp
	M			src/fix_box_relax.cpp
	M			src/fix_deform.cpp
	M			src/fix_nh.cpp
	M			src/fix_press_berendsen.cpp
	M			src/fix_shear_history.cpp
	M			src/fix_viscosity.cpp
	M			src/force.cpp
	M			src/force.h
	M			src/input.cpp
	M			src/input.h
	M			src/kspace.h
	M			src/modify.cpp
	M			src/modify.h
	M			src/pair_hybrid.cpp
	M			src/pair_hybrid.h
	M			src/version.h
	M			tools/restart2data.cpp