From 18023ad9dc0dfa68b82fe0790f4d7785122e1ac3 Mon Sep 17 00:00:00 2001 From: Richard Berger Date: Tue, 6 Oct 2020 10:39:14 -0400 Subject: [PATCH 1/2] Update fix_wall_gran_region.cpp Don't store atom tag, just if there is a contact. Fixes #2306 --- src/GRANULAR/fix_wall_gran_region.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/GRANULAR/fix_wall_gran_region.cpp b/src/GRANULAR/fix_wall_gran_region.cpp index f91bac2c9b..d795d1bc37 100644 --- a/src/GRANULAR/fix_wall_gran_region.cpp +++ b/src/GRANULAR/fix_wall_gran_region.cpp @@ -250,7 +250,7 @@ void FixWallGranRegion::post_force(int /*vflag*/) // store contact info 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][5] = x[i][1] - dy; array_atom[i][6] = x[i][2] - dz; From 7dd244a828ebd6d0e2e78c7b15613253a57a20a4 Mon Sep 17 00:00:00 2001 From: Richard Berger Date: Tue, 6 Oct 2020 10:45:23 -0400 Subject: [PATCH 2/2] Correct fix wall/gran and wall/gran/region docs --- doc/src/fix_wall_gran.rst | 6 +++--- doc/src/fix_wall_gran_region.rst | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/src/fix_wall_gran.rst b/doc/src/fix_wall_gran.rst index 4ebbf35ba1..bc59fd71a7 100644 --- a/doc/src/fix_wall_gran.rst +++ b/doc/src/fix_wall_gran.rst @@ -205,11 +205,11 @@ the following table: +-------+----------------------------------------------------+----------------+ | 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 | +-------+----------------------------------------------------+----------------+ diff --git a/doc/src/fix_wall_gran_region.rst b/doc/src/fix_wall_gran_region.rst index 7d62d71a1d..bedf1165c1 100644 --- a/doc/src/fix_wall_gran_region.rst +++ b/doc/src/fix_wall_gran_region.rst @@ -246,11 +246,11 @@ the following table: +-------+----------------------------------------------------+----------------+ | 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 | +-------+----------------------------------------------------+----------------+