Merge branch 'master' into lammps-icms
1d68769ded88
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Feb 9 2013, 13:21.

Description

Merge branch 'master' into lammps-icms

Resolved Conflicts:
doc/Manual.txt
src/KSPACE/pair_buck_long_coul_long.cpp
src/USER-OMP/angle_fourier_omp.cpp
src/USER-OMP/angle_fourier_simple_omp.cpp
src/USER-OMP/angle_quartic_omp.cpp
src/USER-OMP/dihedral_fourier_omp.cpp
src/USER-OMP/dihedral_nharmonic_omp.cpp
src/USER-OMP/dihedral_quadratic_omp.cpp
src/USER-OMP/domain_omp.cpp
src/USER-OMP/fix_nh_asphere_omp.cpp
src/USER-OMP/fix_nh_omp.cpp
src/USER-OMP/fix_nh_sphere_omp.cpp
src/USER-OMP/fix_nve_omp.cpp
src/USER-OMP/fix_nvt_sllod_omp.cpp
src/USER-OMP/pair_dipole_sf_omp.cpp
src/USER-OMP/pair_hbond_dreiding_lj_omp.cpp
src/USER-OMP/pair_hbond_dreiding_morse_omp.cpp
src/math_special.h
src/neigh_bond.cpp
src/neighbor.h

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Feb 9 2013, 13:21

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS99f80bff9f85: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9426 f3b2605a-c512-4ea7…
rLAMMPS2fcebd9548b4: partial implementation of multi-threaded rigid integrator. tested.

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS1d68769ded88: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Feb 9 2013, 13:21

Merged Changes

Commit	Author	Details	Committed
99f80bff9f85	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9426 f3b2605a-c512-4ea7…	Feb 8 2013
fe9061f6958f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9425 f3b2605a-c512-4ea7…	Feb 8 2013
a6cbf805dcc4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9424 f3b2605a-c512-4ea7…	Feb 8 2013
da5db3b696df	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9422 f3b2605a-c512-4ea7…	Feb 8 2013
00cb8bb853db	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9421 f3b2605a-c512-4ea7…	Feb 8 2013
8e407aceca0a	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9420 f3b2605a-c512-4ea7…	Feb 8 2013
1dcaf9d44baf	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9418 f3b2605a-c512-4ea7…	Feb 8 2013
bf535a92a827	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9417 f3b2605a-c512-4ea7…	Feb 8 2013
7a286596d887	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9416 f3b2605a-c512-4ea7…	Feb 8 2013
906a57d52990	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9415 f3b2605a-c512-4ea7…	Feb 8 2013
8f797a3e2f39	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9414 f3b2605a-c512-4ea7…	Feb 8 2013
a62be73ba732	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9413 f3b2605a-c512-4ea7…	Feb 8 2013
9907a91db9e0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9412 f3b2605a-c512-4ea7…	Feb 8 2013
744e2093fdf8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9411 f3b2605a-c512-4ea7…	Feb 8 2013
3adb315c9e77	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9410 f3b2605a-c512-4ea7…	Feb 8 2013
d41265166ef5	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9409 f3b2605a-c512-4ea7…	Feb 8 2013
01311d340adc	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9408 f3b2605a-c512-4ea7…	Feb 8 2013
8c101ebc7007	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9407 f3b2605a-c512-4ea7…	Feb 8 2013
960e79fe53ec	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9406 f3b2605a-c512-4ea7…	Feb 8 2013
ebe08bf4ca16	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9405 f3b2605a-c512-4ea7…	Feb 8 2013
6676724eeebc	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9404 f3b2605a-c512-4ea7…	Feb 8 2013
9ce4e5b12186	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9403 f3b2605a-c512-4ea7…	Feb 8 2013
31dea6d086fb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9402 f3b2605a-c512-4ea7…	Feb 8 2013
0beb95626f71	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9401 f3b2605a-c512-4ea7…	Feb 8 2013
a480021fa6ce	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9400 f3b2605a-c512-4ea7…	Feb 8 2013
ce7dede594ea	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9399 f3b2605a-c512-4ea7…	Feb 8 2013
6bdbde76da85	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9398 f3b2605a-c512-4ea7…	Feb 8 2013

