Diffusion lammps fdcefc5d1ba0

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Feb 12 2014, 14:16.

Description

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

Resolved Conflicts:
src/fix.cpp
src/memory.h

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Feb 12 2014, 14:16

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS958a442bebbe: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11539 f3b2605a-c512-4ea7…
rLAMMPS7b433cf7a21e: add a few more cases that should recognize $LAMMPS_POTENTIALS

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSfdcefc5d1ba0: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Feb 12 2014, 14:16

Merged Changes

Commit	Author	Details	Committed
958a442bebbe	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11539 f3b2605a-c512-4ea7…	Feb 12 2014
4cb42cb26b4d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11538 f3b2605a-c512-4ea7…	Feb 12 2014
9c33209b2df1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11537 f3b2605a-c512-4ea7…	Feb 12 2014
cb23c438fc95	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11536 f3b2605a-c512-4ea7…	Feb 12 2014
aa0f65b373e6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11535 f3b2605a-c512-4ea7…	Feb 12 2014
2da4b3a85fdc	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11534 f3b2605a-c512-4ea7…	Feb 12 2014
45224e6d89b4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11533 f3b2605a-c512-4ea7…	Feb 12 2014
82833b729f28	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11532 f3b2605a-c512-4ea7…	Feb 12 2014
b28ce4b3bb9f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11531 f3b2605a-c512-4ea7…	Feb 12 2014
afe7343b3780	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11530 f3b2605a-c512-4ea7…	Feb 12 2014
148140df27c0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11529 f3b2605a-c512-4ea7…	Feb 12 2014
17a0a5eeb619	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11528 f3b2605a-c512-4ea7…	Feb 12 2014
001514ada269	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11527 f3b2605a-c512-4ea7…	Feb 12 2014
9ddbac1dd8e5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11526 f3b2605a-c512-4ea7…	Feb 12 2014
4c297a50a7e9	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11523 f3b2605a-c512-4ea7…	Feb 11 2014

Changes (14)

				Path
	M			src/MISC/fix_efield.h
	M			src/accelerator_kokkos.h
	M			src/atom.h
	M			src/atom_masks.h
	M			src/atom_vec.cpp
	M			src/atom_vec.h
	M			src/fix.cpp
	M			src/fix.h
	M			src/lammps.cpp
	M			src/lmptype.h
	M			src/memory.h
	M			src/modify.h
	M			src/read_data.cpp
	M			src/verlet.h