Homec4science

Merge remote-tracking branch 'upstream/lammps-icms' into…

Authored by richard on Jun 20 2016, 06:54.

Description

Merge remote-tracking branch 'upstream/lammps-icms' into improved_python_interface

Event Timeline

Richard <richard.berger@temple.edu> committed rLAMMPS7d17dd1bf0d0: Merge remote-tracking branch 'upstream/lammps-icms' into… (authored by Richard <richard.berger@temple.edu>).Jun 20 2016, 06:54

Merged Changes

CommitAuthorDetailsCommitted
8309f007191fAxel Kohlmeyer
Merge branch 'timer-timeout-thermo' into lammps-icms 
Jun 20 2016
755a5a118e11Axel Kohlmeyer
update timer docs. 
Jun 20 2016
e21f430bee9eAxel Kohlmeyer
add thermo keyword that allows to query the remaining timer timeout time 
Jun 20 2016