Changes (132)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path
	M			doc/Manual.html
	M			doc/Manual.txt
	M			doc/Section_commands.html
	M			doc/Section_commands.txt
	M			doc/angle_fourier.html
	M			doc/angle_fourier_simple.html
	M			doc/angle_quartic.html
	M			doc/compute_bond_local.html
	M			doc/compute_bond_local.txt
	M			doc/dihedral_fourier.html
	M			doc/dihedral_nharmonic.html
	M			doc/dihedral_quadratic.html
	M			doc/improper_fourier.html
	M			doc/kspace_style.html
	M			doc/kspace_style.txt
	M			src/CLASS2/bond_class2.cpp
	P			src/CLASS2/bond_class2.h Copied to src/USER-OMP/pair_lj_sdk_coul_msm_omp.h
	M			src/DIPOLE/atom_vec_dipole.cpp
	M			src/GRANULAR/fix_wall_gran.cpp
	M			src/GRANULAR/fix_wall_gran.h
	M			src/KSPACE/Install.sh
	A			src/KSPACE/msm_cg.cpp
	A			src/KSPACE/msm_cg.h
	M			src/KSPACE/pair_buck_long_coul_long.cpp
	M			src/KSPACE/pair_lj_long_coul_long.cpp
	M			src/MC/fix_bond_create.cpp
	M			src/MC/fix_bond_create.h
	M			src/MC/fix_bond_swap.cpp
	M			src/MOLECULE/atom_vec_angle.cpp
	M			src/MOLECULE/atom_vec_bond.cpp
	M			src/MOLECULE/atom_vec_full.cpp
	M			src/MOLECULE/atom_vec_molecular.cpp
	M			src/MOLECULE/bond_fene.cpp
	M			src/MOLECULE/bond_fene.h
	M			src/MOLECULE/bond_fene_expand.cpp
	M			src/MOLECULE/bond_fene_expand.h
	M			src/MOLECULE/bond_harmonic.cpp
	M			src/MOLECULE/bond_harmonic.h
	M			src/MOLECULE/bond_morse.cpp
	M			src/MOLECULE/bond_morse.h
	M			src/MOLECULE/bond_nonlinear.cpp
	M			src/MOLECULE/bond_nonlinear.h
	M			src/MOLECULE/bond_quartic.cpp
	M			src/MOLECULE/bond_quartic.h
	M			src/MOLECULE/bond_table.cpp
	M			src/MOLECULE/bond_table.h
	M			src/PERI/atom_vec_peri.cpp
	M			src/PERI/fix_peri_neigh.cpp
	M			src/PERI/fix_peri_neigh.h
	M			src/POEMS/fix_poems.cpp
	M			src/POEMS/fix_poems.h
	M			src/REPLICA/fix_event.cpp
	M			src/REPLICA/fix_event.h
	M			src/RIGID/fix_rigid.cpp
	M			src/RIGID/fix_rigid.h
	M			src/USER-ATC/fix_atc.cpp
	M			src/USER-ATC/fix_atc.h
	M			src/USER-AWPMD/atom_vec_wavepacket.cpp
	M			src/USER-CG-CMM/Install.sh
	M			src/USER-CG-CMM/Package.sh
	M			src/USER-CG-CMM/pair_lj_sdk_coul_long.h
	A			src/USER-CG-CMM/pair_lj_sdk_coul_msm.cpp
	A			src/USER-CG-CMM/pair_lj_sdk_coul_msm.h
	M			src/USER-CUDA/atom_vec_angle_cuda.cpp
	M			src/USER-CUDA/atom_vec_atomic_cuda.cpp
	M			src/USER-CUDA/atom_vec_charge_cuda.cpp
	M			src/USER-CUDA/atom_vec_full_cuda.cpp
	M			src/USER-CUDA/fix_shake_cuda.cpp
	M			src/USER-CUDA/fix_shake_cuda.h
	M			src/USER-EFF/atom_vec_electron.cpp
	A			src/USER-OMP/msm_cg_omp.cpp
	A			src/USER-OMP/msm_cg_omp.h
	A			src/USER-OMP/pair_lj_sdk_coul_msm_omp.cpp
	P			src/USER-OMP/pair_lj_sdk_coul_msm_omp.h Copied from src/CLASS2/bond_class2.h
	M			src/USER-REAXC/fix_qeq_reax.cpp
	M			src/USER-REAXC/fix_qeq_reax.h
	M			src/USER-REAXC/fix_reax_c.cpp
	M			src/USER-REAXC/fix_reax_c.h
	M			src/USER-SPH/atom_vec_meso.cpp
	M			src/atom_vec_atomic.cpp
	M			src/atom_vec_body.cpp
	M			src/atom_vec_charge.cpp
	M			src/atom_vec_ellipsoid.cpp
	M			src/atom_vec_hybrid.cpp
	M			src/atom_vec_line.cpp
	M			src/atom_vec_sphere.cpp
	M			src/atom_vec_tri.cpp
	M			src/bond.h
	M			src/bond_hybrid.cpp
	M			src/bond_hybrid.h
	M			src/comm.cpp
	M			src/comm.h
	M			src/compute_bond_local.cpp
	M			src/compute_bond_local.h
	M			src/compute_temp_com.h
	M			src/domain.cpp
	M			src/domain.h
	M			src/fix.h
	M			src/fix_ave_atom.cpp
	M			src/fix_ave_atom.h
	M			src/fix_ave_spatial.cpp
	M			src/fix_external.cpp
	M			src/fix_external.h
	M			src/fix_minimize.cpp
	M			src/fix_minimize.h
	M			src/fix_move.cpp
	M			src/fix_move.h
	M			src/fix_read_restart.cpp
	M			src/fix_read_restart.h
	M			src/fix_respa.cpp
	M			src/fix_respa.h
	M			src/fix_shake.cpp
	M			src/fix_shake.h
	M			src/fix_shear_history.cpp
	M			src/fix_shear_history.h
	M			src/fix_spring_self.cpp
	M			src/fix_spring_self.h
	M			src/fix_store_state.cpp
	M			src/fix_store_state.h
	M			src/fix_tmd.cpp
	M			src/fix_tmd.h
	M			src/math_special.h
	M			src/min.cpp
	M			src/modify.cpp
	M			src/modify.h
	M			src/neigh_bond.cpp
	M			src/neighbor.h
	M			src/region.cpp
	M			src/replicate.cpp
	M			src/respa.cpp
	M			src/verlet.cpp
	M			src/version.h

