Homec4science

Merge branch 'ibaned-pair-table-rx-inherit' into USER-DPD_kokkos

Authored by Tim Mattox <timothy.mattox@engilitycorp.com> on Jan 9 2017, 20:04.

Description

Merge branch 'ibaned-pair-table-rx-inherit' into USER-DPD_kokkos

Event Timeline

Tim Mattox <timothy.mattox@engilitycorp.com> committed rLAMMPS001964ecd8ac: Merge branch 'ibaned-pair-table-rx-inherit' into USER-DPD_kokkos (authored by Tim Mattox <timothy.mattox@engilitycorp.com>).Jan 9 2017, 20:04

Merged Changes

CommitAuthorDetailsCommitted
9807062594ddTim Mattox
Merge branch 'pair-table-rx-inherit' of https://github.com/ibaned/lammps into… 
Jan 9 2017
7201f003e577Dan Ibanez
move another enum back 
Jan 6 2017
d8ddef37ed54Dan Ibanez
put enum back in .cpp file 
Jan 6 2017
ad1402562d70Dan Ibanez
Revert "move enum to pair.h" 
Jan 6 2017
70927d08e734Dan Ibanez/Dan Ibanez
remove duplicate enum 
Jan 6 2017
a1ac2ae9b757Dan Ibanez/Dan Ibanez
move enum to pair.h 
Jan 6 2017
3941fe9ab748Dan Ibanez/Dan Ibanez
fix compilation 
Jan 6 2017
318ab9a18506Dan Ibanez/Dan Ibanez
trying PairTableRX : public PairTable 
Jan 6 2017