Diffusion lammps 6e511540f87f

Merge branch 'master' into lammps-icms
6e511540f87f
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jun 22 2012, 16:09.

Description

Merge branch 'master' into lammps-icms

Resolved Conflicts:
src/REPLICA/prd.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jun 22 2012, 16:09

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS186fec68f324: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8381 f3b2605a-c512-4ea7…
rLAMMPSa4fb2e6e1ef9: adjust input according to new syntax

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS6e511540f87f: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jun 22 2012, 16:09

Merged Changes

Commit	Author	Details	Committed
186fec68f324	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8381 f3b2605a-c512-4ea7…	Jun 22 2012
4f6d26042e33	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8379 f3b2605a-c512-4ea7…	Jun 22 2012
ab6544cd71f9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8378 f3b2605a-c512-4ea7…	Jun 22 2012
45f8666346b3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8377 f3b2605a-c512-4ea7…	Jun 22 2012
87fe07030be3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8376 f3b2605a-c512-4ea7…	Jun 21 2012
c76a926406d5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8374 f3b2605a-c512-4ea7…	Jun 21 2012
b3560bde9c3d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8373 f3b2605a-c512-4ea7…	Jun 21 2012
ee874d1dff4a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8371 f3b2605a-c512-4ea7…	Jun 21 2012
83416310f2d5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8370 f3b2605a-c512-4ea7…	Jun 21 2012
79a7e57328ff	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8369 f3b2605a-c512-4ea7…	Jun 21 2012
63f63e456772	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8368 f3b2605a-c512-4ea7…	Jun 21 2012
dc17d7963573	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8367 f3b2605a-c512-4ea7…	Jun 21 2012
0030566ad843	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8366 f3b2605a-c512-4ea7…	Jun 21 2012
31bc11ee34db	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8365 f3b2605a-c512-4ea7…	Jun 21 2012
7398f3eca3d0	athomps	Removed energy_updte_freq from nonbond calculation	Jun 20 2012
e7b124f39600	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8362 f3b2605a-c512-4ea7…	Jun 20 2012
b247eeb103f5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8361 f3b2605a-c512-4ea7…	Jun 20 2012
4baf5cec9930	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8360 f3b2605a-c512-4ea7…	Jun 20 2012
1c162a9e1b31	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8358 f3b2605a-c512-4ea7…	Jun 20 2012
7975177abdc9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8357 f3b2605a-c512-4ea7…	Jun 20 2012
69f5fbf42194	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8356 f3b2605a-c512-4ea7…	Jun 20 2012
f3eb64fd0f7a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8355 f3b2605a-c512-4ea7…	Jun 20 2012
0cd34fb8a2d9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8354 f3b2605a-c512-4ea7…	Jun 20 2012
bf54b6b9ff9f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8353 f3b2605a-c512-4ea7…	Jun 20 2012
c1e0bec7f6d6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8352 f3b2605a-c512-4ea7…	Jun 20 2012
f55e618e9e83	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8351 f3b2605a-c512-4ea7…	Jun 20 2012
e2d32549ab64	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8349 f3b2605a-c512-4ea7…	Jun 20 2012
7000d43d107a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8348 f3b2605a-c512-4ea7…	Jun 20 2012

Changes (55)

				Path
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/Section_errors.html
	M			doc/Section_errors.txt
	M			doc/balance.html
	M			doc/balance.txt
	A			doc/fix_balance.html
	A			doc/fix_balance.txt
	M			doc/fix_rigid.html
	M			doc/fix_rigid.txt
	M			src/GPU/Install.sh
	M			src/KIM/Install.sh
	M			src/MANYBODY/fix_qeq_comb.cpp
	M			src/MANYBODY/fix_qeq_comb.h
	M			src/MEAM/Install.sh
	M			src/POEMS/Install.sh
	M			src/REAX/Install.sh
	M			src/REPLICA/prd.cpp
	M			src/USER-ATC/Install.sh
	M			src/USER-AWPMD/Install.sh
	M			src/USER-COLVARS/Install.sh
	M			src/USER-CUDA/Install.sh
	M			src/USER-MOLFILE/Install.sh
	M			src/USER-REAXC/fix_qeq_reax.cpp
	M			src/USER-REAXC/fix_reaxc_bonds.cpp
	M			src/USER-REAXC/fix_reaxc_bonds.h
	M			src/USER-REAXC/pair_reax_c.cpp
	M			src/USER-REAXC/reaxc_nonbonded.cpp
	M			src/balance.cpp
	M			src/balance.h
	M			src/compute_angle_local.cpp
	M			src/compute_atom_molecule.cpp
	M			src/compute_bond_local.cpp
	M			src/compute_dihedral_local.cpp
	M			src/compute_improper_local.cpp
	M			src/compute_property_local.cpp
	M			src/fix_ave_histo.cpp
	A			src/fix_balance.cpp
	A			src/fix_balance.h
	M			src/fix_rigid.cpp
	M			src/fix_rigid.h
	M			src/irregular.cpp
	M			src/irregular.h
	M			src/neigh_full.cpp
	M			src/neigh_half_bin.cpp
	M			src/neigh_half_nsq.cpp
	M			src/neigh_stencil.cpp
	M			src/neighbor.cpp
	M			src/neighbor.h
	M			src/read_dump.cpp
	M			src/region.h
	M			src/rerun.cpp
	M			src/variable.cpp
	M			src/velocity.h
	M			src/version.h