Merge branch 'master' into lammps-icms1d68769ded88Actions

Description

Details

Event Timeline

Merged Changes

Changes (132)Show All Changes

Very Large Commit

rLAMMPS1d68769ded88

doc/Manual.html

doc/Manual.txt

doc/Section_commands.html

doc/Section_commands.txt

doc/angle_fourier.html

doc/angle_fourier_simple.html

doc/angle_quartic.html

doc/compute_bond_local.html

doc/compute_bond_local.txt

doc/dihedral_fourier.html

doc/dihedral_nharmonic.html

doc/dihedral_quadratic.html

doc/improper_fourier.html

doc/kspace_style.html

doc/kspace_style.txt

src/CLASS2/bond_class2.cpp

src/CLASS2/bond_class2.h

src/DIPOLE/atom_vec_dipole.cpp

src/GRANULAR/fix_wall_gran.cpp

src/GRANULAR/fix_wall_gran.h

src/KSPACE/Install.sh

src/KSPACE/msm_cg.cpp

src/KSPACE/msm_cg.h

src/KSPACE/pair_buck_long_coul_long.cpp

src/KSPACE/pair_lj_long_coul_long.cpp

src/MC/fix_bond_create.cpp

src/MC/fix_bond_create.h

src/MC/fix_bond_swap.cpp

src/MOLECULE/atom_vec_angle.cpp

src/MOLECULE/atom_vec_bond.cpp

src/MOLECULE/atom_vec_full.cpp

src/MOLECULE/atom_vec_molecular.cpp

src/MOLECULE/bond_fene.cpp

src/MOLECULE/bond_fene.h

src/MOLECULE/bond_fene_expand.cpp

src/MOLECULE/bond_fene_expand.h

src/MOLECULE/bond_harmonic.cpp

src/MOLECULE/bond_harmonic.h

src/MOLECULE/bond_morse.cpp

src/MOLECULE/bond_morse.h

src/MOLECULE/bond_nonlinear.cpp

src/MOLECULE/bond_nonlinear.h

src/MOLECULE/bond_quartic.cpp

src/MOLECULE/bond_quartic.h

src/MOLECULE/bond_table.cpp

src/MOLECULE/bond_table.h

src/PERI/atom_vec_peri.cpp

src/PERI/fix_peri_neigh.cpp

src/PERI/fix_peri_neigh.h

src/POEMS/fix_poems.cpp

src/POEMS/fix_poems.h

src/REPLICA/fix_event.cpp

src/REPLICA/fix_event.h

src/RIGID/fix_rigid.cpp

src/RIGID/fix_rigid.h

src/USER-ATC/fix_atc.cpp

src/USER-ATC/fix_atc.h

src/USER-AWPMD/atom_vec_wavepacket.cpp

src/USER-CG-CMM/Install.sh

src/USER-CG-CMM/Package.sh

src/USER-CG-CMM/pair_lj_sdk_coul_long.h

src/USER-CG-CMM/pair_lj_sdk_coul_msm.cpp

src/USER-CG-CMM/pair_lj_sdk_coul_msm.h

src/USER-CUDA/atom_vec_angle_cuda.cpp

src/USER-CUDA/atom_vec_atomic_cuda.cpp

src/USER-CUDA/atom_vec_charge_cuda.cpp

src/USER-CUDA/atom_vec_full_cuda.cpp

src/USER-CUDA/fix_shake_cuda.cpp

src/USER-CUDA/fix_shake_cuda.h

src/USER-EFF/atom_vec_electron.cpp

src/USER-OMP/msm_cg_omp.cpp

src/USER-OMP/msm_cg_omp.h

Merge branch 'master' into lammps-icms
1d68769ded88
Actions

Changes (132)
Show All Changes