Merge branch 'master' into lammps-icms
e1709a44891d
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Jan 18 2013, 13:50.

Description

Merge branch 'master' into lammps-icms

Resolved Conflicts:
src/USER-OMP/msm_omp.cpp
src/USER-OMP/msm_omp.h
src/USER-OMP/pair_born_coul_msm_omp.cpp
src/USER-OMP/pair_born_coul_msm_omp.h
src/USER-OMP/pair_buck_coul_msm_omp.cpp
src/USER-OMP/pair_buck_coul_msm_omp.h
src/USER-OMP/pair_coul_msm_omp.cpp
src/USER-OMP/pair_coul_msm_omp.h
src/USER-OMP/pair_lj_charmm_coul_msm_omp.cpp
src/USER-OMP/pair_lj_charmm_coul_msm_omp.h
src/USER-OMP/pair_lj_cut_coul_msm_omp.cpp
src/USER-OMP/pair_lj_cut_coul_msm_omp.h

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Jan 18 2013, 13:50

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS9639777677b4: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9291 f3b2605a-c512-4ea7…
rLAMMPSc0c44e028305: Merge branch 'master' into lammps-icms

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSe1709a44891d: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Jan 18 2013, 13:50

Merged Changes

Commit	Author	Details	Committed
9639777677b4	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9291 f3b2605a-c512-4ea7…	Jan 17 2013
78aaed5f2215	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9290 f3b2605a-c512-4ea7…	Jan 17 2013
9cd44aec3346	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9288 f3b2605a-c512-4ea7…	Jan 17 2013
474bb7715443	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9287 f3b2605a-c512-4ea7…	Jan 17 2013
96d5a89f71a8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9286 f3b2605a-c512-4ea7…	Jan 17 2013
f867e83a7767	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9285 f3b2605a-c512-4ea7…	Jan 17 2013
bd896f53f284	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9284 f3b2605a-c512-4ea7…	Jan 17 2013
806b7d4ad344	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9282 f3b2605a-c512-4ea7…	Jan 17 2013
c7de83772485	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9281 f3b2605a-c512-4ea7…	Jan 17 2013
56a3ae0ecad6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9280 f3b2605a-c512-4ea7…	Jan 17 2013
b078dc5e0beb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9279 f3b2605a-c512-4ea7…	Jan 17 2013
87f2415519d6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9278 f3b2605a-c512-4ea7…	Jan 17 2013
f51ad982f602	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9277 f3b2605a-c512-4ea7…	Jan 17 2013
f70511be8768	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9276 f3b2605a-c512-4ea7…	Jan 17 2013
2cc946fdb5ba	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9275 f3b2605a-c512-4ea7…	Jan 17 2013

Changes (31)

				Path
	M			doc/fix_srd.html
	M			doc/fix_srd.txt
	M			examples/USER/atc/hardy/consistency.screen
	M			examples/USER/atc/hardy/eam_kernel_convergence.screen
	M			examples/USER/atc/hardy/eam_unistrain_cell.screen
	M			examples/USER/atc/hardy/eam_unistrain_mesh.screen
	M			examples/USER/atc/hardy/eam_unistrain_qcylinder.screen
	M			examples/USER/atc/hardy/eam_unistrain_qsphere.screen
	M			examples/USER/atc/hardy/eam_unistrain_step.screen
	M			examples/USER/atc/hardy/eam_volume_stretch.screen
	A			examples/USER/atc/hardy/eshelby_static.screen
	M			examples/USER/atc/hardy/in.consistency
	M			examples/USER/atc/hardy/in.eam_kernel_convergence
	M			examples/USER/atc/hardy/in.eam_unistrain_cell
	M			examples/USER/atc/hardy/in.eam_unistrain_mesh
	M			examples/USER/atc/hardy/in.eam_unistrain_qcylinder
	M			examples/USER/atc/hardy/in.eam_unistrain_qsphere
	M			examples/USER/atc/hardy/in.eam_unistrain_step
	M			examples/USER/atc/hardy/in.eam_volume_stretch
	A			examples/USER/atc/hardy/in.eshelby_static
	M			examples/USER/atc/hardy/in.nvt
	A			examples/USER/atc/hardy/nvt.data
	A			examples/USER/atc/hardy/nvt.screen
	M			lib/atc/ATC_TransferHardy.cpp
	M			src/SRD/fix_srd.cpp
	M			src/SRD/fix_srd.h
	M			src/input.cpp
	M			src/pair_hybrid.cpp
	M			src/pair_hybrid.h
	M			src/special.cpp
	M			src/version.h

Merge branch 'master' into lammps-icmse1709a44891dActions

Description

Details

Event Timeline

Merged Changes

Changes (31)

rLAMMPSe1709a44891d

doc/fix_srd.html

doc/fix_srd.txt

examples/USER/atc/hardy/consistency.screen

examples/USER/atc/hardy/eam_kernel_convergence.screen

examples/USER/atc/hardy/eam_unistrain_cell.screen

examples/USER/atc/hardy/eam_unistrain_mesh.screen

examples/USER/atc/hardy/eam_unistrain_qcylinder.screen

examples/USER/atc/hardy/eam_unistrain_qsphere.screen

examples/USER/atc/hardy/eam_unistrain_step.screen

examples/USER/atc/hardy/eam_volume_stretch.screen

examples/USER/atc/hardy/eshelby_static.screen

examples/USER/atc/hardy/in.consistency

examples/USER/atc/hardy/in.eam_kernel_convergence

examples/USER/atc/hardy/in.eam_unistrain_cell

examples/USER/atc/hardy/in.eam_unistrain_mesh

examples/USER/atc/hardy/in.eam_unistrain_qcylinder

examples/USER/atc/hardy/in.eam_unistrain_qsphere

examples/USER/atc/hardy/in.eam_unistrain_step

examples/USER/atc/hardy/in.eam_volume_stretch

examples/USER/atc/hardy/in.eshelby_static

examples/USER/atc/hardy/in.nvt

examples/USER/atc/hardy/nvt.data

examples/USER/atc/hardy/nvt.screen

lib/atc/ATC_TransferHardy.cpp

src/SRD/fix_srd.cpp

src/SRD/fix_srd.h

src/input.cpp

src/pair_hybrid.cpp

src/pair_hybrid.h

src/special.cpp

src/version.h

Merge branch 'master' into lammps-icms
e1709a44891d
Actions