Diffusion lammps 72bf576c1a67

Merge remote-tracking branch 'lammps-ro/master' into lammps-icms
72bf576c1a67
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Nov 21 2014, 16:05.

Description

Merge remote-tracking branch 'lammps-ro/master' into lammps-icms

Resolved Conflicts:
doc/Manual.html
doc/Manual.txt
src/compute_force_molecule.cpp

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Nov 21 2014, 16:05

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS3d3a85df2b38: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12763 f3b2605a-c512-4ea7…
rLAMMPS6981237880d9: undo local customiztions to USER-ATC in order to simplify the merge with…

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS72bf576c1a67: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Nov 21 2014, 16:05

Merged Changes

Commit	Author	Details	Committed
3d3a85df2b38	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12763 f3b2605a-c512-4ea7…	Nov 20 2014
f0259bd27e52	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12762 f3b2605a-c512-4ea7…	Nov 20 2014
94769a0e1908	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12760 f3b2605a-c512-4ea7…	Nov 20 2014
16fbe2f70f68	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12759 f3b2605a-c512-4ea7…	Nov 20 2014
d845ef5e8f48	jatempl	ATC version 2.0, date: Nov20	Nov 20 2014
ac5973073fab	jatempl	ATC version 2.0, date: Nov20	Nov 20 2014
2fecb0f4b838	jatempl	ATC version 2.0, date: Nov20	Nov 20 2014
50459a7034e7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12755 f3b2605a-c512-4ea7…	Nov 20 2014
bb0fff04685f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12754 f3b2605a-c512-4ea7…	Nov 20 2014
d476b251e929	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12753 f3b2605a-c512-4ea7…	Nov 20 2014
7f8f2fd3ed14	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12752 f3b2605a-c512-4ea7…	Nov 20 2014
973b24564e7e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12751 f3b2605a-c512-4ea7…	Nov 20 2014
3a10de35be68	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12750 f3b2605a-c512-4ea7…	Nov 20 2014

Changes (110)
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/compute_atom_molecule.html
	M			doc/compute_atom_molecule.txt
	D			doc/compute_force_molecule.html
	D			doc/compute_force_molecule.txt
	M			doc/compute_vcm_molecule.html
	M			doc/compute_vcm_molecule.txt
	M			doc/read_data.html
	M			doc/read_data.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
	M			examples/USER/atc/hardy/eshelby_static.screen
	M			examples/USER/atc/hardy/nvt.screen
	M			lib/atc/ATC_Coupling.cpp
	M			lib/atc/ATC_Coupling.h
	M			lib/atc/ATC_CouplingEnergy.cpp
	M			lib/atc/ATC_CouplingMomentumEnergy.cpp
	M			lib/atc/ATC_Error.h
	M			lib/atc/ATC_Method.cpp
	M			lib/atc/ATC_Method.h
	M			lib/atc/ATC_TypeDefs.h
	M			lib/atc/AtomicRegulator.cpp
	M			lib/atc/AtomicRegulator.h
	M			lib/atc/DenseMatrix.h
	M			lib/atc/DiagonalMatrix.h
	M			lib/atc/ElectronDragPower.cpp
	M			lib/atc/ElectronFlux.h
	M			lib/atc/ExtrinsicModelDriftDiffusion.cpp
	M			lib/atc/ExtrinsicModelDriftDiffusion.h
	M			lib/atc/ExtrinsicModelElectrostatic.cpp
	M			lib/atc/ExtrinsicModelTwoTemperature.cpp
	M			lib/atc/ExtrinsicModelTwoTemperature.h
	M			lib/atc/FE_Element.cpp
	M			lib/atc/FE_Engine.cpp
	M			lib/atc/FE_Engine.h
	M			lib/atc/FE_Mesh.cpp
	M			lib/atc/FE_Mesh.h
	M			lib/atc/FieldEulerIntegrator.cpp
	M			lib/atc/FieldEulerIntegrator.h
	M			lib/atc/FieldManager.cpp
	M			lib/atc/Function.cpp
	M			lib/atc/GhostManager.cpp
	M			lib/atc/GhostManager.h
	M			lib/atc/ImplicitSolveOperator.cpp
	M			lib/atc/ImplicitSolveOperator.h
	M			lib/atc/KD_Tree.cpp
	M			lib/atc/KernelFunction.cpp
	M			lib/atc/KinetoThermostat.cpp
	M			lib/atc/KinetoThermostat.h
	M			lib/atc/Kinetostat.cpp
	M			lib/atc/Kinetostat.h
	M			lib/atc/LammpsInterface.cpp
	M			lib/atc/LammpsInterface.h
	M			lib/atc/LinearSolver.cpp
	M			lib/atc/LinearSolver.h
	M			lib/atc/MPI_Wrappers.cpp
	M			lib/atc/MPI_Wrappers.h
	M			lib/atc/Material.cpp
	M			lib/atc/Matrix.h
	M			lib/atc/MeshReader.cpp
	M			lib/atc/OutputManager.cpp
	M			lib/atc/OutputManager.h
	A			lib/atc/POEMSChain.h
	M			lib/atc/PerAtomQuantityLibrary.cpp
	M			lib/atc/PerAtomQuantityLibrary.h
	M			lib/atc/PoissonSolver.cpp
	M			lib/atc/PrescribedDataManager.cpp
	M			lib/atc/PrescribedDataManager.h
	M			lib/atc/SchrodingerSolver.cpp
	M			lib/atc/SchrodingerSolver.h
	A			lib/atc/SystemProcessor.h
	M			lib/atc/Thermostat.cpp
	M			lib/atc/Thermostat.h
	M			lib/atc/TimeIntegrator.h
	M			lib/atc/TransferLibrary.cpp
	M			lib/atc/TransferLibrary.h
	M			lib/atc/Utility.h
	M			lib/atc/Vector.h
	M			lib/atc/WeakEquationElectronContinuity.cpp
	M			lib/atc/WeakEquationElectronMomentum.cpp
	M			lib/atc/WeakEquationElectronTemperature.cpp
	M			lib/atc/WeakEquationElectronTemperature.h
	M			src/MC/fix_bond_create.cpp
	M			src/Make.py
	M			src/USER-ATC/fix_atc.cpp
	M			src/USER-ATC/fix_atc.h
	M			src/balance.cpp
	M			src/comm.cpp
	M			src/comm.h
	M			src/comm_tiled.cpp
	M			src/comm_tiled.h
	D			src/compute_force_molecule.cpp
	D			src/compute_force_molecule.h
	M			src/displace_atoms.cpp
	M			src/domain.cpp
	M			src/domain.h
	M			src/fix_balance.cpp
	M			src/irregular.cpp
	M			src/irregular.h
	M			src/version.h
	M			tools/amber2lmp/amber2lammps.py