Homec4science

Merge branch 'lammps-axel' into lammps-icms

Authored by Peter Shannon <pietro.shannon@gmail.com> on Jun 7 2010, 03:00.

Description

Merge branch 'lammps-axel' into lammps-icms

Event Timeline

Peter Shannon <pietro.shannon@gmail.com> committed rLAMMPSdf2f5a39bc77: Merge branch 'lammps-axel' into lammps-icms (authored by Peter Shannon <pietro.shannon@gmail.com>).Jun 7 2010, 03:00

Merged Changes

CommitAuthorDetailsCommitted
82aa95583ef3Axel Kohlmeyer
more files to ignore in the src/ directory. 
Jun 7 2010
db794787f0c4Axel Kohlmeyer
update cray xt5 makefile better optimization 
Jun 7 2010
14047e10a173Axel Kohlmeyer
we need to special case fix wall/gran 
Jun 6 2010
6954fb2b814eAxel Kohlmeyer
add one more OpenMP related fix. 
Jun 6 2010
267b92fd62c4Axel Kohlmeyer
don't mess with internal fix names. 
Jun 6 2010
805af3084403Axel Kohlmeyer
add example/test input for granular pair styles. 
Jun 6 2010
b4898150f774Axel Kohlmeyer
Merge branch 'openmp-pair-styles' into lammps-icms 
Jun 6 2010
5995cb3da891Axel Kohlmeyer
add first stab of OpenMP for granular potentials 
Jun 6 2010