Homec4science

Merge branch 'master' into lammps-icms

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Oct 12 2012, 14:46.

Description

Merge branch 'master' into lammps-icms

Resolved Conflicts:
doc/Eqs/pair_gauss.jpg
lib/cuda/Makefile.common
lib/cuda/Makefile.defaults
lib/cuda/Makefile.lammps
lib/cuda/cuda_wrapper_cu.h
lib/cuda/pair_cg_cmm_coul_cut_cuda.cu
lib/cuda/pair_cg_cmm_coul_cut_cuda_cu.h
lib/cuda/pair_cg_cmm_coul_debye_cuda.cu
lib/cuda/pair_cg_cmm_coul_debye_cuda_cu.h
lib/cuda/pair_cg_cmm_coul_long_cuda.cu
lib/cuda/pair_cg_cmm_coul_long_cuda_cu.h
lib/cuda/pair_cg_cmm_cuda.cu
lib/cuda/pair_cg_cmm_cuda_cu.h
lib/cuda/pair_cg_cmm_cuda_kernel_nc.cu

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS9a0e9670fb05: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Oct 12 2012, 14:46

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
38ce57cd4a61sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8948 f3b2605a-c512-4ea7… 
Oct 12 2012
132aedce7325pscrozi
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8947 f3b2605a-c512-4ea7… 
Oct 11 2012
e7e6ee3dc5fcsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8946 f3b2605a-c512-4ea7… 
Oct 11 2012
c7aad596d97dsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8945 f3b2605a-c512-4ea7… 
Oct 11 2012
fe10914f334fsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8943 f3b2605a-c512-4ea7… 
Oct 11 2012
55d75a6d4d02sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8942 f3b2605a-c512-4ea7… 
Oct 11 2012
1549cd225695sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8941 f3b2605a-c512-4ea7… 
Oct 11 2012
3f7bd84d3598sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8940 f3b2605a-c512-4ea7… 
Oct 11 2012
a2176cb79bd0sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8939 f3b2605a-c512-4ea7… 
Oct 11 2012
bb6d24d6e66esjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8938 f3b2605a-c512-4ea7… 
Oct 10 2012
6bbadce42db9sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8937 f3b2605a-c512-4ea7… 
Oct 10 2012
963d2f0c4e28sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8935 f3b2605a-c512-4ea7… 
Oct 10 2012
7103e5903bf4sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8934 f3b2605a-c512-4ea7… 
Oct 10 2012
88de4f676023sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8933 f3b2605a-c512-4ea7… 
Oct 10 2012
43a5f76cdcfepscrozi
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8932 f3b2605a-c512-4ea7… 
Oct 10 2012
bf38f77b446dpscrozi
Removing ability to set split order for MSM since it is no longer needed. 
Oct 10 2012
506f99afab74pscrozi
Adding an improved error estimator for MSM. 
Oct 10 2012
c8b5b72c9662sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8928 f3b2605a-c512-4ea7… 
Oct 9 2012
f75a81d1ea1csjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8927 f3b2605a-c512-4ea7… 
Oct 9 2012
19504c309fbesjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8926 f3b2605a-c512-4ea7… 
Oct 9 2012
926699755513sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8925 f3b2605a-c512-4ea7… 
Oct 9 2012
7feb074d6678sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8924 f3b2605a-c512-4ea7… 
Oct 9 2012
b6bfd852cf38sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8923 f3b2605a-c512-4ea7… 
Oct 8 2012
14bcb1e6d00csjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8922 f3b2605a-c512-4ea7… 
Oct 8 2012
856a2374001fsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8921 f3b2605a-c512-4ea7… 
Oct 8 2012
abc9afbec628sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8919 f3b2605a-c512-4ea7… 
Oct 8 2012
c16e9f354573sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8918 f3b2605a-c512-4ea7… 
Oct 8 2012
fe77559b820csjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8917 f3b2605a-c512-4ea7… 
Oct 8 2012
c22237f3959fsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8916 f3b2605a-c512-4ea7… 
Oct 8 2012
f14f768f7119sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8915 f3b2605a-c512-4ea7… 
Oct 6 2012
c01aad8ec21cpscrozi
Minor tweak to docs. 
Oct 5 2012
a921128afda1sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8912 f3b2605a-c512-4ea7… 
Oct 5 2012
ddfb476604efsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8911 f3b2605a-c512-4ea7… 
Oct 5 2012
e909744928ccsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8910 f3b2605a-c512-4ea7… 
Oct 5 2012
b912c81417b7sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8909 f3b2605a-c512-4ea7… 
Oct 5 2012
e27125f93e72sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8908 f3b2605a-c512-4ea7… 
Oct 5 2012
4fbc4692aa3fsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8907 f3b2605a-c512-4ea7… 
Oct 5 2012
20bd1645fa2asjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8905 f3b2605a-c512-4ea7… 
Oct 4 2012
4895715bdd0csjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8904 f3b2605a-c512-4ea7… 
Oct 4 2012
1f9963cb322dsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8902 f3b2605a-c512-4ea7… 
Oct 3 2012
c46a05524197sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8901 f3b2605a-c512-4ea7… 
Oct 3 2012
cf26f5cd130fsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8898 f3b2605a-c512-4ea7… 
Oct 3 2012
5268bcfc304bsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8896 f3b2605a-c512-4ea7… 
Oct 3 2012
19b228875cfcsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8895 f3b2605a-c512-4ea7… 
Oct 3 2012
c8175c91d845sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8894 f3b2605a-c512-4ea7… 
Oct 3 2012
56887bc96f2fsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8893 f3b2605a-c512-4ea7… 
Oct 3 2012
192ba5588f91sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8892 f3b2605a-c512-4ea7… 
Oct 3 2012
7eb3ccf732eesjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8891 f3b2605a-c512-4ea7… 
Oct 3 2012
f0bb1a384ff1sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8890 f3b2605a-c512-4ea7… 
Oct 3 2012
463739fea239sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8889 f3b2605a-c512-4ea7… 
Oct 3 2012