Diffusion lammps 430aed042a86

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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Mar 20 2014, 15:50.

Description

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

Conflicts:
doc/Manual.html
doc/Manual.txt
tools/msi2lmp/src/msi2lmp.c

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Mar 20 2014, 15:50

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS68c5f66685b2: Removing untested feature to fix bug affecting Windows builds
rLAMMPSc7b18333dcfe: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS430aed042a86: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Mar 20 2014, 15:50

Merged Changes

Commit	Author	Details	Committed
68c5f66685b2	jzimmer	Removing untested feature to fix bug affecting Windows builds	Mar 19 2014
1f6484a29add	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11653 f3b2605a-c512-4ea7…	Mar 19 2014
1d9954ff655b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11652 f3b2605a-c512-4ea7…	Mar 19 2014
de349d014648	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11651 f3b2605a-c512-4ea7…	Mar 19 2014
6873c4521f61	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11650 f3b2605a-c512-4ea7…	Mar 19 2014
281948612b5f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11649 f3b2605a-c512-4ea7…	Mar 19 2014
2c447385f497	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11648 f3b2605a-c512-4ea7…	Mar 19 2014
4d3ebe2ebeea	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11647 f3b2605a-c512-4ea7…	Mar 19 2014
d54bd651a3d1	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11646 f3b2605a-c512-4ea7…	Mar 19 2014
48ce1b589eca	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11645 f3b2605a-c512-4ea7…	Mar 19 2014
e8154be88c8f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11644 f3b2605a-c512-4ea7…	Mar 19 2014
544bf593c501	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@11643 f3b2605a-c512-4ea7…	Mar 19 2014

Changes (55)

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/fix_temp_csvr.html
	M			doc/kspace_modify.html
	M			doc/kspace_modify.txt
	M			doc/kspace_style.html
	M			doc/kspace_style.txt
	M			lib/atc/FE_Element.cpp
	M			lib/atc/FE_Mesh.cpp
	M			src/GPU/pair_lj_cut_coul_msm_gpu.cpp
	M			src/GPU/pair_lj_cut_coul_msm_gpu.h
	M			src/KSPACE/msm.cpp
	M			src/KSPACE/msm.h
	M			src/KSPACE/msm_cg.cpp
	M			src/KSPACE/msm_cg.h
	M			src/KSPACE/pair_born_coul_msm.cpp
	M			src/KSPACE/pair_born_coul_msm.h
	M			src/KSPACE/pair_buck_coul_msm.cpp
	M			src/KSPACE/pair_buck_coul_msm.h
	M			src/KSPACE/pair_coul_msm.cpp
	M			src/KSPACE/pair_coul_msm.h
	M			src/KSPACE/pair_lj_charmm_coul_msm.cpp
	M			src/KSPACE/pair_lj_charmm_coul_msm.h
	M			src/KSPACE/pair_lj_cut_coul_msm.cpp
	M			src/KSPACE/pair_lj_cut_coul_msm.h
	M			src/MANYBODY/pair_airebo.cpp
	M			src/MANYBODY/pair_bop.cpp
	M			src/MANYBODY/pair_comb3.cpp
	M			src/MISC/fix_gld.cpp
	M			src/USER-CG-CMM/pair_lj_sdk_coul_msm.cpp
	M			src/USER-CG-CMM/pair_lj_sdk_coul_msm.h
	M			src/USER-OMP/msm_cg_omp.cpp
	M			src/USER-OMP/msm_cg_omp.h
	M			src/USER-OMP/msm_omp.cpp
	M			src/USER-OMP/msm_omp.h
	M			src/USER-OMP/pair_born_coul_msm_omp.cpp
	M			src/USER-OMP/pair_born_coul_msm_omp.h
	M			src/USER-OMP/pair_buck_coul_msm_omp.cpp
	M			src/USER-OMP/pair_buck_coul_msm_omp.h
	M			src/USER-OMP/pair_coul_msm_omp.cpp
	M			src/USER-OMP/pair_coul_msm_omp.h
	M			src/USER-OMP/pair_lj_charmm_coul_msm_omp.cpp
	M			src/USER-OMP/pair_lj_charmm_coul_msm_omp.h
	M			src/USER-OMP/pair_lj_cut_coul_msm_omp.cpp
	M			src/USER-OMP/pair_lj_cut_coul_msm_omp.h
	M			src/USER-OMP/pair_lj_sdk_coul_msm_omp.cpp
	M			src/USER-OMP/pair_lj_sdk_coul_msm_omp.h
	M			src/compute_pressure.cpp
	M			src/compute_pressure.h
	M			src/kspace.cpp
	M			src/kspace.h
	M			src/pair_mie_cut.cpp
	M			src/procmap.cpp
	M			src/version.h
	M			tools/msi2lmp/src/msi2lmp.c