Merge pull request #2624 from rbberger/collected_small_changes

Collection of small changes
This commit is contained in:
Axel Kohlmeyer
2021-02-26 20:38:47 -05:00
committed by GitHub
20 changed files with 54 additions and 29 deletions

View File

@ -15,7 +15,7 @@ Syntax
* k_n = normal repulsion strength (force/distance or pressure units)
* c_n = normal damping coefficient (force/distance or pressure units)
* c_t = tangential damping coefficient (force/distance or pressure units)
* wallstyle = *xplane* or *yplane* or *zplane* or *zcylinder*
* wallstyle = *xplane* or *yplane* or *zcylinder*
* args = list of arguments for a particular style
.. parsed-literal::

View File

@ -199,11 +199,11 @@ the following table:
| 1 | 1.0 if particle is in contact with wall, | |
| | 0.0 otherwise | |
+-------+----------------------------------------------------+----------------+
| 2 | Force :math:`f_x` exerted on the wall | force units |
| 2 | Force :math:`f_x` exerted by the wall | force units |
+-------+----------------------------------------------------+----------------+
| 3 | Force :math:`f_y` exerted on the wall | force units |
| 3 | Force :math:`f_y` exerted by the wall | force units |
+-------+----------------------------------------------------+----------------+
| 4 | Force :math:`f_z` exerted on the wall | force units |
| 4 | Force :math:`f_z` exerted by the wall | force units |
+-------+----------------------------------------------------+----------------+
| 5 | :math:`x`-coordinate of contact point on wall | distance units |
+-------+----------------------------------------------------+----------------+

View File

@ -240,11 +240,11 @@ the following table:
| 1 | 1.0 if particle is in contact with wall, | |
| | 0.0 otherwise | |
+-------+----------------------------------------------------+----------------+
| 2 | Force :math:`f_x` exerted on the wall | force units |
| 2 | Force :math:`f_x` exerted by the wall | force units |
+-------+----------------------------------------------------+----------------+
| 3 | Force :math:`f_y` exerted on the wall | force units |
| 3 | Force :math:`f_y` exerted by the wall | force units |
+-------+----------------------------------------------------+----------------+
| 4 | Force :math:`f_z` exerted on the wall | force units |
| 4 | Force :math:`f_z` exerted by the wall | force units |
+-------+----------------------------------------------------+----------------+
| 5 | :math:`x`-coordinate of contact point on wall | distance units |
+-------+----------------------------------------------------+----------------+