Homec4science
Diffusion lammps 9259ae869929

Merge branch 'master' into lammps-icms
9259ae869929
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jan 1 2012, 01:07.

Description

Merge branch 'master' into lammps-icms

Resolved Conflicts:
doc/Eqs/pair_coul_diel.jpg
doc/Section_commands.html
doc/Section_commands.txt
doc/pair_coul_diel.html
doc/pair_coul_diel.txt
doc/processors.html
doc/processors.txt
examples/USER/imd/bucky_cnt_imd.vmd
examples/USER/imd/in.bucky-plus-cnt
examples/USER/imd/in.deca-ala-solv_imd
examples/USER/imd/in.deca-ala_imd
lib/gpu/Makefile.fermi
lib/gpu/Makefile.lincoln
lib/gpu/Makefile.longhorn
lib/gpu/Makefile.serial
lib/gpu/geryon/VERSION.txt
lib/gpu/pair_gpu_device.cpp
src/ASPHERE/atom_vec_ellipsoid.cpp
src/CLASS2/Install.sh
src/COLLOID/atom_vec_colloid.cpp
src/DIPOLE/atom_vec_dipole.cpp
src/GPU/fix_gpu.cpp
src/GRANULAR/atom_vec_granular.cpp
src/GRANULAR/fix_pour.h
src/KSPACE/Install.sh
src/KSPACE/fft3d.cpp
src/KSPACE/fft3d.h
src/KSPACE/kissfft.h
src/KSPACE/pppm.cpp
src/KSPACE/pppm.h
src/KSPACE/pppm_tip4p.cpp
src/MAKE/Makefile.openmpi
src/MAKE/Makefile.serial
src/MANYBODY/pair_airebo.cpp
src/MANYBODY/pair_comb.cpp
src/MANYBODY/pair_eam.cpp
src/MANYBODY/pair_eim.cpp
src/MANYBODY/pair_sw.cpp
src/MANYBODY/pair_tersoff.cpp
src/MANYBODY/pair_tersoff_zbl.cpp
src/MOLECULE/atom_vec_angle.cpp
src/MOLECULE/atom_vec_bond.cpp
src/MOLECULE/atom_vec_full.cpp
src/MOLECULE/atom_vec_molecular.cpp
src/Makefile
src/Makefile.lib
src/PERI/atom_vec_peri.cpp
src/USER-CG-CMM/Install.sh
src/USER-IMD/README
src/USER-IMD/fix_imd.cpp
src/USER-IMD/fix_imd.h
src/USER-SMD/Install.sh
src/atom_vec_atomic.cpp
src/atom_vec_charge.cpp
src/comm.cpp
src/finish.cpp
src/fix_box_relax.cpp
src/fix_deposit.cpp
src/fix_spring_self.cpp
src/fix_store_state.cpp
src/fix_wall.cpp
src/fix_wall_reflect.cpp
src/input.cpp
src/input.h
src/memory.cpp
src/memory.h
src/pair_lj_cut.cpp
tools/restart2data.cpp

Details

Committed
Axel Kohlmeyer <akohlmey@gmail.com>Jan 1 2012, 01:07
Pushed
jungeOct 6 2016, 16:49
Parents
rLAMMPSadbeb0277bb2: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7336 f3b2605a-c512-4ea7…
rLAMMPS72c3988b9aab: avoid an MPI_Allreduce() in pppm and pppm/cg.
Branches
Unknown
Tags
Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS9259ae869929: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jan 1 2012, 01:07

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
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
65c85ffb99f5sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7302 f3b2605a-c512-4ea7… 
Dec 8 2011
4f79dab7b3e2sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7301 f3b2605a-c512-4ea7… 
Dec 8 2011
4810127eba12sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7300 f3b2605a-c512-4ea7… 
Dec 8 2011
b45c5af22020sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7299 f3b2605a-c512-4ea7… 
Dec 8 2011
6e49ba9d3b62sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7298 f3b2605a-c512-4ea7… 
Dec 6 2011
8b1ab26c0be8sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7297 f3b2605a-c512-4ea7… 
Dec 6 2011
d8449c71012esjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7296 f3b2605a-c512-4ea7… 
Dec 2 2011
666e5f981568sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7294 f3b2605a-c512-4ea7… 
Dec 2 2011
84c9ab280454sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7293 f3b2605a-c512-4ea7… 
Dec 2 2011
5d94d8642a5fsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7292 f3b2605a-c512-4ea7… 
Dec 2 2011
9c9282d0242esjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7291 f3b2605a-c512-4ea7… 
Dec 2 2011
ab6e3568083asjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7290 f3b2605a-c512-4ea7… 
Dec 2 2011
eca63a1b690asjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7289 f3b2605a-c512-4ea7… 
Dec 2 2011
6bfa87dcb5c5sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7287 f3b2605a-c512-4ea7… 
Dec 2 2011
10fe5508e2d2sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7286 f3b2605a-c512-4ea7… 
Dec 2 2011
111f044b8584sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7285 f3b2605a-c512-4ea7… 
Dec 2 2011
d1f2eaeb4d4bsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7284 f3b2605a-c512-4ea7… 
Dec 2 2011
2728aab0e5e1sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7283 f3b2605a-c512-4ea7… 
Dec 2 2011
2e2d4c0b8147sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7282 f3b2605a-c512-4ea7… 
Dec 2 2011
7837edd51fbfsjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7281 f3b2605a-c512-4ea7… 
Dec 2 2011
00dc2b891f73sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7280 f3b2605a-c512-4ea7… 
Dec 2 2011

Very Large Commit

This commit is very large, and affects more than 1000 files. Changes are not shown.
c4science · Help