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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Aug 29 2013, 16:14.

Description

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

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Aug 29 2013, 16:14

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS07e3b8c7d7d8: ATC version 2.0, date: Aug28
rLAMMPSc767f5b218db: Merge branch 'lammps-icms' of git://git.icms.temple.edu/lammps-icms into lammps…

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS2c30d74d8d0d: Merge remote branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Aug 29 2013, 16:14

Merged Changes

Commit	Author	Details	Committed
07e3b8c7d7d8	rjones	ATC version 2.0, date: Aug28	Aug 29 2013
8d6d4e9289dd	rjones	ATC version 2.0, date: Aug28	Aug 29 2013
4df2113a8024	rjones	ATC version 2.0, date: Aug28	Aug 29 2013

Changes (121)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path
	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/in.bar1d_frac_step
	M			examples/USER/atc/elastic/in.bar1d_ghost_flux
	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/in.nvt
	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/in.polarize
	M			examples/USER/atc/molecule/polarize.screen
	M			examples/USER/atc/molecule/quartic_bonds.screen
	M			examples/USER/atc/molecule/water.screen
	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/in.bar1d_frac_step
	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_Coupling.cpp
	M			lib/atc/ATC_Coupling.h
	M			lib/atc/ATC_CouplingEnergy.cpp
	M			lib/atc/ATC_CouplingEnergy.h
	M			lib/atc/ATC_CouplingMass.cpp
	M			lib/atc/ATC_CouplingMass.h
	M			lib/atc/ATC_CouplingMomentum.cpp
	M			lib/atc/ATC_CouplingMomentum.h
	M			lib/atc/ATC_CouplingMomentumEnergy.cpp
	M			lib/atc/ATC_CouplingMomentumEnergy.h
	M			lib/atc/ATC_Method.cpp
	M			lib/atc/ATC_Method.h
	M			lib/atc/ATC_Transfer.cpp
	M			lib/atc/ATC_Transfer.h
	M			lib/atc/ConcentrationRegulator.cpp
	M			lib/atc/ElasticTimeIntegrator.cpp
	M			lib/atc/ElasticTimeIntegrator.h
	M			lib/atc/ExtrinsicModel.cpp
	M			lib/atc/ExtrinsicModel.h
	M			lib/atc/FE_Engine.cpp
	M			lib/atc/FE_Mesh.cpp
	M			lib/atc/InterscaleOperators.cpp
	M			lib/atc/InterscaleOperators.h
	M			lib/atc/Kinetostat.cpp
	M			lib/atc/Kinetostat.h
	M			lib/atc/SpeciesTimeIntegrator.h
	M			lib/atc/TimeIntegrator.cpp
	M			lib/atc/TimeIntegrator.h
	M			src/USER-ATC/fix_atc.cpp
	M			src/USER-ATC/fix_atc.h