Diffusion lammps 20d10c6590b8

lammps
20d10c6590b8
Actions

Authored by W. Michael Brown <brownw@ornl.gov> on Jan 21 2011, 17:04.

Description

Merge ssh://yona.ccs.ornl.gov/~/git/lammps

Conflicts:
src/GPU/Install.sh

Details

Committed

W. Michael Brown <brownw@ornl.gov>

Jan 21 2011, 17:04

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS15742bec1e97: Merge branch 'master' of http://git.icms.temple.edu/lammps-ro
rLAMMPS64f71106f70a: Fixed makefile to correctly remove files.

Branches

Unknown

Tags

Unknown

Event Timeline

W. Michael Brown <brownw@ornl.gov> committed rLAMMPS20d10c6590b8: Merge ssh://yona.ccs.ornl.gov/~/git/lammps (authored by W. Michael Brown <brownw@ornl.gov>).Jan 21 2011, 17:04

Merged Changes

Commit	Author	Details	Committed
15742bec1e97	Mike Brown	Merge branch 'master' of http://git.icms.temple.edu/lammps-ro	Jan 21 2011
fa235e847c18	athomps	Changed sign on shrink_check formula	Jan 20 2011
c22b22a96868	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5569 f3b2605a-c512-4ea7…	Jan 19 2011
4bb294e857e1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5568 f3b2605a-c512-4ea7…	Jan 19 2011
460976db717e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5567 f3b2605a-c512-4ea7…	Jan 19 2011
4b8beadb2ff6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5566 f3b2605a-c512-4ea7…	Jan 19 2011
481e1705adc2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5563 f3b2605a-c512-4ea7…	Jan 18 2011
de9dfe44d45b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5562 f3b2605a-c512-4ea7…	Jan 18 2011
84772682105e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5554 f3b2605a-c512-4ea7…	Jan 14 2011
588574343953	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5553 f3b2605a-c512-4ea7…	Jan 14 2011
e969f7cd30a4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5552 f3b2605a-c512-4ea7…	Jan 14 2011
18b821f1d0d4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5551 f3b2605a-c512-4ea7…	Jan 14 2011
57f91d6e5504	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5549 f3b2605a-c512-4ea7…	Jan 14 2011
9b00fc4b997d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5548 f3b2605a-c512-4ea7…	Jan 14 2011
d5b494397e8e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5547 f3b2605a-c512-4ea7…	Jan 14 2011
353439c4148f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5546 f3b2605a-c512-4ea7…	Jan 14 2011
a499b28469f3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5545 f3b2605a-c512-4ea7…	Jan 12 2011
9e1bc37b778e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5543 f3b2605a-c512-4ea7…	Jan 12 2011
11e80405e13f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5542 f3b2605a-c512-4ea7…	Jan 12 2011
c837659cdb7f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5541 f3b2605a-c512-4ea7…	Jan 12 2011
52e878248216	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5540 f3b2605a-c512-4ea7…	Jan 12 2011
c29290159488	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5539 f3b2605a-c512-4ea7…	Jan 12 2011
2228473d0321	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5538 f3b2605a-c512-4ea7…	Jan 12 2011
8f2257ecbf12	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5537 f3b2605a-c512-4ea7…	Jan 12 2011
9cd3b0f28dc1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5535 f3b2605a-c512-4ea7…	Jan 12 2011
0e342bae4288	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5534 f3b2605a-c512-4ea7…	Jan 11 2011
c2b29e6caad0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5532 f3b2605a-c512-4ea7…	Jan 11 2011
0a7413853ed4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5531 f3b2605a-c512-4ea7…	Jan 11 2011
fe81632989ef	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5530 f3b2605a-c512-4ea7…	Jan 11 2011
fd33d2944213	W. Michael Brown	Removing msm, openmp, and k-space stuff for LAMMPS patch.	Jan 11 2011
56f9e680c6ce	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5529 f3b2605a-c512-4ea7…	Jan 11 2011
81f821578b0b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5528 f3b2605a-c512-4ea7…	Jan 11 2011
9f55cc26d9cc	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5527 f3b2605a-c512-4ea7…	Jan 11 2011
60b4b9eaa739	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5526 f3b2605a-c512-4ea7…	Jan 11 2011

