Diffusion lammps 2823645da0fe

Merge branch 'lammps-icms' into qmmm-qe
2823645da0fe
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Oct 5 2013, 23:50.

Description

Merge branch 'lammps-icms' into qmmm-qe

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Oct 5 2013, 23:50

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSd3e6c3396d67: Merge branch 'lammps-icms' into qmmm-qe
rLAMMPS94539cb782b6: remove files added to the incorrect directory

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS2823645da0fe: Merge branch 'lammps-icms' into qmmm-qe (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Oct 5 2013, 23:50

Merged Changes

Commit	Author	Details	Committed
94539cb782b6	Axel Kohlmeyer	remove files added to the incorrect directory	Oct 5 2013
ac35c46950a9	Axel Kohlmeyer	add coul/dsf/omp pair styles	Oct 5 2013
4c6a5ef6f0ff	Axel Kohlmeyer	cleanup and corrections	Oct 5 2013
38952a636910	Axel Kohlmeyer	remove unused variables	Oct 5 2013
2b9713284c4b	Axel Kohlmeyer	remove excess whitespace	Oct 5 2013

Changes (57)

				Path
	M			doc/Section_commands.txt
	M			doc/pair_coul.txt
	M			doc/pair_lj.txt
	M			src/USER-OMP/bond_harmonic_omp.cpp
	M			src/USER-OMP/bond_nonlinear_omp.cpp
	M			src/USER-OMP/dihedral_fourier_omp.cpp
	M			src/USER-OMP/dihedral_quadratic_omp.cpp
	M			src/USER-OMP/fix_nh_asphere_omp.cpp
	M			src/USER-OMP/fix_nh_sphere_omp.cpp
	M			src/USER-OMP/fix_omp.cpp
	M			src/USER-OMP/fix_rigid_nh_omp.cpp
	M			src/USER-OMP/fix_rigid_nh_omp.h
	M			src/USER-OMP/fix_rigid_nph_omp.cpp
	M			src/USER-OMP/fix_rigid_nph_omp.h
	M			src/USER-OMP/fix_rigid_npt_omp.cpp
	M			src/USER-OMP/fix_rigid_npt_omp.h
	M			src/USER-OMP/fix_rigid_nve_omp.cpp
	M			src/USER-OMP/fix_rigid_nve_omp.h
	M			src/USER-OMP/fix_rigid_nvt_omp.cpp
	M			src/USER-OMP/fix_rigid_nvt_omp.h
	M			src/USER-OMP/fix_rigid_omp.cpp
	M			src/USER-OMP/fix_rigid_small_omp.cpp
	M			src/USER-OMP/fix_shear_history_omp.cpp
	M			src/USER-OMP/improper_fourier_omp.cpp
	M			src/USER-OMP/msm_omp.cpp
	M			src/USER-OMP/neigh_gran_omp.cpp
	M			src/USER-OMP/pair_buck_long_coul_long_omp.cpp
	P			src/USER-OMP/pair_coul_dsf_omp.cpp Copied from src/USER-OMP/pair_coul_debye_omp.cpp
	P			src/USER-OMP/pair_coul_dsf_omp.h Copied from src/USER-OMP/pair_beck_omp.h
	M			src/USER-OMP/pair_lj_charmm_coul_msm_omp.cpp
	P			src/USER-OMP/pair_lj_cut_coul_dsf_omp.cpp Copied from src/USER-OMP/pair_lj_class2_coul_long_omp.cpp
	P			src/USER-OMP/pair_lj_cut_coul_dsf_omp.h Copied from src/USER-OMP/pair_born_coul_wolf_omp.h
	M			src/USER-OMP/pair_lj_cut_tip4p_cut_omp.cpp
	M			src/USER-OMP/pair_lj_cut_tip4p_long_omp.cpp
	M			src/USER-OMP/pair_lj_long_coul_long_omp.cpp
	M			src/USER-OMP/pair_lj_long_coul_long_omp.h
	M			src/USER-OMP/pair_lj_long_tip4p_long_omp.cpp
	M			src/USER-OMP/pair_lj_long_tip4p_long_omp.h
	M			src/USER-OMP/pair_nm_cut_coul_cut_omp.cpp
	M			src/USER-OMP/pair_nm_cut_coul_long_omp.cpp
	M			src/USER-OMP/pair_nm_cut_omp.cpp
	M			src/USER-OMP/pair_tip4p_cut_omp.cpp
	M			src/USER-OMP/pair_tip4p_long_omp.cpp
	M			src/USER-OMP/pair_zbl_omp.cpp
	M			src/USER-OMP/pppm_cg_omp.cpp
	M			src/USER-OMP/pppm_disp_omp.cpp
	M			src/USER-OMP/pppm_disp_omp.h
	M			src/USER-OMP/pppm_disp_tip4p_omp.cpp
	M			src/USER-OMP/pppm_omp.cpp
	M			src/USER-OMP/pppm_tip4p_cg_omp.cpp
	M			src/USER-OMP/pppm_tip4p_omp.cpp
	M			src/USER-OMP/respa_omp.cpp
	M			src/USER-OMP/thr_data.cpp
	M			src/pair_coul_dsf.cpp
	M			src/pair_lj_cut_coul_dsf.cpp
	D			src/pair_nm_cut_omp.cpp
	D			src/pair_nm_cut_omp.h