Diffusion lammps 54958483452e

lammps-ro
54958483452e
Actions

Authored by Mike Brown <wb8@lens-login1.ccs.ornl.gov> on May 24 2011, 17:31.

Description

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

Conflicts:
src/GPU/Install.sh

Details

Committed

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

May 24 2011, 17:31

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSca07ef393ee8: Changing Makefile.jaguar back to dist.
rLAMMPSdde38662d21d: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6215 f3b2605a-c512-4ea7…

Branches

Unknown

Tags

Unknown

Event Timeline

Mike Brown <wb8@lens-login1.ccs.ornl.gov> committed rLAMMPS54958483452e: Merge branch 'master' of http://git.icms.temple.edu/lammps-ro (authored by Mike Brown <wb8@lens-login1.ccs.ornl.gov>).May 24 2011, 17:31

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

Commit	Author	Details	Committed
dde38662d21d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6215 f3b2605a-c512-4ea7…	May 24 2011
2ddc39d3d819	athomps	Added equations for inverse box transformation	May 23 2011
1c79295aa1f3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6212 f3b2605a-c512-4ea7…	May 23 2011
94884d513bcb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6210 f3b2605a-c512-4ea7…	May 23 2011
e97e40698a19	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6209 f3b2605a-c512-4ea7…	May 23 2011
69786dc452eb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6208 f3b2605a-c512-4ea7…	May 23 2011
415a308210ec	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6206 f3b2605a-c512-4ea7…	May 21 2011
de61f3db323c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6205 f3b2605a-c512-4ea7…	May 21 2011
c6e661ddba3e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6204 f3b2605a-c512-4ea7…	May 21 2011
66c5a33eff54	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6202 f3b2605a-c512-4ea7…	May 21 2011
ad89319d7c5e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6201 f3b2605a-c512-4ea7…	May 21 2011
47eae4052fa9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6199 f3b2605a-c512-4ea7…	May 21 2011
813ffdc80dcf	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6198 f3b2605a-c512-4ea7…	May 21 2011
157ffd67ae38	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6197 f3b2605a-c512-4ea7…	May 21 2011
3ae193256b4a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6196 f3b2605a-c512-4ea7…	May 21 2011
91b6d45b539b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6195 f3b2605a-c512-4ea7…	May 21 2011
f7eefa416ec1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6194 f3b2605a-c512-4ea7…	May 21 2011
a764a2e14190	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6193 f3b2605a-c512-4ea7…	May 20 2011
06ffbc8f0a0f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6192 f3b2605a-c512-4ea7…	May 20 2011
2739d7ee1d72	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6191 f3b2605a-c512-4ea7…	May 20 2011
dffb8b2a8917	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6190 f3b2605a-c512-4ea7…	May 20 2011
4d79e92cb164	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6189 f3b2605a-c512-4ea7…	May 20 2011
5a5cfcc81b18	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6188 f3b2605a-c512-4ea7…	May 20 2011
b40cd20066c7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6187 f3b2605a-c512-4ea7…	May 20 2011
717139ef0f0c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6186 f3b2605a-c512-4ea7…	May 20 2011
ab5508e3c876	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6185 f3b2605a-c512-4ea7…	May 20 2011
db07c0365272	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6184 f3b2605a-c512-4ea7…	May 20 2011
3d149b467602	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6183 f3b2605a-c512-4ea7…	May 20 2011
721570617ed3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6182 f3b2605a-c512-4ea7…	May 20 2011
8ce1721b6a1e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6181 f3b2605a-c512-4ea7…	May 20 2011
e5693fb5db2d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6180 f3b2605a-c512-4ea7…	May 20 2011
f99f92332049	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6179 f3b2605a-c512-4ea7…	May 20 2011
9879ce34aa53	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6178 f3b2605a-c512-4ea7…	May 20 2011
fce3d4b87529	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6177 f3b2605a-c512-4ea7…	May 20 2011
ae3bb4a81ecd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6176 f3b2605a-c512-4ea7…	May 20 2011
033b04a9699c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6175 f3b2605a-c512-4ea7…	May 20 2011
9573dfcea03b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6174 f3b2605a-c512-4ea7…	May 20 2011
add7cba329c4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6173 f3b2605a-c512-4ea7…	May 20 2011
b02b7636fbf7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6172 f3b2605a-c512-4ea7…	May 20 2011
4d53daece896	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6171 f3b2605a-c512-4ea7…	May 20 2011
8664dffaa61b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6170 f3b2605a-c512-4ea7…	May 20 2011
064bf3b8f7e0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6169 f3b2605a-c512-4ea7…	May 20 2011
478b1f979469	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6168 f3b2605a-c512-4ea7…	May 20 2011
dbf6c1542ec6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6167 f3b2605a-c512-4ea7…	May 20 2011
7bef76d7f237	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6166 f3b2605a-c512-4ea7…	May 20 2011
c41b9fa472e6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6165 f3b2605a-c512-4ea7…	May 20 2011
4b6f064dd72c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6164 f3b2605a-c512-4ea7…	May 20 2011
a89bb79df3a6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6163 f3b2605a-c512-4ea7…	May 20 2011
1ca6e02a86c5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6162 f3b2605a-c512-4ea7…	May 20 2011
cec89647a4c1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6161 f3b2605a-c512-4ea7…	May 20 2011

