Diffusion lammps e5130b7d36ba

lammps-ro
e5130b7d36ba
Actions

Authored by Mike Brown <wb8@lens-login2.ccs.ornl.gov> on Jun 10 2011, 16:18.

Description

Merge branch 'master' of http://git.icms.temple.edu/lammps-ro

Details

Committed

Mike Brown <wb8@lens-login2.ccs.ornl.gov>

Jun 10 2011, 16:18

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSa0e800130aa7: Merge branch 'master' of http://git.icms.temple.edu/lammps-ro
rLAMMPSda30c193b70e: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6359 f3b2605a-c512-4ea7…

Branches

Unknown

Tags

Unknown

Event Timeline

Mike Brown <wb8@lens-login2.ccs.ornl.gov> committed rLAMMPSe5130b7d36ba: Merge branch 'master' of http://git.icms.temple.edu/lammps-ro (authored by Mike Brown <wb8@lens-login2.ccs.ornl.gov>).Jun 10 2011, 16:18

Merged Changes

Commit	Author	Details	Committed
da30c193b70e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6359 f3b2605a-c512-4ea7…	Jun 9 2011
4583413a2f43	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6358 f3b2605a-c512-4ea7…	Jun 9 2011
4318ca3ed1b6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6356 f3b2605a-c512-4ea7…	Jun 9 2011
74c54b5b62d2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6354 f3b2605a-c512-4ea7…	Jun 9 2011
58fd81713387	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6353 f3b2605a-c512-4ea7…	Jun 9 2011
b9832ba021ff	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6352 f3b2605a-c512-4ea7…	Jun 9 2011
4f10f34cd492	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6351 f3b2605a-c512-4ea7…	Jun 9 2011
9c390bdb4bcb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6350 f3b2605a-c512-4ea7…	Jun 9 2011
3264111ca303	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6349 f3b2605a-c512-4ea7…	Jun 9 2011
d46e44ca5a42	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6348 f3b2605a-c512-4ea7…	Jun 8 2011
a61ddd0f95df	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6347 f3b2605a-c512-4ea7…	Jun 8 2011
1949f9d2ada0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6345 f3b2605a-c512-4ea7…	Jun 8 2011
23984ac78b8e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6344 f3b2605a-c512-4ea7…	Jun 8 2011
1dd6de83cf47	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6343 f3b2605a-c512-4ea7…	Jun 8 2011
76226269f8db	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6342 f3b2605a-c512-4ea7…	Jun 8 2011
2faeae220cfc	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6341 f3b2605a-c512-4ea7…	Jun 8 2011
98ccbe3e6948	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6340 f3b2605a-c512-4ea7…	Jun 8 2011
029f0ee87443	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6339 f3b2605a-c512-4ea7…	Jun 8 2011
b303b5b852cd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6338 f3b2605a-c512-4ea7…	Jun 8 2011
02ea2aaf33a7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6336 f3b2605a-c512-4ea7…	Jun 8 2011
3249c3878030	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6335 f3b2605a-c512-4ea7…	Jun 8 2011
1c3275156a45	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6334 f3b2605a-c512-4ea7…	Jun 8 2011
34b5e9bb74c0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6332 f3b2605a-c512-4ea7…	Jun 8 2011
3cdf9d252c07	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6331 f3b2605a-c512-4ea7…	Jun 8 2011
fed3009dd374	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6330 f3b2605a-c512-4ea7…	Jun 8 2011
b520b0543b11	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6328 f3b2605a-c512-4ea7…	Jun 7 2011
147842df01ab	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6327 f3b2605a-c512-4ea7…	Jun 7 2011
13a2f85dc305	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6326 f3b2605a-c512-4ea7…	Jun 7 2011
4442110c2c16	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6322 f3b2605a-c512-4ea7…	Jun 7 2011
e3ea621984aa	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6321 f3b2605a-c512-4ea7…	Jun 7 2011
a03e730dbc00	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6320 f3b2605a-c512-4ea7…	Jun 7 2011
2a6c75690534	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6319 f3b2605a-c512-4ea7…	Jun 7 2011
a2445e335a96	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6317 f3b2605a-c512-4ea7…	Jun 7 2011
fd57c6d16b72	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6316 f3b2605a-c512-4ea7…	Jun 7 2011
c76fd4256e31	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6315 f3b2605a-c512-4ea7…	Jun 7 2011
2d0469d153d2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6313 f3b2605a-c512-4ea7…	Jun 7 2011
44ec8f6dd15f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6311 f3b2605a-c512-4ea7…	Jun 7 2011
0f2312cafb4f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6310 f3b2605a-c512-4ea7…	Jun 7 2011
9f364a9b4d13	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6309 f3b2605a-c512-4ea7…	Jun 7 2011
b6a266c2d936	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6307 f3b2605a-c512-4ea7…	Jun 7 2011
72a8c632b5f6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6306 f3b2605a-c512-4ea7…	Jun 7 2011
d9824c7583ed	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6305 f3b2605a-c512-4ea7…	Jun 7 2011

