Diffusion lammps 5bb50f88412a

Merge remote branch 'lammps-ro/master' into lammps-icms
5bb50f88412a
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Apr 10 2014, 13:24.

Description

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

Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/USER-OMP/fix_qeq_comb_omp.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Apr 10 2014, 13:24

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS4c7099516540: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11763 f3b2605a-c512-4ea7…
rLAMMPS37a7e805b5d1: improve documentation for fix gcmc

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS5bb50f88412a: Merge remote branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Apr 10 2014, 13:24

Merged Changes

Commit	Author	Details	Committed
4c7099516540	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11763 f3b2605a-c512-4ea7…	Apr 9 2014
323a458de930	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11762 f3b2605a-c512-4ea7…	Apr 9 2014
d94811f0e82e	stamoor	Removed redundant class variables	Apr 9 2014
93d9eb48bc50	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11759 f3b2605a-c512-4ea7…	Apr 9 2014
103812fa8472	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11758 f3b2605a-c512-4ea7…	Apr 9 2014
bfd3e3a684db	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11757 f3b2605a-c512-4ea7…	Apr 9 2014
c0fbdbefaa4c	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11756 f3b2605a-c512-4ea7…	Apr 9 2014
5e3ff6cffdc6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11754 f3b2605a-c512-4ea7…	Apr 9 2014
6e4d71efd3cf	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11753 f3b2605a-c512-4ea7…	Apr 9 2014
cd01712dc013	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11752 f3b2605a-c512-4ea7…	Apr 9 2014
eaf817aa8534	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11751 f3b2605a-c512-4ea7…	Apr 9 2014
870fe2a8ebf8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11750 f3b2605a-c512-4ea7…	Apr 9 2014
4b6b42fa273e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11749 f3b2605a-c512-4ea7…	Apr 9 2014
5e0b58212ea2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11746 f3b2605a-c512-4ea7…	Apr 9 2014
cd3dbc40fd24	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11745 f3b2605a-c512-4ea7…	Apr 9 2014

Changes (29)

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/fix_rigid.html
	M			doc/fix_rigid.txt
	M			src/GPU/pppm_gpu.cpp
	M			src/GRANULAR/fix_pour.cpp
	M			src/KSPACE/ewald.cpp
	M			src/KSPACE/ewald.h
	M			src/KSPACE/msm.cpp
	M			src/KSPACE/msm.h
	M			src/KSPACE/pppm.cpp
	M			src/KSPACE/pppm.h
	M			src/KSPACE/pppm_cg.cpp
	M			src/KSPACE/pppm_disp.cpp
	M			src/KSPACE/pppm_disp.h
	M			src/KSPACE/pppm_disp_tip4p.cpp
	M			src/KSPACE/pppm_old.cpp
	M			src/KSPACE/pppm_old.h
	M			src/KSPACE/pppm_stagger.cpp
	M			src/KSPACE/pppm_stagger.h
	M			src/KSPACE/pppm_tip4p.cpp
	M			src/RIGID/fix_rigid_small.cpp
	M			src/USER-CUDA/pppm_cuda.cpp
	M			src/USER-CUDA/pppm_cuda.h
	M			src/USER-OMP/fix_qeq_comb_omp.cpp
	M			src/kspace.cpp
	M			src/kspace.h
	M			src/neighbor.cpp
	M			src/version.h