Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added Axilrod-Teller manybody potential #987

Merged
merged 25 commits into from
Aug 29, 2018
Merged

Added Axilrod-Teller manybody potential #987

merged 25 commits into from
Aug 29, 2018

Commits on Jul 4, 2018

  1. Added Axilrod-Teller manybody potential

    Sergey Lishchuk committed Jul 4, 2018
    Configuration menu
    Copy the full SHA
    7260bb5 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2018

  1. mods to Sergey's files

    Steven J. Plimpton committed Jul 9, 2018
    Configuration menu
    Copy the full SHA
    3a824b3 View commit details
    Browse the repository at this point in the history

  2. remove HTML file

    Steven J. Plimpton committed Jul 9, 2018
    Configuration menu
    Copy the full SHA
    75ec0a6 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2018

  1. Updated documentation and source

    Sergey Lishchuk committed Jul 13, 2018
    Configuration menu
    Copy the full SHA
    bf5fbc9 View commit details
    Browse the repository at this point in the history

  2. Updated documentation and source

    Sergey Lishchuk committed Jul 13, 2018
    Configuration menu
    Copy the full SHA
    b461967 View commit details
    Browse the repository at this point in the history

  3. Resolved merge conflict.

    @sergeylishchuk
    sergeylishchuk committed Jul 13, 2018
    Configuration menu
    Copy the full SHA
    eeaf907 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2018

  1. more changes to ATM source and doc file

    Steven J. Plimpton committed Jul 16, 2018
    Configuration menu
    Copy the full SHA
    d4385ad View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2018

  1. Merge https://github.com/lammps/lammps

    @sergeylishchuk
    sergeylishchuk committed Jul 17, 2018
    Configuration menu
    Copy the full SHA
    dbd0d21 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/sergeylishchuk/lammps

    @sergeylishchuk
    sergeylishchuk committed Jul 17, 2018
    Configuration menu
    Copy the full SHA
    54e33bd View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2018

  1. fix typo in pair_atm.txt

    @akohlmey
    akohlmey committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    7702114 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2018

  1. Merge https://github.com/lammps/lammps 

    more changes to ATM source and doc file
    @sergeylishchuk
    sergeylishchuk committed Jul 26, 2018
    Configuration menu
    Copy the full SHA
    7cae80b View commit details
    Browse the repository at this point in the history

  2. more changes to ATM source and doc file

    @sergeylishchuk
    sergeylishchuk committed Jul 26, 2018
    Configuration menu
    Copy the full SHA
    a2303e5 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/sergeylishchuk/lammps

    @sergeylishchuk
    sergeylishchuk committed Jul 26, 2018
    Configuration menu
    Copy the full SHA
    ed96958 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2018

  1. sorted out restart

    @sergeylishchuk
    sergeylishchuk committed Jul 27, 2018
    Configuration menu
    Copy the full SHA
    649d016 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2018

  1. more changes to ATM source and doc file

    @sergeylishchuk
    sergeylishchuk committed Aug 6, 2018
    Configuration menu
    Copy the full SHA
    4d75d2d View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2018

  1. proposed SJP changes for 2nd cutoff_triple

    Steven J. Plimpton committed Aug 20, 2018
    Configuration menu
    Copy the full SHA
    937d470 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2018

  1. Merge branch 'master' into axilrod-teller 

    # Conflicts:
#	cmake/CMakeLists.txt
#	doc/src/Commands.txt
#	doc/src/Commands_bond.txt
#	doc/src/Howto.txt
#	doc/src/Howto_bioFF.txt
#	doc/src/Howto_coreshell.txt
#	doc/src/Howto_couple.txt
#	doc/src/Howto_diffusion.txt
#	doc/src/Howto_dispersion.txt
#	doc/src/Howto_granular.txt
#	doc/src/Howto_library.txt
#	doc/src/Howto_multiple.txt
#	doc/src/Howto_replica.txt
#	doc/src/Howto_restart.txt
#	doc/src/Howto_temperature.txt
#	doc/src/Howto_tip4p.txt
#	doc/src/Intro.txt
#	doc/src/Intro_authors.txt
#	doc/src/Intro_features.txt
#	doc/src/Intro_nonfeatures.txt
#	doc/src/Manual.txt
#	doc/src/Manual_version.txt
#	doc/src/Packages.txt
#	doc/src/Packages_details.txt
#	doc/src/Packages_standard.txt
#	doc/src/Packages_user.txt
#	doc/src/Section_start.txt
#	doc/src/Speed.txt
#	doc/src/Speed_compare.txt
#	doc/src/Speed_gpu.txt
#	doc/src/Speed_intel.txt
#	doc/src/Speed_kokkos.txt
#	doc/src/Speed_measure.txt
#	doc/src/Speed_omp.txt
#	doc/src/Speed_opt.txt
#	doc/src/Speed_packages.txt
#	doc/src/Speed_tips.txt
#	doc/src/fix_deform.txt
#	doc/src/fix_external.txt
#	doc/src/fix_property_atom.txt
#	doc/src/lammps.book
#	doc/src/neb.txt
#	doc/src/pair_eam.txt
#	doc/src/prd.txt
#	doc/src/run_style.txt
#	doc/src/temper.txt
#	src/version.h
    @akohlmey
    akohlmey committed Aug 23, 2018
    Configuration menu
    Copy the full SHA
    929185d View commit details
    Browse the repository at this point in the history

  2. whitespace cleanup

    @akohlmey
    akohlmey committed Aug 23, 2018
    Configuration menu
    Copy the full SHA
    4f36f07 View commit details
    Browse the repository at this point in the history

  3. restore files

    @akohlmey
    akohlmey committed Aug 23, 2018
    Configuration menu
    Copy the full SHA
    c5d3274 View commit details
    Browse the repository at this point in the history

  4. adapt docs to refactored manual

    @akohlmey
    akohlmey committed Aug 23, 2018
    Configuration menu
    Copy the full SHA
    648d8c3 View commit details
    Browse the repository at this point in the history

  5. fully integrate atm pair style into manual

    @akohlmey
    akohlmey committed Aug 23, 2018
    Configuration menu
    Copy the full SHA
    a04008c View commit details
    Browse the repository at this point in the history

  6. use c++ style system headers

    @akohlmey
    akohlmey committed Aug 23, 2018
    Configuration menu
    Copy the full SHA
    59d3af4 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2018

  1. resolution of cutoff issues

    Steven J. Plimpton committed Aug 24, 2018
    Configuration menu
    Copy the full SHA
    44bda24 View commit details
    Browse the repository at this point in the history

  2. new loop structure in pair ATM

    Steven J. Plimpton committed Aug 24, 2018
    Configuration menu
    Copy the full SHA
    c01fb5f View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2018

  1. more changes to insure each triplet IJK computed exactly once

    Steven J. Plimpton committed Aug 27, 2018
    Configuration menu
    Copy the full SHA
    31ed3f7 View commit details
    Browse the repository at this point in the history