Merge remote branch 'lammps-ro/master' into lammps-icms
b46ddebe3eef
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Sep 5 2013, 14:02.

Description

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

Resolved Conflicts:
doc/Manual.txt

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Sep 5 2013, 14:02

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPSb3b26852c4e3: git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10717 f3b2605a-c512-4ea7…
rLAMMPScb88752caad1: Merge remote branch 'lammps-ro/master' into lammps-icms

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPSb46ddebe3eef: Merge remote branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Sep 5 2013, 14:02

Merged Changes

Commit	Author	Details	Committed
b3b26852c4e3	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10717 f3b2605a-c512-4ea7…	Sep 4 2013
f908a2e9fb89	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10716 f3b2605a-c512-4ea7…	Sep 4 2013
3d33a8d56bb8	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10715 f3b2605a-c512-4ea7…	Sep 4 2013
0e4b1d757fbb	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10714 f3b2605a-c512-4ea7…	Sep 4 2013
2a6b344897c7	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10713 f3b2605a-c512-4ea7…	Sep 4 2013
06de308627a0	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10712 f3b2605a-c512-4ea7…	Sep 4 2013
d018e873d510	rjones	ATC version 2.0, date: Sep1	Sep 1 2013
5302074b3f8e	rjones	ATC version 2.0, date: Sep1	Sep 1 2013
2b9171177d50	rjones	ATC version 2.0, date: Sep1	Sep 1 2013
ec9b2d0b7b9e	rjones	ATC version 2.0, date: Sep1	Sep 1 2013

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
	A			doc/USER/atc/svn_add.stdout
	A			doc/USER/atc/svn_commit.stdout
	M			doc/fix_rigid.html
	M			doc/fix_rigid.txt
	M			doc/fix_viscous.html
	M			doc/fix_viscous.txt
	M			doc/velocity.html
	M			doc/velocity.txt
	M			examples/USER/atc/cauchy_born/cb_biaxial.screen
	M			examples/USER/atc/cauchy_born/cb_shear.screen
	M			examples/USER/atc/cauchy_born/cb_unistrain.screen
	M			examples/USER/atc/cauchy_born/cb_unistrain_eam.screen
	M			examples/USER/atc/cauchy_born/cb_unistrain_eam_linear.screen
	M			examples/USER/atc/cauchy_born/cb_unistrain_linear.screen
	M			examples/USER/atc/cauchy_born/cb_volumetric.screen
	M			examples/USER/atc/cauchy_born/flying_cube.screen
	M			examples/USER/atc/cauchy_born/ftcb_constV.screen
	M			examples/USER/atc/cauchy_born/read_xref.screen
	M			examples/USER/atc/drift_diffusion/convective_pulse.screen
	M			examples/USER/atc/drift_diffusion/ddm_schrodinger.screen
	M			examples/USER/atc/drift_diffusion/finite_well.screen
	M			examples/USER/atc/drift_diffusion/no_atoms_ddm.screen
	M			examples/USER/atc/drift_diffusion/null_material_ddm.screen
	M			examples/USER/atc/drift_diffusion/poisson1d_noatoms.screen
	M			examples/USER/atc/drift_diffusion/poisson2d_noatoms.screen
	M			examples/USER/atc/drift_diffusion/schrodinger-poisson2d_Jconstraint.screen
	M			examples/USER/atc/drift_diffusion/schrodinger-poisson2d_convective.screen
	M			examples/USER/atc/drift_diffusion/schrodinger-poisson2d_noatoms.screen
	M			examples/USER/atc/elastic/bar1d.screen
	M			examples/USER/atc/elastic/bar1d_damped.screen
	M			examples/USER/atc/elastic/bar1d_flux.screen
	M			examples/USER/atc/elastic/bar1d_frac_step.screen
	M			examples/USER/atc/elastic/bar1d_ghost_flux.screen
	M			examples/USER/atc/elastic/bar1d_thermo_elastic.screen
	M			examples/USER/atc/elastic/cnt_electrostatic.screen
	M			examples/USER/atc/elastic/cnt_electrostatic2.screen
	M			examples/USER/atc/elastic/cnt_fixed_charge.screen
	M			examples/USER/atc/elastic/eam_energy.screen
	M			examples/USER/atc/elastic/electron_density.screen
	M			examples/USER/atc/elastic/electrostatic_bending.screen
	M			examples/USER/atc/elastic/electrostatic_bending_dos.screen
	M			examples/USER/atc/elastic/no_atoms.screen
	M			examples/USER/atc/elastic/no_atoms_cb.screen
	M			examples/USER/atc/elastic/no_atoms_cb_linear.screen
	M			examples/USER/atc/fluids/bar1d_fluids.screen
	M			examples/USER/atc/fluids/concentration.screen
	M			examples/USER/atc/fluids/conducting_interface.screen
	M			examples/USER/atc/fluids/dielectric_interface.screen
	M			examples/USER/atc/fluids/double_layer.screen
	M			examples/USER/atc/fluids/liquid_electrostatic.screen
	M			examples/USER/atc/fluids/opp_force.screen
	M			examples/USER/atc/fluids/poisson.screen
	M			examples/USER/atc/fluids/shear_flow.screen
	M			examples/USER/atc/fluids/shear_no_atoms.screen
	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			examples/USER/atc/mesh/gaussianIC1d_hex.screen
	M			examples/USER/atc/mesh/gaussianIC2d_hex.screen
	M			examples/USER/atc/mesh/gaussianIC2d_hex20_uniform.screen
	M			examples/USER/atc/mesh/gaussianIC2d_hex27_uniform.screen
	M			examples/USER/atc/mesh/gaussianIC2d_hex_uniform.screen
	M			examples/USER/atc/mesh/gaussianIC2d_tet.screen
	M			examples/USER/atc/mesh/kernel2d_hex.screen
	M			examples/USER/atc/mesh/kernel2d_tet.screen
	M			examples/USER/atc/mesh/mesh2d_tet.screen
	M			examples/USER/atc/mesh/semicircle.screen
	M			examples/USER/atc/molecule/harmonic_bonds.screen
	M			examples/USER/atc/molecule/polarize.screen
	M			examples/USER/atc/molecule/quartic_bonds.screen
	M			examples/USER/atc/molecule/water.screen
	A			examples/USER/atc/svn_add.stdout
	A			examples/USER/atc/svn_commit.stdout
	M			examples/USER/atc/thermal/bar1d.screen
	M			examples/USER/atc/thermal/bar1d_all_atoms.screen
	M			examples/USER/atc/thermal/bar1d_combined.screen
	M			examples/USER/atc/thermal/bar1d_flux.screen
	M			examples/USER/atc/thermal/bar1d_frac_step.screen
	M			examples/USER/atc/thermal/bar1d_hoover.screen
	M			examples/USER/atc/thermal/bar1d_interpolate.screen
	M			examples/USER/atc/thermal/bar1d_lumped.screen
	M			examples/USER/atc/thermal/no_atoms.screen
	M			examples/USER/atc/two_temperature/bar1d_ttm.screen
	M			examples/USER/atc/two_temperature/cutout.screen
	M			examples/USER/atc/two_temperature/gaussianIC_ttm.screen
	M			examples/USER/atc/two_temperature/no_atoms.screen
	M			examples/USER/atc/two_temperature/restart.screen
	M			examples/USER/atc/two_temperature/uniform_exchange.screen
	M			examples/USER/atc/two_temperature/uniform_heating.screen
	M			lib/atc/ATC_Error.h
	M			src/RIGID/fix_rigid.cpp
	M			src/RIGID/fix_rigid.h
	M			src/RIGID/fix_rigid_small.cpp
	M			src/RIGID/fix_rigid_small.h
	A			src/USER-ATC/svn_add.stdout
	A			src/USER-ATC/svn_commit.stdout
	M			src/compute_reduce.cpp
	M			src/respa.cpp
	M			src/velocity.cpp
	M			src/velocity.h
	M			src/version.h