Diffusion lammps b666b2b2bcdf

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Oct 6 2013, 18:34.

Description

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

Resolved Conflicts:
src/.gitignore

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Oct 6 2013, 18:34

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS933dc0530528: ignore recently added /omp styles
rLAMMPSef83913ecd65: more files to ignore

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSb666b2b2bcdf: Merge branch 'lammps-icms' of bitbucket.org:akohlmey/lammps-icms into lammps… (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Oct 6 2013, 18:34

Merged Changes

Commit	Author	Details	Committed
933dc0530528	Axel Kohlmeyer	ignore recently added /omp styles	Oct 6 2013
cb73fe5a753c	Axel Kohlmeyer	removed unreleased files	Oct 6 2013
97947276ac44	Axel Kohlmeyer	geryon bugfix	Oct 6 2013
6c2590e41d85	Axel Kohlmeyer	Removing pointer dereferencing to help with autoprefetch.	Oct 6 2013
a5a5210358d0	Axel Kohlmeyer	Fixing a bug in charmm/long that would prevent the correct kernel from being…	Oct 6 2013
c8cc95152b4d	Axel Kohlmeyer	Fixing to ensure double precision extension enabled for PPPM with OpenCL.	Oct 6 2013
1ec5ab76a93a	Axel Kohlmeyer	handle citation marker in test comparison program	Oct 6 2013
0cff15d30c6f	Axel Kohlmeyer	Adding intel tuning options for OpenCL builds. Changing 'GPU' to 'Device' in…	Oct 6 2013
bf88f817e06f	Axel Kohlmeyer	Changing opencl permissions for PPPM error flag due to some weird problem on…	Oct 6 2013
aa20e5f8eccb	Axel Kohlmeyer	Fixing permissions for OpenCL build for packed neighbor storage when using…	Oct 6 2013
02f75869b2e5	Axel Kohlmeyer	Fixing bug in OpenCL build for CPUs where "views" were used for charge and rot…	Oct 6 2013
bf57e56c9e4c	Axel Kohlmeyer	Merge remote branch 'lammps-ro/master' into lammps-icms	Oct 6 2013
ea913a741eb8	Axel Kohlmeyer	setting environment variables differently for easy porting to mingw	Oct 6 2013
5024d0ca3f92	Axel Kohlmeyer	add missing cast	Oct 6 2013
bd952c767102	Axel Kohlmeyer	need to use _putenv() to be compatible with MinGW	Oct 6 2013
d965ff98e607	Axel Kohlmeyer	add setenv() emulation for windows	Oct 6 2013
f4cfe7b89326	jzimmer	Taking out faulty "man_charge_control" line	Oct 6 2013
f8425be4e7f6	jzimmer	Updating fix_atc files for current version of user-atc	Oct 6 2013

Changes (102)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path
	M			doc/USER/atc/man_fix_atc.html
	M			doc/fix_atc.html
	M			doc/fix_atc.txt
	M			doc/package.txt
	M			doc/shell.txt
	M			lib/gpu/geryon/VERSION.txt
	M			lib/gpu/geryon/nvd_device.h
	M			lib/gpu/geryon/ocl_device.h
	M			lib/gpu/geryon/ocl_memory.h
	M			lib/gpu/lal_atom.cpp
	M			lib/gpu/lal_aux_fun1.h
	M			lib/gpu/lal_base_ellipsoid.cpp
	M			lib/gpu/lal_beck.cu
	M			lib/gpu/lal_beck_ext.cpp
	M			lib/gpu/lal_born.cu
	M			lib/gpu/lal_born_coul_long.cu
	M			lib/gpu/lal_born_coul_long_ext.cpp
	M			lib/gpu/lal_born_coul_wolf.cu
	M			lib/gpu/lal_born_coul_wolf_ext.cpp
	M			lib/gpu/lal_born_ext.cpp
	M			lib/gpu/lal_buck.cu
	M			lib/gpu/lal_buck_coul.cu
	M			lib/gpu/lal_buck_coul_ext.cpp
	M			lib/gpu/lal_buck_coul_long.cu
	M			lib/gpu/lal_buck_coul_long_ext.cpp
	M			lib/gpu/lal_buck_ext.cpp
	M			lib/gpu/lal_cg_cmm.cu
	M			lib/gpu/lal_cg_cmm_ext.cpp
	M			lib/gpu/lal_cg_cmm_long.cu
	M			lib/gpu/lal_cg_cmm_long_ext.cpp
	M			lib/gpu/lal_charmm_long.cpp
	M			lib/gpu/lal_charmm_long.cu
	M			lib/gpu/lal_charmm_long_ext.cpp
	M			lib/gpu/lal_colloid.cu
	M			lib/gpu/lal_colloid_ext.cpp
	M			lib/gpu/lal_coul_dsf.cu
	M			lib/gpu/lal_coul_dsf_ext.cpp
	M			lib/gpu/lal_coul_long.cu
	M			lib/gpu/lal_coul_long_ext.cpp
	M			lib/gpu/lal_device.cpp
	M			lib/gpu/lal_dipole_lj.cu
	M			lib/gpu/lal_dipole_lj_ext.cpp
	M			lib/gpu/lal_dipole_lj_sf.cu
	M			lib/gpu/lal_dipole_lj_sf_ext.cpp
	M			lib/gpu/lal_eam.cu
	M			lib/gpu/lal_eam_ext.cpp
	D			lib/gpu/lal_eam_lj.cpp
	D			lib/gpu/lal_eam_lj.cu
	D			lib/gpu/lal_eam_lj.h
	M			lib/gpu/lal_eam_lj_ext.cpp
	M			lib/gpu/lal_ellipsoid_extra.h
	M			lib/gpu/lal_ellipsoid_nbor.cu
	M			lib/gpu/lal_gauss.cu
	M			lib/gpu/lal_gauss_ext.cpp
	M			lib/gpu/lal_gayberne.cu
	M			lib/gpu/lal_gayberne_ext.cpp
	M			lib/gpu/lal_gayberne_lj.cu
	M			lib/gpu/lal_lj.cu
	M			lib/gpu/lal_lj96.cu
	M			lib/gpu/lal_lj96_ext.cpp
	M			lib/gpu/lal_lj_class2_long.cu
	M			lib/gpu/lal_lj_class2_long_ext.cpp
	M			lib/gpu/lal_lj_coul.cu
	M			lib/gpu/lal_lj_coul_debye.cu
	M			lib/gpu/lal_lj_coul_debye_ext.cpp
	M			lib/gpu/lal_lj_coul_ext.cpp
	M			lib/gpu/lal_lj_coul_long.cu
	M			lib/gpu/lal_lj_coul_long_ext.cpp
	M			lib/gpu/lal_lj_coul_msm.cu
	M			lib/gpu/lal_lj_coul_msm_ext.cpp
	M			lib/gpu/lal_lj_dsf.cu
	M			lib/gpu/lal_lj_dsf_ext.cpp
	M			lib/gpu/lal_lj_expand.cu
	M			lib/gpu/lal_lj_expand_ext.cpp
	M			lib/gpu/lal_lj_ext.cpp
	M			lib/gpu/lal_mie.cu
	M			lib/gpu/lal_mie_ext.cpp
	M			lib/gpu/lal_morse.cu
	M			lib/gpu/lal_morse_ext.cpp
	M			lib/gpu/lal_neighbor.cpp
	M			lib/gpu/lal_neighbor.h
	M			lib/gpu/lal_neighbor_cpu.cu
	M			lib/gpu/lal_pppm.cpp
	M			lib/gpu/lal_pppm.cu
	M			lib/gpu/lal_pppm_ext.cpp
	M			lib/gpu/lal_preprocessor.h
	M			lib/gpu/lal_re_squared.cu
	M			lib/gpu/lal_re_squared_ext.cpp
	M			lib/gpu/lal_re_squared_lj.cu
	M			lib/gpu/lal_soft.cu
	M			lib/gpu/lal_soft_ext.cpp
	M			lib/gpu/lal_sw.cu
	M			lib/gpu/lal_sw_ext.cpp
	M			lib/gpu/lal_table.cu
	M			lib/gpu/lal_table_ext.cpp
	M			lib/gpu/lal_yukawa.cu
	M			lib/gpu/lal_yukawa_colloid.cu
	M			lib/gpu/lal_yukawa_colloid_ext.cpp
	M			lib/gpu/lal_yukawa_ext.cpp
	M			src/input.cpp
	M			src/lmpwindows.h
	M			test/lmp_diff.cpp