Unverified Commit 12de1762 authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

Merge branch 'master' into collected-small-changes

# Conflicts:
#	doc/src/Commands_fix.rst
parents 946bd8f3 795a872b
Loading
Loading
Loading
Loading
+6 −6
Changes for doc/src/Commands_all.rst: 6 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -46,7 +46,8 @@ An alphabetic list of all general LAMMPS commands.
   * :doc:`dimension <dimension>`
   * :doc:`displace_atoms <displace_atoms>`
   * :doc:`dump <dump>`
   * :doc:`dump adios <dump_adios>`
   * :doc:`dump atom/adios <dump_adios>`
   * :doc:`dump custom/adios <dump_adios>`
   * :doc:`dump image <dump_image>`
   * :doc:`dump movie <dump_image>`
   * :doc:`dump netcdf <dump_netcdf>`
@@ -131,11 +132,10 @@ An alphabetic list of all general LAMMPS commands.
   * :doc:`units <units>`
   * :doc:`variable <variable>`
   * :doc:`velocity <velocity>`
   * :doc:`write_coeff <write_coeff>`
   * :doc:`write_data <write_data>`
   * :doc:`write_dump <write_dump>`
   * :doc:`write_restart <write_restart>`
   *
   * :doc:`write\_coeff <write_coeff>`
   * :doc:`write\_data <write_data>`
   * :doc:`write\_dump <write_dump>`
   * :doc:`write\_restart <write_restart>`
   *
   *
   *
+1 −0
Changes for doc/src/Commands_fix.rst: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ OPT.
   * :doc:`precession/spin <fix_precession_spin>`
   * :doc:`press/berendsen <fix_press_berendsen>`
   * :doc:`print <fix_print>`
   * :doc:`propel/self <fix_propel_self>`
   * :doc:`property/atom (k) <fix_property_atom>`
   * :doc:`python/invoke <fix_python_invoke>`
   * :doc:`python/move <fix_python_move>`
+7 −2
Changes for doc/src/Packages_details.rst: 7 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -1096,8 +1096,9 @@ USER-ADIOS package
**Contents:**

ADIOS is a high-performance I/O library. This package implements the
dump "atom/adios" and dump "custom/adios" commands to write data using
the ADIOS library.
:doc:`dump atom/adios <dump_adios>`, :doc:`dump custom/adios <dump_adios>` and
:doc:`read_dump ... format adios <read_dump>`
commands to write and read data using the ADIOS library.

**Authors:** Norbert Podhorszki (ORNL) from the ADIOS developer team.

@@ -1111,6 +1112,10 @@ This package has :ref:`specific installation instructions <user-adios>` on the :
* src/USER-ADIOS/README
* examples/USER/adios
* https://github.com/ornladios/ADIOS2
* :doc:`dump atom/adios <dump_adios>`
* :doc:`dump custom/adios <dump_adios>`
* :doc:`read_dump <read_dump>`



----------
+9 −5
Changes for doc/src/dump.rst: 9 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -21,8 +21,11 @@ dump command
:doc:`dump movie <dump_image>` command
======================================

:doc:`dump adios <dump_adios>` command
======================================
:doc:`dump atom/adios <dump_adios>` command
===========================================

:doc:`dump custom/adios <dump_adios>` command
=============================================

Syntax
""""""
@@ -45,12 +48,12 @@ Syntax
       *atom* args = none
       *atom/gz* args = none
       *atom/mpiio* args = none
       *atom/adios* args = none,  discussed on :doc:`dump adios <dump_adios>` doc page
       *atom/adios* args = none,  discussed on :doc:`dump atom/adios <dump_adios>` doc page
       *cfg* args = same as *custom* args, see below
       *cfg/gz* args = same as *custom* args, see below
       *cfg/mpiio* args = same as *custom* args, see below
       *custom*\ , *custom/gz*\ , *custom/mpiio* args = see below
       *custom/adios* args = same as *custom* args, discussed on :doc:`dump adios <dump_adios>` doc page
       *custom/adios* args = same as *custom* args, discussed on :doc:`dump custom/adios <dump_adios>` doc page
       *dcd* args = none
       *h5md* args = discussed on :doc:`dump h5md <dump_h5md>` doc page
       *image* args = discussed on :doc:`dump image <dump_image>` doc page
@@ -713,7 +716,8 @@ LAMMPS was built with that package. See the :doc:`Build package <Build_package>
Related commands
""""""""""""""""

:doc:`dump adios <dump_adios>` :doc:`dump h5md <dump_h5md>`, :doc:`dump image <dump_image>`,
:doc:`dump atom/adios <dump_adios>`, :doc:`dump custom/adios <dump_adios>`, 
:doc:`dump h5md <dump_h5md>`, :doc:`dump image <dump_image>`,
:doc:`dump molfile <dump_molfile>`, :doc:`dump\_modify <dump_modify>`,
:doc:`undump <undump>`

+4 −3
Changes for doc/src/dump_adios.rst: 4 added lines, 3 removed lines.
Original line number Diff line number Diff line
.. index:: dump atoms/adios 
.. index:: dump atom/adios 
.. index:: dump custom/adios 

dump atoms/adios  command
dump atom/adios  command
=========================

dump custom/adios command
@@ -12,7 +13,7 @@ Syntax

.. parsed-literal::

   dump ID group-ID atoms/adios N file.bp
   dump ID group-ID atom/adios N file.bp

   dump ID group-ID custom/adios N file.bp args

Loading