Diffusion lammps 6d39a40b37d3

lammps
6d39a40b37d3
Actions

Authored by W. Michael Brown <brownw@ornl.gov> on Jul 27 2011, 23:02.

Description

Merge branch 'master' of ssh://yona.ccs.ornl.gov/~/git/lammps

Details

Committed

W. Michael Brown <brownw@ornl.gov>

Jul 27 2011, 23:02

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS0736327e5d08: Merge branch 'master' of http://git.icms.temple.edu/lammps-ro
rLAMMPSbf6d34160e7f: Adding preprocessor to OpenCL strings and as a dependency for both.

Branches

Unknown

Tags

Unknown

Event Timeline

W. Michael Brown <brownw@ornl.gov> committed rLAMMPS6d39a40b37d3: Merge branch 'master' of ssh://yona.ccs.ornl.gov/~/git/lammps (authored by W. Michael Brown <brownw@ornl.gov>).Jul 27 2011, 23:02

Merged Changes

Commit	Author	Details	Committed
0736327e5d08	Mike Brown	Merge branch 'master' of http://git.icms.temple.edu/lammps-ro	Jul 27 2011
617ae7d0709b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6556 f3b2605a-c512-4ea7…	Jul 26 2011
85efbcaf7ec6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6555 f3b2605a-c512-4ea7…	Jul 26 2011
63c9cc12fdae	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6554 f3b2605a-c512-4ea7…	Jul 26 2011
9b6479eb522f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6553 f3b2605a-c512-4ea7…	Jul 25 2011
9f4b5d91f1c7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6552 f3b2605a-c512-4ea7…	Jul 25 2011
44190d7ba8ee	athomps	Synced timestep for internal output	Jul 21 2011
9efc885f8292	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6545 f3b2605a-c512-4ea7…	Jul 19 2011
5f6811f4e03d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6544 f3b2605a-c512-4ea7…	Jul 19 2011
2402fbd08607	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6543 f3b2605a-c512-4ea7…	Jul 19 2011
0355ac8bc26e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6542 f3b2605a-c512-4ea7…	Jul 19 2011
14a99e9039aa	athomps	Added units to output quantities	Jul 18 2011
75c31d2c5cd4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6538 f3b2605a-c512-4ea7…	Jul 18 2011
eccc8c3349e4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6535 f3b2605a-c512-4ea7…	Jul 15 2011
7f6463ffa7ec	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6534 f3b2605a-c512-4ea7…	Jul 14 2011
83948e4b28fd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6532 f3b2605a-c512-4ea7…	Jul 14 2011
37ca8446ee85	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6531 f3b2605a-c512-4ea7…	Jul 14 2011
abdbd72db99f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6530 f3b2605a-c512-4ea7…	Jul 14 2011
ad06e468c145	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6524 f3b2605a-c512-4ea7…	Jul 13 2011
62669509d6c3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6523 f3b2605a-c512-4ea7…	Jul 13 2011
daba680c5d47	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6519 f3b2605a-c512-4ea7…	Jul 13 2011
b9c15d75bc8a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6518 f3b2605a-c512-4ea7…	Jul 13 2011
cc9911e03b4a	athomps	Fixed another error check	Jul 13 2011
21bf818ae1b0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6511 f3b2605a-c512-4ea7…	Jul 11 2011
1f7070dae8f1	athomps	Removed check on lam3	Jul 11 2011
0808ae4af81d	Mike Brown	Merge branch 'master' of http://git.icms.temple.edu/lammps-ro	Jul 5 2011
693aaaab3157	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6500 f3b2605a-c512-4ea7…	Jul 1 2011
f19afbe4819c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6499 f3b2605a-c512-4ea7…	Jul 1 2011
32a2028114e5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6498 f3b2605a-c512-4ea7…	Jul 1 2011
6b27f9706bf3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6497 f3b2605a-c512-4ea7…	Jul 1 2011
17413fb144f0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6493 f3b2605a-c512-4ea7…	Jul 1 2011
694e021972e9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6492 f3b2605a-c512-4ea7…	Jul 1 2011
aedbb28b6c34	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6486 f3b2605a-c512-4ea7…	Jun 30 2011
40ac5cd2fbfa	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6485 f3b2605a-c512-4ea7…	Jun 30 2011
af00170ae110	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6484 f3b2605a-c512-4ea7…	Jun 30 2011
3b9d33abd5a4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6483 f3b2605a-c512-4ea7…	Jun 30 2011
9843c9d48e22	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6482 f3b2605a-c512-4ea7…	Jun 30 2011
e9911cce4ac1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6479 f3b2605a-c512-4ea7…	Jun 29 2011
daed119074e2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6478 f3b2605a-c512-4ea7…	Jun 29 2011
37df8b5cf00e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6477 f3b2605a-c512-4ea7…	Jun 29 2011
85aa73903ca8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6476 f3b2605a-c512-4ea7…	Jun 28 2011
f17f012bb8e9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6475 f3b2605a-c512-4ea7…	Jun 28 2011
3cb626773c39	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6474 f3b2605a-c512-4ea7…	Jun 28 2011

