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

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on Aug 23 2013, 13:31.

Description

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

Resolved Conflicts:
lib/atc/CbEam.h
src/USER-ATC/Install.sh

Details

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

Aug 23 2013, 13:31

Pushed

junge

Oct 6 2016, 16:49

Parents

rLAMMPS31b31f0a6ae6: ATC version 2.0, date: Aug22
rLAMMPS465133df80df: bugfix from lammps-users mailing list

Branches

Unknown

Tags

Unknown

Event Timeline

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS1ca6fb0f8160: Merge remote-tracking branch 'lammps-ro/master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).Aug 23 2013, 13:31

Merged Changes

Commit	Author	Details	Committed
31b31f0a6ae6	rjones	ATC version 2.0, date: Aug22	Aug 23 2013
dddbef699d3e	rjones	ATC version 2.0, date: Aug22	Aug 23 2013
9f64c9b12b3d	rjones	ATC version 2.0, date: Aug22	Aug 23 2013
eacdc7e58c63	rjones	not for release	Aug 23 2013
a04f267b5449	jzimmer	ATC version 2.0, date: Aug22	Aug 23 2013
56e627188382	jzimmer	ATC version 2.0, date: Aug22	Aug 23 2013
c03bceba209e	jzimmer	ATC version 2.0, date: Aug22	Aug 23 2013
1ca9e814ebae	rjones	minor	Aug 23 2013
a3d7d3af3479	rjones	name change	Aug 23 2013
168714abb915	rjones	another bmark from examples	Aug 23 2013

Changes (127)
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/in.ftcb_constV
M		examples/USER/atc/cauchy_born/in.read_xref
M		examples/USER/atc/cauchy_born/read_xref.screen
M		examples/USER/atc/drift_diffusion/convective_pulse.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/schrodinger-poisson2d_Jconstraint.screen
D		examples/USER/atc/dxa
D		examples/USER/atc/dxa/in.eam_tension_frame
D		examples/USER/atc/dxa/in.eam_tension_mesh_frame
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.cnt_electrostatic
M		examples/USER/atc/elastic/in.cnt_fixed_charge
M		examples/USER/atc/elastic/in.electrostatic_bending
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/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/in.semicircle
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.harmonic_bonds
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
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/in.cutout
M		examples/USER/atc/two_temperature/in.uniform_exchange
M		examples/USER/atc/two_temperature/in.uniform_heating
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/ConcentrationRegulator.cpp
M		lib/atc/ConcentrationRegulator.h
M		lib/atc/DiagonalMatrix.h
A		lib/atc/DislocationExtractor.h
M		lib/atc/GhostManager.cpp
M		lib/atc/GhostManager.h
M		lib/atc/KinetoThermostat.cpp
M		lib/atc/KinetoThermostat.h
M		lib/atc/LammpsInterface.cpp
M		lib/atc/LammpsInterface.h
M		regress/benchmark.py
A	(dir)	regress/melt/
A		regress/melt/in.melt
A		regress/melt/log.melt.linux.4
M		regress/min/in.min.box
D		regress/min/log.min.18Feb13.linux.1
D		regress/min/log.min.18Feb13.linux.4
D		regress/min/log.min.box.18Feb13.linux.1
D		regress/min/log.min.box.18Feb13.linux.4
A		regress/min/log.min.box.linux.4
A		regress/min/log.min.linux.4
M		regress/regression.sh
M		src/USER-ATC/fix_atc.cpp