Merge branch 'lammps-awesome' into lammps-icms
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Jun 3 2010, 00:16 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPS4e677d0faac4: Merge branch 'lammps-axel' into lammps-icms
rLAMMPS0c89650a4e50: new and much smaller tests for dpd and soft. - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 4e677d0faac4 | Peter Shannon | Merge branch 'lammps-axel' into lammps-icms | Jun 2 2010 | |||
| 23c72defb7ab | Peter Shannon | updated .gitignore in src | Jun 2 2010 | |||
| 932b33e87cc9 | Peter Shannon | added in.melt-lj-gromacs-coul-gromacs and in.melt-lj-gromacs-coul-gromacs-omp | Jun 2 2010 | |||
| 0b2d6f260df2 | Peter Shannon | added in.melt-lj-gromacs and in.melt-lj-gromacs-omp | Jun 2 2010 | |||
| 00c9f967a7a9 | Peter Shannon | added in.melt-lj-expand and in.melt-lj-expand-omp | Jun 2 2010 | |||
| 31759d7b20fe | Peter Shannon | added in.melt-dpd-tstat and in.melt-dpd-tstat-omp | Jun 2 2010 | |||
| 8c1eb9ce08ac | Peter Shannon | added in.melt-dpd and in.melt-dpd-omp | Jun 2 2010 | |||
| f183b25fe7dc | Peter Shannon | added in.melt-cg-cmm and in.melt-cg-cmm-omp | Jun 2 2010 | |||
| eb2ec2a51797 | Peter Shannon | added in.melt-lj96-cut and in.melt-lj96-cut-omp | Jun 2 2010 | |||
| a6c38349e380 | Peter Shannon | added in.melt-lj-cut-coul-long and in.melt-lj-cut-coul-long-omp | Jun 2 2010 | |||
| 611de16963a3 | Peter Shannon | added in.melt-lj-cut-coul-debye and in.melt-lj-cut-coul-debye-omp | Jun 2 2010 | |||
| c00a83f678dc | Peter Shannon | added in.melt-lj-cut-coul-cut and in.melt-lj-cut-coul-cut-omp | Jun 2 2010 | |||
| 57feea5010af | Peter Shannon | added in.melt-lj-charmm-coul-long and in.melt-lj-charmm-coul-long-omp | Jun 2 2010 | |||
| d9bbef24dd70 | Peter Shannon | added in.melt-lj-charmm-coul-charmm-implicit and in.melt-lj-charmm-coul-charmm… | Jun 2 2010 | |||
| d6b1a9d13323 | Peter Shannon | added in.melt-lj-charmm-coul-charmm and in.melt-lj-charmm-coul-charmm-omp | Jun 2 2010 | |||
| a1fe8eda547d | Peter Shannon | added in.melt-born-coul-long and in.melt-born-coul-long-omp | Jun 2 2010 | |||
| d93ffdcf4cf5 | Peter Shannon | fix minor error in pair_lj_cut_coul_long_omp.cpp | Jun 2 2010 |