Merge branch 'master' into lammps-icms
172f6724d9df
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Mar 2 2012, 16:00.

Description

Merge branch 'master' into lammps-icms

Resolved Conflicts:
src/KSPACE/pair_lj_cut_coul_long_tip4p.cpp
src/OPT/pair_lj_cut_coul_long_tip4p_opt.cpp
src/USER-OMP/pair_lj_cut_coul_long_tip4p_omp.cpp
src/USER-OMP/pair_lj_cut_coul_pppm_tip4p_omp.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Mar 2 2012, 16:00

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS9d253478b41c: Added comments that explain error messages in fix GCMC.
rLAMMPSc1b811cd5741: update documentation

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS172f6724d9df: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Mar 2 2012, 16:00

Merged Changes

Commit	Author	Details	Committed
9d253478b41c	pscrozi	Added comments that explain error messages in fix GCMC.	Mar 2 2012
a70bf0417c9f	pscrozi	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7877 f3b2605a-c512-4ea7…	Mar 1 2012
1a7a009098a2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7876 f3b2605a-c512-4ea7…	Mar 1 2012
c74d2c7e08f2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7875 f3b2605a-c512-4ea7…	Mar 1 2012
8d147139fc42	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7874 f3b2605a-c512-4ea7…	Mar 1 2012
3fb19bcea664	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7873 f3b2605a-c512-4ea7…	Mar 1 2012
c6dae6c51496	pscrozi	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7872 f3b2605a-c512-4ea7…	Mar 1 2012
4d2eae83448d	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7871 f3b2605a-c512-4ea7…	Mar 1 2012
a410531401f8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7870 f3b2605a-c512-4ea7…	Mar 1 2012

Changes (20)

				Path
	M			doc/Section_python.html
	M			doc/Section_python.txt
	M			doc/Section_start.html
	M			doc/Section_start.txt
	M			doc/kspace_style.html
	M			doc/kspace_style.txt
	M			lib/cuda/crm_cuda_utils.cu
	M			lib/cuda/cuda_pair.cu
	M			lib/kim/Makefile.lammps
	M			lib/kim/README
	M			src/KSPACE/ewald.cpp
	M			src/KSPACE/pair_lj_cut_coul_long_tip4p.cpp
	M			src/MC/fix_gcmc.h
	M			src/Makefile
	M			src/OPT/pair_lj_cut_coul_long_tip4p_opt.cpp
	M			src/REPLICA/verlet_split.cpp
	M			src/USER-CUDA/pppm_cuda.cpp
	M			src/USER-CUDA/pppm_cuda.h
	M			src/USER-OMP/pair_lj_cut_coul_long_tip4p_omp.cpp
	M			src/USER-OMP/pair_lj_cut_coul_pppm_tip4p_omp.cpp