Changes (256)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path
	A			doc/Eqs/pair_adp.jpg
	A			doc/Eqs/pair_adp.tex
	A			doc/JPG/dump1.jpg
	A			doc/JPG/dump1_small.jpg
	A			doc/JPG/dump2.jpg
	A			doc/JPG/dump2_small.jpg
	M			doc/Section_accelerate.html
	M			doc/Section_accelerate.txt
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/Section_howto.html
	M			doc/Section_howto.txt
	M			doc/Section_intro.html
	M			doc/Section_intro.txt
	M			doc/Section_start.html
	M			doc/Section_start.txt
	M			doc/compute.html
	M			doc/compute.txt
	M			doc/compute_pe.html
	M			doc/compute_pe.txt
	M			doc/compute_pressure.html
	M			doc/compute_pressure.txt
	A			doc/compute_slice.html
	A			doc/compute_slice.txt
	M			doc/compute_temp.html
	M			doc/compute_temp.txt
	M			doc/compute_temp_partial.html
	M			doc/compute_temp_partial.txt
	M			doc/dump_image.html
	M			doc/dump_image.txt
	M			doc/dump_modify.html
	M			doc/dump_modify.txt
	M			doc/fix_addforce.html
	M			doc/fix_addforce.txt
	M			doc/fix_aveforce.html
	M			doc/fix_aveforce.txt
	M			doc/fix_enforce2d.html
	M			doc/fix_enforce2d.txt
	M			doc/fix_freeze.html
	M			doc/fix_freeze.txt
	M			doc/fix_gravity.html
	M			doc/fix_gravity.txt
	M			doc/fix_nh.html
	M			doc/fix_nh.txt
	M			doc/fix_nve.html
	M			doc/fix_nve.txt
	M			doc/fix_setforce.html
	M			doc/fix_setforce.txt
	M			doc/fix_shake.html
	M			doc/fix_shake.txt
	M			doc/fix_temp_berendsen.html
	M			doc/fix_temp_berendsen.txt
	M			doc/fix_temp_rescale.html
	M			doc/fix_temp_rescale.txt
	M			doc/fix_viscous.html
	M			doc/fix_viscous.txt
	M			doc/kspace_style.html
	M			doc/kspace_style.txt
	A			doc/pair_adp.html
	A			doc/pair_adp.txt
	M			doc/pair_airebo.html
	M			doc/pair_airebo.txt
	M			doc/pair_born.html
	M			doc/pair_born.txt
	M			doc/pair_buck.html
	M			doc/pair_buck.txt
	M			doc/pair_charmm.html
	M			doc/pair_charmm.txt
	M			doc/pair_class2.html
	M			doc/pair_class2.txt
	M			doc/pair_cmm.html
	M			doc/pair_cmm.txt
	M			doc/pair_coeff.html
	M			doc/pair_coeff.txt
	M			doc/pair_coul.html
	M			doc/pair_coul.txt
	M			doc/pair_eam.html
	M			doc/pair_eam.txt
	M			doc/pair_gayberne.html
	M			doc/pair_gayberne.txt
	M			doc/pair_gran.html
	M			doc/pair_gran.txt
	M			doc/pair_gromacs.html
	M			doc/pair_gromacs.txt
	M			doc/pair_lj.html
	M			doc/pair_lj.txt
	M			doc/pair_lj96_cut.html
	M			doc/pair_lj96_cut.txt
	M			doc/pair_lj_coul.html
	M			doc/pair_lj_coul.txt
	M			doc/pair_lj_expand.html
	M			doc/pair_lj_expand.txt
	M			doc/pair_lj_smooth.html
	M			doc/pair_lj_smooth.txt
	M			doc/pair_morse.html
	M			doc/pair_morse.txt
	M			doc/pair_resquared.html
	M			doc/pair_resquared.txt
	M			doc/pair_style.html
	M			doc/pair_style.txt
	M			doc/shell.html
	M			doc/shell.txt
	M			doc/suffix.html
	M			doc/suffix.txt
	M			doc/variable.html
	M			doc/variable.txt
	M			src/ASPHERE/pair_gayberne.cpp
	M			src/ASPHERE/pair_resquared.cpp
	M			src/CLASS2/pair_lj_class2.cpp
	M			src/CLASS2/pair_lj_class2_coul_cut.cpp
	M			src/CLASS2/pair_lj_class2_coul_long.cpp
	M			src/COLLOID/pair_colloid.cpp
	M			src/COLLOID/pair_lubricate.cpp
	M			src/COLLOID/pair_yukawa_colloid.cpp
	M			src/DIPOLE/pair_dipole_cut.cpp
	M			src/GPU/fix_gpu.cpp
	M			src/GRANULAR/pair_gran_hooke.cpp
	M			src/GRANULAR/pair_gran_hooke_history.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_charmm_coul_long.cpp
	M			src/KSPACE/pair_lj_cut_coul_long.cpp
	M			src/KSPACE/pair_lj_cut_coul_long_tip4p.cpp
	M			src/MANYBODY/Install.sh
	M			src/MANYBODY/pair_airebo.cpp
	M			src/MANYBODY/pair_airebo.h
	M			src/MANYBODY/pair_comb.cpp
	M			src/MANYBODY/pair_eam.cpp
	M			src/MANYBODY/pair_eam.h
	P			src/MANYBODY/pair_eam_alloy.h Copied to multiple locations: src/MANYBODY/pair_rebo.cpp src/compute_slice.h
	P			src/MANYBODY/pair_eam_fs.h Copied to src/MANYBODY/pair_rebo.h
	M			src/MANYBODY/pair_eim.cpp
	P			src/MANYBODY/pair_rebo.cpp Copied from src/MANYBODY/pair_eam_alloy.h
	P			src/MANYBODY/pair_rebo.h Copied from src/MANYBODY/pair_eam_fs.h
	M			src/MANYBODY/pair_sw.cpp
	M			src/MANYBODY/pair_tersoff.cpp
	M			src/MEAM/pair_meam.cpp
	M			src/MOLECULE/pair_hbond_dreiding_lj.cpp
	M			src/MOLECULE/pair_lj_charmm_coul_charmm.cpp
	M			src/MOLECULE/pair_lj_charmm_coul_charmm_implicit.cpp
	M			src/OPT/pair_eam_opt.h
	M			src/OPT/pair_lj_charmm_coul_long_opt.h
	M			src/OPT/pair_lj_cut_opt.h
	M			src/OPT/pair_morse_opt.h
	M			src/PERI/pair_peri_lps.cpp
	M			src/PERI/pair_peri_pmb.cpp
	M			src/REAX/pair_reax.cpp
	M			src/USER-CD-EAM/pair_cdeam.cpp
	M			src/USER-CG-CMM/pair_cmm_common.h
	M			src/USER-CUDA/atom_vec_angle_cuda.cpp
	M			src/USER-CUDA/atom_vec_atomic_cuda.cpp
	M			src/USER-CUDA/atom_vec_charge_cuda.cpp
	M			src/USER-CUDA/atom_vec_full_cuda.cpp
	M			src/USER-CUDA/comm_cuda.cpp
	M			src/USER-CUDA/compute_pressure_cuda.cpp
	M			src/USER-CUDA/compute_temp_cuda.cpp
	M			src/USER-CUDA/compute_temp_partial_cuda.cpp
	M			src/USER-CUDA/cuda_neigh_list.cpp
	M			src/USER-CUDA/domain_cuda.cpp
	M			src/USER-CUDA/fix_addforce_cuda.cpp
	M			src/USER-CUDA/fix_aveforce_cuda.cpp
	M			src/USER-CUDA/fix_enforce2d_cuda.cpp
	M			src/USER-CUDA/fix_freeze_cuda.cpp
	M			src/USER-CUDA/fix_gravity_cuda.cpp
	M			src/USER-CUDA/fix_nh_cuda.cpp
	M			src/USER-CUDA/fix_npt_cuda.cpp
	M			src/USER-CUDA/fix_nve_cuda.cpp
	M			src/USER-CUDA/fix_set_force_cuda.cpp
	M			src/USER-CUDA/fix_shake_cuda.cpp
	M			src/USER-CUDA/fix_temp_berendsen_cuda.cpp
	M			src/USER-CUDA/fix_temp_rescale_cuda.cpp
	M			src/USER-CUDA/fix_temp_rescale_limit_cuda.cpp
	M			src/USER-CUDA/fix_viscous_cuda.cpp
	M			src/USER-CUDA/modify_cuda.cpp
	M			src/USER-CUDA/neighbor_cuda.cpp
	M			src/USER-CUDA/pair_born_coul_long_cuda.cpp
	M			src/USER-CUDA/pair_buck_coul_cut_cuda.cpp
	M			src/USER-CUDA/pair_buck_coul_long_cuda.cpp
	M			src/USER-CUDA/pair_buck_cuda.cpp
	M			src/USER-CUDA/pair_cg_cmm_coul_cut_cuda.cpp
	M			src/USER-CUDA/pair_cg_cmm_coul_debye_cuda.cpp
	M			src/USER-CUDA/pair_cg_cmm_coul_long_cuda.cpp
	M			src/USER-CUDA/pair_cg_cmm_cuda.cpp
	M			src/USER-CUDA/pair_eam_alloy_cuda.cpp
	M			src/USER-CUDA/pair_eam_cuda.cpp
	M			src/USER-CUDA/pair_eam_fs_cuda.cpp
	M			src/USER-CUDA/pair_gran_hooke_cuda.cpp
	M			src/USER-CUDA/pair_lj96_cut_cuda.cpp
	M			src/USER-CUDA/pair_lj_charmm_coul_charmm_cuda.cpp
	M			src/USER-CUDA/pair_lj_charmm_coul_charmm_implicit_cuda.cpp
	M			src/USER-CUDA/pair_lj_charmm_coul_long_cuda.cpp
	M			src/USER-CUDA/pair_lj_class2_coul_cut_cuda.cpp
	M			src/USER-CUDA/pair_lj_class2_coul_long_cuda.cpp
	M			src/USER-CUDA/pair_lj_class2_cuda.cpp
	M			src/USER-CUDA/pair_lj_cut_coul_cut_cuda.cpp
	M			src/USER-CUDA/pair_lj_cut_coul_debye_cuda.cpp
	M			src/USER-CUDA/pair_lj_cut_coul_long_cuda.cpp
	M			src/USER-CUDA/pair_lj_cut_cuda.cpp
	M			src/USER-CUDA/pair_lj_cut_experimental_cuda.cpp
	M			src/USER-CUDA/pair_lj_expand_cuda.cpp
	M			src/USER-CUDA/pair_lj_gromacs_coul_gromacs_cuda.cpp
	M			src/USER-CUDA/pair_lj_gromacs_cuda.cpp
	M			src/USER-CUDA/pair_lj_smooth_cuda.cpp
	M			src/USER-CUDA/pair_morse_cuda.cpp
	M			src/USER-CUDA/pppm_cuda.cpp
	M			src/USER-CUDA/verlet_cuda.cpp
	M			src/USER-EFF/pair_eff_cut.cpp
	M			src/USER-EWALDN/pair_buck_coul.cpp
	M			src/USER-EWALDN/pair_lj_coul.cpp
	M			src/USER-REAXC/pair_reax_c.cpp
	M			src/comm.cpp
	M			src/comm.h
	A			src/compute_slice.cpp
	P			src/compute_slice.h Copied from src/MANYBODY/pair_eam_alloy.h
	M			src/domain.cpp
	M			src/domain.h
	M			src/dump.cpp
	M			src/dump.h
	M			src/dump_cfg.cpp
	M			src/dump_custom.cpp
	M			src/dump_custom.h
	A			src/dump_image.cpp
	A			src/dump_image.h
	M			src/force.cpp
	M			src/input.cpp
	M			src/lammps.cpp
	M			src/memory.h
	M			src/modify.cpp
	M			src/pair.cpp
	M			src/pair.h
	M			src/pair_born.cpp
	M			src/pair_buck.cpp
	M			src/pair_buck_coul_cut.cpp
	M			src/pair_coul_cut.cpp
	M			src/pair_coul_debye.cpp
	M			src/pair_dpd.cpp
	M			src/pair_dpd_tstat.cpp
	M			src/pair_gauss.cpp
	M			src/pair_hybrid.cpp
	M			src/pair_lj96_cut.cpp
	M			src/pair_lj_cut.cpp
	M			src/pair_lj_cut_coul_cut.cpp
	M			src/pair_lj_cut_coul_debye.cpp
	M			src/pair_lj_expand.cpp
	M			src/pair_lj_gromacs.cpp
	M			src/pair_lj_gromacs_coul_gromacs.cpp
	M			src/pair_lj_smooth.cpp
	M			src/pair_morse.cpp
	M			src/pair_soft.cpp
	M			src/pair_table.cpp
	M			src/pair_yukawa.cpp
	M			src/update.cpp
	M			src/verlet.cpp
	M			src/version.h
	M			tools/restart2data.cpp