Homec4science

Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps…

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Feb 28 2016, 15:58.

Description

Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps-icms

  1. Conflicts:
  2. src/MAKE/MINE/Makefile.openmpi-omp

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSa1dc8e8a0c1d: Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps… (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Feb 28 2016, 15:58

Merged Changes

CommitAuthorDetailsCommitted
16431222dab3Axel Kohlmeyer
alternate approach. not yet 100% working. 
Feb 27 2016