Changes (119)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path
	A			doc/Eqs/box_inverse.jpg
	A			doc/Eqs/box_inverse.tex
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/Section_howto.html
	M			doc/Section_start.html
	M			doc/Section_start.txt
	A			doc/accelerator.html
	A			doc/accelerator.txt
	M			doc/compute_group_group.html
	M			doc/compute_group_group.txt
	M			doc/fix_adapt.html
	M			doc/fix_adapt.txt
	M			doc/fix_gpu.html
	M			doc/fix_gpu.txt
	M			examples/reax/control.reax_c.tatb
	M			lib/gpu/Makefile.linux
	M			lib/gpu/README
	M			lib/gpu/cmm_cut_gpu_kernel.cu
	M			lib/gpu/cmmc_long_gpu_kernel.cu
	M			lib/gpu/crml_gpu_kernel.cu
	M			lib/gpu/gb_gpu_kernel_nbor.cu
	M			lib/gpu/geryon/ucl_nv_kernel.h
	M			lib/gpu/lj96_cut_gpu_kernel.cu
	M			lib/gpu/lj_cut_gpu_kernel.cu
	M			lib/gpu/lj_expand_gpu_kernel.cu
	M			lib/gpu/ljc_cut_gpu_kernel.cu
	M			lib/gpu/ljcl_cut_gpu_kernel.cu
	M			lib/gpu/morse_gpu_kernel.cu
	M			lib/gpu/pair_gpu_atom_kernel.cu
	M			lib/gpu/pair_gpu_device.cpp
	M			lib/gpu/pair_gpu_device.h
	M			lib/gpu/pppm_gpu_kernel.cu
	M			lib/gpu/pppm_gpu_memory.cpp
	M			src/ASPHERE/Install.sh
	M			src/ASPHERE/pair_resquared.cpp
	M			src/CLASS2/pair_lj_class2.h
	M			src/CLASS2/pair_lj_class2_coul_cut.h
	M			src/CLASS2/pair_lj_class2_coul_long.h
	A			src/Depend.sh
	M			src/GPU/Install.sh
	M			src/GRANULAR/fix_pour.h
	M			src/GRANULAR/pair_gran_hooke_history.h
	M			src/KSPACE/Install.sh
	M			src/KSPACE/pair_born_coul_long.h
	M			src/KSPACE/pair_buck_coul_long.h
	M			src/KSPACE/pppm.h
	M			src/MAKE/Makefile.g++
	M			src/MANYBODY/Install.sh
	M			src/MEAM/Install.sh
	M			src/MOLECULE/atom_vec_angle.h
	M			src/MOLECULE/atom_vec_full.h
	M			src/MOLECULE/pair_lj_charmm_coul_charmm.h
	M			src/Makefile
	M			src/Makefile.package.empty
	M			src/OPT/Install.sh
	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/atom_vec_peri.cpp
	M			src/POEMS/Install.sh
	M			src/REAX/Install.sh
	M			src/USER-ATC/Install.sh
	M			src/USER-CG-CMM/Install.sh
	M			src/USER-EFF/atom_vec_electron.cpp
	A			src/accelerator.h
	M			src/atom.cpp
	M			src/atom.h
	M			src/atom_vec.h
	M			src/atom_vec_atomic.h
	M			src/atom_vec_charge.h
	M			src/atom_vec_hybrid.cpp
	M			src/atom_vec_sphere.cpp
	M			src/comm.cpp
	M			src/comm.h
	M			src/compute.cpp
	M			src/compute.h
	M			src/compute_pressure.h
	M			src/compute_temp_partial.h
	M			src/domain.h
	M			src/fix.cpp
	M			src/fix.h
	M			src/fix_adapt.cpp
	M			src/fix_nve.h
	M			src/fix_rigid_nve.cpp
	M			src/fix_rigid_nvt.cpp
	M			src/fix_viscous.h
	M			src/fix_wall_lj126.h
	M			src/fix_wall_reflect.h
	M			src/force.cpp
	M			src/force.h
	M			src/group.cpp
	M			src/input.cpp
	M			src/input.h
	M			src/lammps.cpp
	M			src/lammps.h
	M			src/math_extra.h
	M			src/modify.cpp
	M			src/modify.h
	M			src/neigh_list.h
	M			src/neigh_request.cpp
	M			src/neigh_request.h
	M			src/neighbor.cpp
	M			src/neighbor.h
	M			src/output.cpp
	M			src/pair.cpp
	M			src/pair_buck.h
	M			src/pair_hybrid.cpp
	M			src/pair_lj_cut_coul_debye.h
	M			src/pair_lj_smooth.h
	M			src/thermo.cpp
	M			src/thermo.h
	M			src/update.cpp
	M			src/update.h
	M			src/verlet.h
	M			src/version.h
	M			tools/reax/README.txt
	A			tools/reax/reaxc_bond.pl