Diffusion lammps 4051aedf2c78

Merge branch 'small' into integration
4051aedf2c78
Actions

Authored by Steve Plimpton <sjplimp@sandia.gov> on Aug 31 2016, 21:58.

Description

Merge branch 'small' into integration

Conflicts:
src/compute_omega_chunk.cpp

Details

Committed

Steve Plimpton <sjplimp@sandia.gov>

Aug 31 2016, 21:58

Pushed

junge

Oct 19 2017, 09:53

Parents

rLAMMPSa2ea263652c6: remove vector/array class members shadowing the base class
rLAMMPSec8b9e21dbb4: sync with SVN

Branches

Unknown

Tags

Unknown

[HTTP/500] Internal Server Error FilesystemException: Failed to create a temporary directory: the disk is full.[HTTP/500] Internal Server Error FilesystemException: Failed to create a temporary directory: the disk is full.

Event Timeline

Steve Plimpton <sjplimp@sandia.gov> committed rLAMMPS4051aedf2c78: Merge branch 'small' into integration (authored by Steve Plimpton <sjplimp@sandia.gov>).Aug 31 2016, 21:58

Changes (29)

				Path
	M			doc/README.md
	M			doc/src/compute_omega_chunk.txt
	M			lib/meam/meam_setup_done.F
	M			src/BODY/compute_body_local.h
	M			src/RIGID/compute_rigid_local.h
	M			src/USER-REAXC/compute_spec_atom.h
	M			src/atom.cpp
	M			src/compute_angle_local.cpp
	M			src/compute_angle_local.h
	M			src/compute_bond_local.cpp
	M			src/compute_bond_local.h
	M			src/compute_chunk_atom.cpp
	M			src/compute_cna_atom.cpp
	M			src/compute_dihedral_local.cpp
	M			src/compute_dihedral_local.h
	M			src/compute_displace_atom.cpp
	M			src/compute_improper_local.cpp
	M			src/compute_improper_local.h
	M			src/compute_omega_chunk.cpp
	M			src/compute_pair_local.cpp
	M			src/compute_pair_local.h
	M			src/compute_property_atom.cpp
	M			src/compute_property_atom.h
	M			src/compute_property_local.cpp
	M			src/compute_property_local.h
	M			src/create_box.cpp
	M			src/fix_ave_chunk.cpp
	M			src/modify.cpp
	M			src/variable.cpp