Changes (96)

				Path
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/neb.html
	M			doc/neb.txt
	M			doc/pair_reax.html
	M			doc/pair_reax.txt
	M			doc/set.html
	M			doc/set.txt
	M			doc/special_bonds.html
	M			doc/special_bonds.txt
	M			doc/velocity.html
	M			doc/velocity.txt
	M			lib/gpu/Makefile.lens
	M			lib/gpu/Nvidia.makefile
	D			lib/gpu/cmmc_msm_gpu.cpp
	D			lib/gpu/cmmc_msm_gpu_kernel.cu
	D			lib/gpu/cmmc_msm_gpu_memory.cpp
	D			lib/gpu/cmmc_msm_gpu_memory.h
	M			lib/gpu/pair_gpu_device.cpp
	M			src/CLASS2/dihedral_class2.cpp
	M			src/CLASS2/improper_class2.cpp
	M			src/GPU/Install.sh
	M			src/GPU/fix_gpu.cpp
	M			src/GPU/pair_cg_cmm_coul_long_gpu.cpp
	D			src/GPU/pair_cg_cmm_coul_msm.cpp
	D			src/GPU/pair_cg_cmm_coul_msm.h
	D			src/GPU/pair_cg_cmm_coul_msm_gpu.cpp
	D			src/GPU/pair_cg_cmm_coul_msm_gpu.h
	M			src/GPU/pair_cg_cmm_gpu.cpp
	M			src/GPU/pair_gayberne_gpu.cpp
	M			src/GPU/pair_lj96_cut_gpu.cpp
	M			src/GPU/pair_lj_charmm_coul_long_gpu.cpp
	M			src/GPU/pair_lj_cut_coul_cut_gpu.cpp
	M			src/GPU/pair_lj_cut_coul_long_gpu.cpp
	M			src/GPU/pair_lj_cut_gpu.cpp
	D			src/GPU/pair_lj_cut_tgpu.cpp
	D			src/GPU/pair_lj_cut_tgpu.h
	D			src/GPU/pair_omp_gpu.cpp
	D			src/GPU/pair_omp_gpu.h
	D			src/GPU/pppm_gpu.cpp
	D			src/GPU/pppm_gpu.h
	M			src/KSPACE/fft3d.cpp
	M			src/MANYBODY/fix_qeq_comb.cpp
	M			src/MOLECULE/bond_fene.cpp
	M			src/MOLECULE/bond_fene_expand.cpp
	M			src/MOLECULE/dihedral_charmm.cpp
	M			src/MOLECULE/dihedral_harmonic.cpp
	M			src/MOLECULE/dihedral_helix.cpp
	M			src/MOLECULE/dihedral_multi_harmonic.cpp
	M			src/MOLECULE/dihedral_opls.cpp
	M			src/MOLECULE/improper_cvff.cpp
	M			src/MOLECULE/improper_harmonic.cpp
	M			src/MOLECULE/improper_umbrella.cpp
	M			src/REAX/fix_reax_bonds.cpp
	M			src/REAX/fix_reax_bonds.h
	M			src/REPLICA/fix_event_tad.cpp
	M			src/REPLICA/neb.cpp
	M			src/REPLICA/prd.cpp
	M			src/REPLICA/tad.cpp
	M			src/REPLICA/temper.cpp
	M			src/SRD/fix_srd.cpp
	M			src/create_atoms.cpp
	M			src/delete_atoms.cpp
	M			src/delete_bonds.cpp
	M			src/displace_atoms.cpp
	M			src/displace_box.cpp
	M			src/dump.cpp
	M			src/dump_atom.cpp
	M			src/dump_custom.cpp
	M			src/dump_local.cpp
	M			src/dump_xyz.cpp
	M			src/finish.cpp
	M			src/fix_ave_correlate.cpp
	M			src/fix_ave_histo.cpp
	M			src/fix_ave_spatial.cpp
	M			src/fix_ave_time.cpp
	M			src/fix_dt_reset.h
	M			src/fix_orient_fcc.cpp
	M			src/fix_shake.cpp
	M			src/fix_tmd.cpp
	M			src/lmptype.h
	M			src/minimize.cpp
	M			src/neigh_bond.cpp
	M			src/neighbor.cpp
	M			src/neighbor.h
	M			src/output.cpp
	M			src/read_data.cpp
	M			src/read_restart.cpp
	M			src/replicate.cpp
	M			src/run.cpp
	M			src/set.cpp
	M			src/thermo.cpp
	M			src/variable.cpp
	M			src/velocity.cpp
	M			src/version.h
	M			src/write_restart.cpp