Diffusion lammps 110aea956987

Merge branch 'lammps-axel' into lammps-icms
110aea956987
Actions

Authored by Peter Shannon <pietro.shannon@gmail.com> on Jun 23 2010, 19:21.

Description

Merge branch 'lammps-axel' into lammps-icms

Details

Committed

Peter Shannon <pietro.shannon@gmail.com>

Jun 23 2010, 19:21

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSb29767445385: Merge branch 'master' into lammps-icms
rLAMMPS794f1a90dfdd: remove log file

Branches

Unknown

Tags

Unknown

Event Timeline

Peter Shannon <pietro.shannon@gmail.com> committed rLAMMPS110aea956987: Merge branch 'lammps-axel' into lammps-icms (authored by Peter Shannon <pietro.shannon@gmail.com>).Jun 23 2010, 19:21

Merged Changes

Commit	Author	Details	Committed
b29767445385	Axel Kohlmeyer	Merge branch 'master' into lammps-icms	Jun 23 2010
57b535e0732e	Axel Kohlmeyer	Merge branch 'master' into lammps-icms	Jun 23 2010
cc5ee9e3a74b	Axel Kohlmeyer	grow send/receive buffers a bit more aggressively	Jun 23 2010
65bafb83fe46	Axel Kohlmeyer	implement the ev_reduce_thr() bugfix for dihedrals	Jun 23 2010
2897a3e427a5	Axel Kohlmeyer	fix compilation error where evflag is not a const.	Jun 23 2010
2b5244f08651	Axel Kohlmeyer	fix an bad bug with per atom tallied properties.	Jun 23 2010
304f40aab43f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4336 f3b2605a-c512-4ea7…	Jun 22 2010
6da5e6066885	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4335 f3b2605a-c512-4ea7…	Jun 22 2010
cace96f6e851	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4333 f3b2605a-c512-4ea7…	Jun 22 2010
1fb5b57ec2f5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4332 f3b2605a-c512-4ea7…	Jun 22 2010
9286c04645bd	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4331 f3b2605a-c512-4ea7…	Jun 22 2010
96f43df6172b	Axel Kohlmeyer	update makefiles	Jun 22 2010
22f5685b1e06	Axel Kohlmeyer	bugfix for the threaded virial accumulation issue.	Jun 22 2010
6929e8f81a7f	athomps	Tweaked output value of initial strain rate	Jun 21 2010
6105af48c90b	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4328 f3b2605a-c512-4ea7…	Jun 21 2010
c6d34a26f6d7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@4327 f3b2605a-c512-4ea7…	Jun 21 2010
e0d671dae8f4	Axel Kohlmeyer	make fft header honor FFTW_SIZE define for fftw2	Jun 21 2010

Changes (65)

				Path
	A			doc/fix_adapt.html
	A			doc/fix_adapt.txt
	M			src/KSPACE/fft3d.h
	M			src/MAKE/Makefile.openmpi
	M			src/MAKE/Makefile.openmpi-fftw3
	P			src/MAKE/Makefile.openmpi-icc Copied from src/MAKE/Makefile.openmpi-mkl
	M			src/MAKE/Makefile.openmpi-kissfft
	P			src/MAKE/Makefile.openmpi-mkl Copied to src/MAKE/Makefile.openmpi-icc
	M			src/MAKE/Makefile.openmpi-omp
	M			src/SHOCK/fix_msst.cpp
	M			src/USER-OPENMP/dihedral_class2_omp.cpp
	M			src/USER-OPENMP/dihedral_harmonic_omp.cpp
	M			src/USER-OPENMP/dihedral_helix_omp.cpp
	M			src/USER-OPENMP/dihedral_multi_harmonic_omp.cpp
	M			src/USER-OPENMP/dihedral_omp.cpp
	M			src/USER-OPENMP/dihedral_opls_omp.cpp
	M			src/USER-OPENMP/pair_airebo_omp.cpp
	M			src/USER-OPENMP/pair_born_coul_long_omp.cpp
	M			src/USER-OPENMP/pair_buck_coul_cut_omp.cpp
	M			src/USER-OPENMP/pair_buck_coul_long_omp.cpp
	M			src/USER-OPENMP/pair_buck_omp.cpp
	M			src/USER-OPENMP/pair_cg_cmm_omp.cpp
	M			src/USER-OPENMP/pair_colloid_omp.cpp
	M			src/USER-OPENMP/pair_coul_cut_omp.cpp
	M			src/USER-OPENMP/pair_coul_debye_omp.cpp
	M			src/USER-OPENMP/pair_coul_diel_omp.cpp
	M			src/USER-OPENMP/pair_coul_long_omp.cpp
	M			src/USER-OPENMP/pair_dipole_cut_omp.cpp
	M			src/USER-OPENMP/pair_dpd_omp.cpp
	M			src/USER-OPENMP/pair_dpd_tstat_omp.cpp
	M			src/USER-OPENMP/pair_eam_omp.cpp
	M			src/USER-OPENMP/pair_gauss_cut_omp.cpp
	M			src/USER-OPENMP/pair_gayberne_omp.cpp
	M			src/USER-OPENMP/pair_gran_hertz_history_omp.cpp
	M			src/USER-OPENMP/pair_gran_hooke_history_omp.cpp
	M			src/USER-OPENMP/pair_gran_hooke_omp.cpp
	M			src/USER-OPENMP/pair_lj96_cut_omp.cpp
	M			src/USER-OPENMP/pair_lj_charmm_coul_charmm_implicit_omp.cpp
	M			src/USER-OPENMP/pair_lj_charmm_coul_charmm_omp.cpp
	M			src/USER-OPENMP/pair_lj_charmm_coul_long_omp.cpp
	M			src/USER-OPENMP/pair_lj_class2_coul_cut_omp.cpp
	M			src/USER-OPENMP/pair_lj_class2_coul_long_omp.cpp
	M			src/USER-OPENMP/pair_lj_class2_omp.cpp
	M			src/USER-OPENMP/pair_lj_cut_coul_cut_omp.cpp
	M			src/USER-OPENMP/pair_lj_cut_coul_debye_omp.cpp
	M			src/USER-OPENMP/pair_lj_cut_coul_long_omp.cpp
	M			src/USER-OPENMP/pair_lj_cut_omp.cpp
	M			src/USER-OPENMP/pair_lj_expand_omp.cpp
	M			src/USER-OPENMP/pair_lj_gromacs_coul_gromacs_omp.cpp
	M			src/USER-OPENMP/pair_lj_gromacs_omp.cpp
	M			src/USER-OPENMP/pair_lj_smooth_omp.cpp
	M			src/USER-OPENMP/pair_lubricate_omp.cpp
	M			src/USER-OPENMP/pair_morse_omp.cpp
	M			src/USER-OPENMP/pair_omp.cpp
	M			src/USER-OPENMP/pair_resquared_omp.cpp
	M			src/USER-OPENMP/pair_soft_omp.cpp
	M			src/USER-OPENMP/pair_sw_omp.cpp
	M			src/USER-OPENMP/pair_table_omp.cpp
	M			src/USER-OPENMP/pair_tersoff_omp.cpp
	M			src/USER-OPENMP/pair_yukawa_colloid_omp.cpp
	M			src/USER-OPENMP/pair_yukawa_omp.cpp
	M			src/comm.cpp
	M			src/compute_pair_local.cpp
	M			src/fix_adapt.cpp
	M			src/version.h