Homec4science
Diffusion lammps acbf1dbb904f

Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
acbf1dbb904f
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Dec 17 2015, 13:21.

Description

Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

  1. Resolved Conflicts:
  2. src/USER-PHONON/fix_phonon.h

Details

Committed
Axel Kohlmeyer <akohlmey@gmail.com>Dec 17 2015, 13:21
Pushed
jungeOct 6 2016, 16:49
Parents
rLAMMPSdf7e89f9f7b4: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14378 f3b2605a-c512-4ea7…
rLAMMPS7ed4da41c835: test 2x MPI w/o OpenMP instead of 2+2 for now
Branches
Unknown
Tags
Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSacbf1dbb904f: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Dec 17 2015, 13:21

Merged Changes

CommitAuthorDetailsCommitted
df7e89f9f7b4sjplimp
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14378 f3b2605a-c512-4ea7… 
Dec 16 2015

Empty Commit

This commit is empty and does not affect any paths.
c4science · Help