ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

final steps

Browse Source
This commit is contained in:
tomswinburne
2020-08-24 17:04:35 +02:00
parent 2ee6e9077a
commit 28d59ce594
5 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
doc/src/Build_package.rst
View File

@ -136,10 +136,7 @@ src directory.
.. _cmake_presets: .. _cmake_presets:
CMake presets for installing many packages CMake presets for installing many packages
<<<<<<< HEAD
=======
"""""""""""""""""""""""""""""""""""""""""" """"""""""""""""""""""""""""""""""""""""""
>>>>>>> upstream/master
Instead of specifying all the CMake options via the command-line, Instead of specifying all the CMake options via the command-line,
CMake allows initializing its settings cache using script files. CMake allows initializing its settings cache using script files.

3
doc/src/Commands_fix.rst
View File

@ -150,10 +150,7 @@ OPT.
* :doc:`orient/bcc <fix_orient>` * :doc:`orient/bcc <fix_orient>`
* :doc:`orient/fcc <fix_orient>` * :doc:`orient/fcc <fix_orient>`
* :doc:`orient/eco <fix_orient_eco>` * :doc:`orient/eco <fix_orient_eco>`
<<<<<<< HEAD
* :doc:`pafi <fix_pafi>` * :doc:`pafi <fix_pafi>`
=======
>>>>>>> upstream/master
* :doc:`phonon <fix_phonon>` * :doc:`phonon <fix_phonon>`
* :doc:`pimd <fix_pimd>` * :doc:`pimd <fix_pimd>`
* :doc:`planeforce <fix_planeforce>` * :doc:`planeforce <fix_planeforce>`

3
doc/src/compute_property_atom.rst
View File

@ -189,11 +189,8 @@ Related commands
:doc:`dump custom <dump>`, :doc:`compute reduce <compute_reduce>`, :doc:`dump custom <dump>`, :doc:`compute reduce <compute_reduce>`,
:doc::doc:`fix ave/atom <fix_ave_atom>`, :doc:`fix ave/chunk :doc::doc:`fix ave/atom <fix_ave_atom>`, :doc:`fix ave/chunk
:doc:<fix_ave_chunk>`, `fix property/atom <fix_property_atom>` :doc:<fix_ave_chunk>`, `fix property/atom <fix_property_atom>`
<<<<<<< HEAD
=======
Default Default
""""""" """""""
>>>>>>> upstream/master
none none

3
doc/src/fix.rst
View File

@ -293,10 +293,7 @@ accelerated styles exist.
* :doc:`orient/bcc <fix_orient>` - add grain boundary migration force for BCC * :doc:`orient/bcc <fix_orient>` - add grain boundary migration force for BCC
* :doc:`orient/fcc <fix_orient>` - add grain boundary migration force for FCC * :doc:`orient/fcc <fix_orient>` - add grain boundary migration force for FCC
* :doc:`orient/eco <fix_orient_eco>` - add generalized grain boundary migration force * :doc:`orient/eco <fix_orient_eco>` - add generalized grain boundary migration force
<<<<<<< HEAD
* :doc:`pafi <fix_pafi>` - constrained force averages on hyper-planes to compute free energies (PAFI) * :doc:`pafi <fix_pafi>` - constrained force averages on hyper-planes to compute free energies (PAFI)
=======
>>>>>>> upstream/master
* :doc:`phonon <fix_phonon>` - calculate dynamical matrix from MD simulations * :doc:`phonon <fix_phonon>` - calculate dynamical matrix from MD simulations
* :doc:`pimd <fix_pimd>` - Feynman path integral molecular dynamics * :doc:`pimd <fix_pimd>` - Feynman path integral molecular dynamics
* :doc:`planeforce <fix_planeforce>` - constrain atoms to move in a plane * :doc:`planeforce <fix_planeforce>` - constrain atoms to move in a plane

3
src/USER-MISC/README
View File

@ -63,10 +63,7 @@ fix momentum/chunk, Jiang Xiao (Hong Kong Polytechnic University), polyu-xiao.ji
fix npt/cauchy, R. E. Miller (Carleton University), F. Pavia and S. Pattamatta, 12 Jan 2020 fix npt/cauchy, R. E. Miller (Carleton University), F. Pavia and S. Pattamatta, 12 Jan 2020
fix nvk, Efrem Braun (UC Berkeley), efrem.braun at gmail.com, https://github.com/lammps/lammps/pull/310 fix nvk, Efrem Braun (UC Berkeley), efrem.braun at gmail.com, https://github.com/lammps/lammps/pull/310
fix orient/eco Adrian A. Schratt and Volker Mohles (Ruhr-Uni Bochum), volker.mohles at rub.de, 6 Jun 2020 fix orient/eco Adrian A. Schratt and Volker Mohles (Ruhr-Uni Bochum), volker.mohles at rub.de, 6 Jun 2020
<<<<<<< HEAD
fix pafi, Thomas Swinburne (CNRS), swinburne at cinam.univ-mrs.fr, 1st May 2020 fix pafi, Thomas Swinburne (CNRS), swinburne at cinam.univ-mrs.fr, 1st May 2020
=======
>>>>>>> upstream/master
fix pimd, Yuxing Peng (U Chicago), yuxing at uchicago.edu, 24 Nov 2014 fix pimd, Yuxing Peng (U Chicago), yuxing at uchicago.edu, 24 Nov 2014
fix propel/self, Stefan Paquay (Brandeis U), stefanpaquay at gmail.com, 20 Jan 2020 fix propel/self, Stefan Paquay (Brandeis U), stefanpaquay at gmail.com, 20 Jan 2020
fix rhok, Ulf Pedersen (Roskilde U), ulf at urp.dk, 25 Sep 2017 fix rhok, Ulf Pedersen (Roskilde U), ulf at urp.dk, 25 Sep 2017