Changes (127)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/Section_start.html
	M			doc/Section_start.txt
	M			doc/Section_tools.html
	M			doc/Section_tools.txt
	M			doc/compute_event_displace.html
	M			doc/compute_event_displace.txt
	M			doc/dump_image.html
	M			doc/dump_image.txt
	M			doc/fix_nh.html
	M			doc/fix_nh.txt
	M			doc/fix_srd.html
	M			doc/fix_srd.txt
	M			doc/pair_meam.html
	M			doc/pair_meam.txt
	M			doc/read_restart.html
	M			doc/read_restart.txt
	M			lib/meam/meam_data.F
	M			lib/meam/meam_dens_final.F
	M			lib/meam/meam_setup_done.F
	M			lib/meam/meam_setup_global.F
	M			lib/meam/meam_setup_param.F
	M			python/README
	M			src/ASPHERE/pair_gayberne.cpp
	M			src/ASPHERE/pair_resquared.cpp
	M			src/CLASS2/pair_lj_class2_coul_cut.cpp
	M			src/CLASS2/pair_lj_class2_coul_long.cpp
	M			src/COLLOID/fix_wall_colloid.cpp
	M			src/COLLOID/pair_lubricate.cpp
	M			src/COLLOID/pair_yukawa_colloid.cpp
	M			src/DIPOLE/pair_dipole_cut.cpp
	M			src/KSPACE/pair_born_coul_long.cpp
	M			src/KSPACE/pair_buck_coul_long.cpp
	M			src/KSPACE/pair_coul_long.cpp
	M			src/KSPACE/pair_lj_cut_coul_long_tip4p.cpp
	M			src/KSPACE/pppm.cpp
	M			src/KSPACE/pppm_tip4p.cpp
	P			src/MAKE/Makefile.g++ Copied to multiple locations: src/MAKE/Makefile.xe6 src/MAKE/Makefile.xt5
	P			src/MAKE/Makefile.xe6 Copied from src/MAKE/Makefile.g++
	P			src/MAKE/Makefile.xt5 Copied from src/MAKE/Makefile.g++
	M			src/MANYBODY/pair_adp.cpp
	M			src/MANYBODY/pair_airebo.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_tersoff.cpp
	M			src/MEAM/pair_meam.cpp
	M			src/MOLECULE/fix_bond_break.cpp
	M			src/MOLECULE/fix_bond_create.cpp
	M			src/MOLECULE/pair_hbond_dreiding_lj.cpp
	M			src/MOLECULE/pair_hbond_dreiding_morse.cpp
	M			src/MOLECULE/pair_lj_charmm_coul_charmm.cpp
	M			src/Makefile.lib
	M			src/PERI/pair_peri_lps.cpp
	M			src/PERI/pair_peri_pmb.cpp
	M			src/POEMS/fix_poems.cpp
	M			src/REAX/pair_reax.cpp
	M			src/REPLICA/neb.cpp
	M			src/SHOCK/fix_msst.cpp
	M			src/SRD/fix_srd.cpp
	M			src/USER-REAXC/pair_reax_c.cpp
	M			src/XTC/dump_xtc.cpp
	M			src/comm.cpp
	M			src/compute_centro_atom.cpp
	M			src/compute_cluster_atom.cpp
	M			src/compute_coord_atom.cpp
	M			src/compute_group_group.cpp
	M			src/compute_pair_local.cpp
	M			src/compute_property_local.cpp
	M			src/compute_rdf.cpp
	M			src/compute_reduce.cpp
	M			src/compute_reduce_region.cpp
	M			src/delete_atoms.cpp
	M			src/delete_bonds.cpp
	M			src/domain.cpp
	M			src/domain.h
	M			src/dump_cfg.cpp
	M			src/dump_image.cpp
	M			src/dump_image.h
	M			src/dump_local.cpp
	M			src/finish.cpp
	M			src/fix_ave_correlate.cpp
	M			src/fix_box_relax.cpp
	M			src/fix_langevin.cpp
	M			src/fix_minimize.cpp
	M			src/fix_move.cpp
	M			src/fix_nh.cpp
	M			src/fix_nh_sphere.cpp
	M			src/fix_nve_sphere.cpp
	M			src/fix_nvt_sllod.cpp
	M			src/fix_rigid.cpp
	M			src/fix_rigid_nvt.cpp
	M			src/fix_wall_region.cpp
	M			src/input.cpp
	M			src/memory.cpp
	M			src/memory.h
	M			src/min.cpp
	M			src/min_linesearch.cpp
	M			src/min_quickmin.cpp
	M			src/pair.cpp
	M			src/pair_buck_coul_cut.cpp
	M			src/pair_coul_cut.cpp
	M			src/pair_dpd.cpp
	M			src/pair_gauss.cpp
	M			src/pair_lj_cut_coul_cut.cpp
	M			src/pair_lj_gromacs_coul_gromacs.cpp
	M			src/read_data.cpp
	M			src/read_restart.cpp
	M			src/run.cpp
	M			src/set.cpp
	M			src/thermo.cpp
	M			src/update.cpp
	M			src/variable.cpp
	M			src/version.h
	D			tools/lmp2traj
	D			tools/lmp2traj/README.txt
	D			tools/lmp2traj/examples
	D			tools/lmp2traj/examples/dump.atom
	D			tools/lmp2traj/examples/lmp2traj_inp.txt
	D			tools/lmp2traj/examples/output
	D			tools/lmp2traj/examples/output/dump-ang.txt
	D			tools/lmp2traj/examples/output/dump-out.txt
	D			tools/lmp2traj/examples/output/dump-srf.txt
	D			tools/lmp2traj/lmp2traj.f