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

Merge pull request #2411 from rbberger/fix_wall_gran_region

Browse Source 
Corrections for fix wall/gran and wall/gran/region
This commit is contained in:
Axel Kohlmeyer
2020-10-06 11:51:58 -04:00
committed by GitHub
parent 0fb91ec755 7dd244a828
commit 887603d856
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
doc/src/fix_wall_gran.rst
View File

@ -205,11 +205,11 @@ the following table:
+-------+----------------------------------------------------+----------------+ +-------+----------------------------------------------------+----------------+
| 4 | Force :math:`f_z` exerted on the wall | force units | | 4 | Force :math:`f_z` exerted on the wall | force units |
+-------+----------------------------------------------------+----------------+ +-------+----------------------------------------------------+----------------+
| 5 | :math:`\Delta x` between wall surface and particle | distance units | | 5 | :math:`x`-coordinate of contact point on wall | distance units |
+-------+----------------------------------------------------+----------------+ +-------+----------------------------------------------------+----------------+
| 6 | :math:`\Delta y` between wall surface and particle | distance units | | 6 | :math:`y`-coordinate of contact point on wall | distance units |
+-------+----------------------------------------------------+----------------+ +-------+----------------------------------------------------+----------------+
| 7 | :math:`\Delta z` between wall surface and particle | distance units | | 7 | :math:`z`-coordinate of contact point on wall | distance units |
+-------+----------------------------------------------------+----------------+ +-------+----------------------------------------------------+----------------+
| 8 | Radius :math:`r` of atom | distance units | | 8 | Radius :math:`r` of atom | distance units |
+-------+----------------------------------------------------+----------------+ +-------+----------------------------------------------------+----------------+

6
doc/src/fix_wall_gran_region.rst
View File

@ -246,11 +246,11 @@ the following table:
+-------+----------------------------------------------------+----------------+ +-------+----------------------------------------------------+----------------+
| 4 | Force :math:`f_z` exerted on the wall | force units | | 4 | Force :math:`f_z` exerted on the wall | force units |
+-------+----------------------------------------------------+----------------+ +-------+----------------------------------------------------+----------------+
| 5 | :math:`\Delta x` between wall surface and particle | distance units | | 5 | :math:`x`-coordinate of contact point on wall | distance units |
+-------+----------------------------------------------------+----------------+ +-------+----------------------------------------------------+----------------+
| 6 | :math:`\Delta y` between wall surface and particle | distance units | | 6 | :math:`y`-coordinate of contact point on wall | distance units |
+-------+----------------------------------------------------+----------------+ +-------+----------------------------------------------------+----------------+
| 7 | :math:`\Delta z` between wall surface and particle | distance units | | 7 | :math:`z`-coordinate of contact point on wall | distance units |
+-------+----------------------------------------------------+----------------+ +-------+----------------------------------------------------+----------------+
| 8 | Radius :math:`r` of atom | distance units | | 8 | Radius :math:`r` of atom | distance units |
+-------+----------------------------------------------------+----------------+ +-------+----------------------------------------------------+----------------+

2
src/GRANULAR/fix_wall_gran_region.cpp
View File

@ -250,7 +250,7 @@ void FixWallGranRegion::post_force(int /*vflag*/)
// store contact info // store contact info
if (peratom_flag) { if (peratom_flag) {
array_atom[i][0] = (double)atom->tag[i]; array_atom[i][0] = 1.0;
array_atom[i][4] = x[i][0] - dx; array_atom[i][4] = x[i][0] - dx;
array_atom[i][5] = x[i][1] - dy; array_atom[i][5] = x[i][1] - dy;
array_atom[i][6] = x[i][2] - dz; array_atom[i][6] = x[i][2] - dz;