Homec4science

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

Authored by Mike Brown <wb8@lens-login3.ccs.ornl.gov> on Dec 14 2011, 19:17.

Description

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

Conflicts:
doc/Section_commands.txt
doc/pair_coul.txt
lib/gpu/Makefile.firefly
lib/gpu/Makefile.firefly_opencl
lib/gpu/Nvidia.makefile
lib/gpu/Opencl.makefile
lib/gpu/lal_atom.cpp
lib/gpu/lal_atom.h
lib/gpu/lal_cg_cmm.cpp
lib/gpu/lal_cg_cmm.cu
lib/gpu/lal_cg_cmm.h
lib/gpu/lal_cg_cmm_ext.cpp
lib/gpu/lal_cg_cmm_long.cpp
lib/gpu/lal_cg_cmm_long.cu
lib/gpu/lal_cg_cmm_long.h
lib/gpu/lal_cg_cmm_long_ext.cpp
lib/gpu/lal_cg_cmm_msm.cpp
lib/gpu/lal_cg_cmm_msm.cu
lib/gpu/lal_cg_cmm_msm.h
lib/gpu/lal_cg_cmm_msm_ext.cpp
lib/gpu/lal_device.cpp
lib/gpu/lal_neighbor_gpu.cu
lib/gpu/lal_precision.h
lib/gpu/lal_preprocessor.h
lib/gpu/replace_code.sh
src/GPU/pair_cg_cmm_coul_msm_gpu.cpp
src/GPU/pair_lj_cut_coul_long_gpu.cpp
src/GPU/pair_lj_cut_tgpu.cpp
src/GPU/pair_lj_sdk_coul_long_gpu.cpp
src/GPU/pair_lj_sdk_gpu.cpp
src/USER-OMP/pair_lj_sdk_coul_long_omp.h
src/USER-OMP/pair_rebo_omp.cpp
src/USER-OMP/pair_rebo_omp.h
src/USER-OMP/pair_tri_lj_omp.h
src/USER-OMP/pppm_proxy.h
src/USER-OMP/pppm_tip4p_proxy.h
src/comm.cpp
src/comm.h
src/neighbor.h

Event Timeline

Mike Brown <wb8@lens-login3.ccs.ornl.gov> committed rLAMMPSc8f9dde96262: Merge branch 'master' of http://git.icms.temple.edu/lammps-ro (authored by Mike Brown <wb8@lens-login3.ccs.ornl.gov>).Dec 14 2011, 19:17

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
ad9fa0e18743sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7361 f3b2605a-c512-4ea7… 
Dec 13 2011
8068e88f0ca4sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7360 f3b2605a-c512-4ea7… 
Dec 13 2011
28b1e0de2badsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7359 f3b2605a-c512-4ea7… 
Dec 13 2011
25ea036d7df5sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7358 f3b2605a-c512-4ea7… 
Dec 13 2011
62e304c0d325sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7357 f3b2605a-c512-4ea7… 
Dec 13 2011
7e6755866f77sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7356 f3b2605a-c512-4ea7… 
Dec 13 2011
37ed3d917e88sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7355 f3b2605a-c512-4ea7… 
Dec 13 2011
ae6318ce2955sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7354 f3b2605a-c512-4ea7… 
Dec 13 2011
b294de40f9f7sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7353 f3b2605a-c512-4ea7… 
Dec 13 2011
eb04caa0548asjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7351 f3b2605a-c512-4ea7… 
Dec 13 2011
3870fcb2917asjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7350 f3b2605a-c512-4ea7… 
Dec 13 2011
eeb5ad77e617sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7348 f3b2605a-c512-4ea7… 
Dec 13 2011
2f7c6cfb0debsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7347 f3b2605a-c512-4ea7… 
Dec 13 2011
47c30ce47cbfsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7346 f3b2605a-c512-4ea7… 
Dec 13 2011
a866ec3edbd8sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7345 f3b2605a-c512-4ea7… 
Dec 13 2011
dfdc3fe1a2d4sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7344 f3b2605a-c512-4ea7… 
Dec 13 2011
3d36d38a5183sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7343 f3b2605a-c512-4ea7… 
Dec 13 2011
9b72a103ea29sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7342 f3b2605a-c512-4ea7… 
Dec 13 2011
8325ae695402sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7341 f3b2605a-c512-4ea7… 
Dec 13 2011
86347b81e32fsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7340 f3b2605a-c512-4ea7… 
Dec 13 2011
744efbc2cd5dsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7339 f3b2605a-c512-4ea7… 
Dec 13 2011
adbeb0277bb2sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7336 f3b2605a-c512-4ea7… 
Dec 10 2011
43a79f1a5690sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7335 f3b2605a-c512-4ea7… 
Dec 9 2011
58c001ef73d8sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7334 f3b2605a-c512-4ea7… 
Dec 9 2011
5baa07d3afe1sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7333 f3b2605a-c512-4ea7… 
Dec 9 2011
7060c62c8d43sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7332 f3b2605a-c512-4ea7… 
Dec 9 2011
3ad813f0323bsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7331 f3b2605a-c512-4ea7… 
Dec 9 2011
7eccb3b489b6sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7330 f3b2605a-c512-4ea7… 
Dec 9 2011
cb224643d789sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7328 f3b2605a-c512-4ea7… 
Dec 9 2011
e354f748479esjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7327 f3b2605a-c512-4ea7… 
Dec 9 2011
c92047aeb5ecsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7326 f3b2605a-c512-4ea7… 
Dec 9 2011
5fa4f2eb2651sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7325 f3b2605a-c512-4ea7… 
Dec 9 2011
62b27e591539sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7324 f3b2605a-c512-4ea7… 
Dec 9 2011
650607a38bc0sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7323 f3b2605a-c512-4ea7… 
Dec 9 2011
1f81fcf5e450sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7322 f3b2605a-c512-4ea7… 
Dec 9 2011
bca92d41bdb5sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7321 f3b2605a-c512-4ea7… 
Dec 9 2011
f56f6a1a9dd4sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7320 f3b2605a-c512-4ea7… 
Dec 9 2011
91388f635f9asjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7319 f3b2605a-c512-4ea7… 
Dec 9 2011
501eb48d5b90sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7318 f3b2605a-c512-4ea7… 
Dec 9 2011
4a2feb25b2ecsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7317 f3b2605a-c512-4ea7… 
Dec 9 2011
96e9210c160fsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7316 f3b2605a-c512-4ea7… 
Dec 8 2011
6b4fd6d47c6bsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7315 f3b2605a-c512-4ea7… 
Dec 8 2011
e1f70c3a98c0sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7314 f3b2605a-c512-4ea7… 
Dec 8 2011
e08627bdc8f1sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7312 f3b2605a-c512-4ea7… 
Dec 8 2011
b1334c1314besjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7311 f3b2605a-c512-4ea7… 
Dec 8 2011
16a2afc64205sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7310 f3b2605a-c512-4ea7… 
Dec 8 2011
9692aa6aaf07sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7309 f3b2605a-c512-4ea7… 
Dec 8 2011
d17a9d5b0a15sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7307 f3b2605a-c512-4ea7… 
Dec 8 2011
4639a1af5790sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7305 f3b2605a-c512-4ea7… 
Dec 8 2011
9224da83abcesjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7303 f3b2605a-c512-4ea7… 
Dec 8 2011