Merge branch 'lammps-icms' into lammps-colvars
Description
Description
Details
Details
- Committed
Axel Kohlmeyer <akohlmey@gmail.com> Jun 20 2012, 00:47 - Pushed
junge Oct 6 2016, 16:49 - Parents
- rLAMMPS2dcc34728347: update granular simulation related code in USER-OMP to upstream
rLAMMPS725578a97828: Merge branch 'lammps-icms' into lammps-colvars - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 2dcc34728347 | Axel Kohlmeyer | update granular simulation related code in USER-OMP to upstream | Jun 19 2012 | |||
| b2bb063a9e05 | Axel Kohlmeyer | anticipate updates from upstream for granular media | Jun 19 2012 | |||
| 5f7cc52206ff | Axel Kohlmeyer | Merge branch 'master' into lammps-icms | Jun 19 2012 | |||
| 88533cd329e3 | Axel Kohlmeyer | Revert local bugfixes that steve fixed differently | Jun 19 2012 | |||
| 59247546f83e | Axel Kohlmeyer | use intel/MKL FFT with intel compilers for OpenMP | Jun 19 2012 | |||
| 6367ed17e32b | Axel Kohlmeyer | adjust output accuracy for some data after some steps. | Jun 19 2012 | |||
| e2fec3804149 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8315 f3b2605a-c512-4ea7… | Jun 19 2012 | |||
| bb64d07020a6 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8314 f3b2605a-c512-4ea7… | Jun 19 2012 | |||
| 44a8e24e2a87 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8313 f3b2605a-c512-4ea7… | Jun 19 2012 | |||
| bb48c5ccdc0b | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8312 f3b2605a-c512-4ea7… | Jun 19 2012 | |||
| 5208299da466 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8310 f3b2605a-c512-4ea7… | Jun 19 2012 | |||
| 7cb2181030e9 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8308 f3b2605a-c512-4ea7… | Jun 19 2012 | |||
| 63590758f8fe | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8307 f3b2605a-c512-4ea7… | Jun 19 2012 | |||
| a8af5ea42fd9 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8306 f3b2605a-c512-4ea7… | Jun 19 2012 | |||
| 5b13fecb6df1 | Axel Kohlmeyer | avoid segfault in fix shake when using "run" with "pre no" | Jun 18 2012 | |||
| ccb9496d2295 | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8304 f3b2605a-c512-4ea7… | Jun 18 2012 | |||
| 3b810ac69d2a | sjplimp | git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8303 f3b2605a-c512-4ea7… | Jun 18 2012 | |||
| bd9b6ae42717 | Axel Kohlmeyer | real bugfix for box size check problem | Jun 18 2012 | |||
| 74f9d9a8adb8 | Axel Kohlmeyer | disabled steve's neighborlist bugfix for now | Jun 17 2012 | |||
| b4e5de754978 | Axel Kohlmeyer | ignore lines with '/omp' when comparing. | Jun 16 2012 | |||
| e7935b68d147 | Axel Kohlmeyer | allow updating of the reference outputs of a single directory | Jun 16 2012 | |||
| 59df89155ea0 | Axel Kohlmeyer | update a few reference outputs. | Jun 16 2012 | |||
| bc5be98d6011 | Axel Kohlmeyer | document and clean up compute inertia | Jun 16 2012 | |||
| e44227966079 | athomps | Updated defaults for bond and hbond cutoffs in reax/c | Jun 15 2012 | |||
| bb37265a8551 | athomps | Updated defaults for bond and hbond cutoffs in reax/c | Jun 15 2012 |