Merge branch 'compilation-bugfix' into lammps-icms
Resolved Conflicts:
lib/atc/Makefile.lammps
lib/awpmd/Makefile.lammps
Axel Kohlmeyer <akohlmey@gmail.com> | May 15 2013, 14:26 |
junge | Oct 6 2016, 16:49 |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
3929d2bd1d19 | Axel Kohlmeyer | preconfigure ATC and AWPMD to use internal BLAS/LAPACK | May 15 2013 | |||
7c79e9029abb | Axel Kohlmeyer | handle dependency of user-phonon on kspace | May 15 2013 | |||
61f7322e978e | Axel Kohlmeyer | eliminate the need for fix atc to pull in all its gory headers | May 15 2013 |