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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Aug 19 2014, 15:49.

Description

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

Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
doc/package.txt

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Aug 19 2014, 15:49

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
2e5648e42c2f	Axel Kohlmeyer	include missing timer stamps for MODIFY	Aug 19 2014
14387fff2731	Axel Kohlmeyer	more adjustments to make USER-INTEL compatible with gcc and LAMMPS-ICMS	Aug 19 2014
bdfd99519dd9	Axel Kohlmeyer	use macros for processor specific flags to set alignment or signal no aliasing	Aug 19 2014
1172085ecd76	Axel Kohlmeyer	Merge remote-tracking branch 'lammps-ro/master' into lammps-icms	Aug 17 2014
6a587c11c669	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12336 f3b2605a-c512-4ea7…	Aug 15 2014
c2bd9af8797f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12335 f3b2605a-c512-4ea7…	Aug 15 2014
ef24ec8e56f3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12334 f3b2605a-c512-4ea7…	Aug 15 2014
e3879a10483b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12332 f3b2605a-c512-4ea7…	Aug 15 2014
f9814600231d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12331 f3b2605a-c512-4ea7…	Aug 15 2014
6e622a54af37	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12330 f3b2605a-c512-4ea7…	Aug 15 2014

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/Section_intro.html
	M			doc/Section_intro.txt
	M			doc/package.txt
	M			examples/intel/in.intel.lc
	M			examples/intel/in.intel.rhodo
	M			src/REPLICA/verlet_split.cpp
	M			src/USER-INTEL/Install.sh
	M			src/USER-INTEL/fix_intel.h
	M			src/USER-INTEL/intel_buffers.cpp
	M			src/USER-INTEL/intel_buffers.h
	M			src/USER-INTEL/intel_preprocess.h
	M			src/USER-INTEL/neigh_half_bin_intel.cpp
	M			src/USER-INTEL/pair_gayberne_intel.cpp
	M			src/USER-INTEL/pair_gayberne_intel.h
	M			src/USER-INTEL/pair_lj_charmm_coul_long_intel.cpp
	M			src/USER-INTEL/pair_lj_charmm_coul_long_intel.h
	M			src/USER-INTEL/pair_lj_cut_coul_long_intel.cpp
	M			src/USER-INTEL/pair_lj_cut_coul_long_intel.h
	M			src/USER-INTEL/pair_lj_cut_intel.cpp
	M			src/USER-INTEL/pair_lj_cut_intel.h
	M			src/USER-INTEL/verlet_intel.cpp
	M			src/USER-INTEL/verlet_intel.h
	M			src/USER-INTEL/verlet_split_intel.cpp
	M			src/input.cpp
	M			src/integrate.cpp
	M			src/lammps.cpp
	M			src/lammps.h
	M			src/lmptype.h
	M			src/version.h