Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
177 commits
Select commit Hold shift + click to select a range
5c8710f
create data structure for super-ellipsoid inside bonus
Dec 11, 2023
66d00e6
add functions to compute the circumscribed radius of the super ellips…
Dec 11, 2023
22b0045
add blockiness to pack/unpack methods
Dec 11, 2023
22653aa
add omitted declarations
Dec 14, 2023
bbd9cd8
add blockiness parameter to read_data and write_data.
Dec 14, 2023
e2dce8e
implement Beta function in MathSpecial based on cephes/scipy implemen…
Dec 17, 2023
66b59fb
fix logic for super-ellipsoid flag
Dec 17, 2023
4691cc5
block and flag_super must be initialized with set_shape when ellipsoi…
Dec 17, 2023
2e9bfca
allow set command to set the ellipsoid block exponents.
Dec 17, 2023
6295d64
allow shape and block to be set in any order by setting shape to 1 1 …
Dec 17, 2023
431f54e
add unit test for new bonus properties to test_atom_styles
Dec 18, 2023
c741ae6
implement moment of inertia for super ellipsoid. Make block and flag …
Jan 21, 2024
de30be9
Create principal inertia function: avoids code duplication and fixes …
Jan 21, 2024
f179e37
Add principal moments of inertia to bonus struct to avoid recomputing…
Jan 22, 2024
6248e81
correct bug in inertia, forgotten 0.5 factor
Jan 22, 2024
8ee7616
fix omitted pointer initialization
Jan 23, 2024
7b91db7
use radius pointer to store circumscribed radius of ellipsoid. Move r…
Jan 30, 2024
0369372
fix typo after rebase
jibril-b-coulibaly Jul 21, 2025
75b8424
Created placeholder for granular hooke pair style with ellipsoids
JBil8 Jul 21, 2025
f6f9be1
Added shape function to ellipsoid granular pair style
JBil8 Aug 8, 2025
43ea882
Correct wrong Class name in style creator. Make fix neigh history nam…
jibril-b-coulibaly Aug 22, 2025
134ace1
build LAPACK/linalg for ASPHERE + GRANULAR for contact detection betw…
jibril-b-coulibaly Aug 23, 2025
22930a7
TEMP TEST COMMIT TO BE DELETED IN THE FUTURE: test case for LAPACK in…
jibril-b-coulibaly Aug 23, 2025
541359f
Added extra math for superellipsoids for curvature calculation
JBil8 Nov 14, 2025
e5f8bae
fix flag from omega to angmom. remove test LAPACK code
jibril-b-coulibaly Nov 14, 2025
835d6f8
WIP: implement basics of Newton method for contact point calculation
jibril-b-coulibaly Nov 14, 2025
3b3775c
fix copy paste bugs
jibril-b-coulibaly Nov 14, 2025
a8a6568
fix more small bugs: initialize Lagrange multiplier, and inverse logi…
jibril-b-coulibaly Nov 14, 2025
2cc6c1f
remove redefinition of shape and block to avoid masking. Only update …
jibril-b-coulibaly Nov 15, 2025
aa0fecf
fix non absolute values and abs vs fabs bugs in gradient and hessian
jibril-b-coulibaly Nov 15, 2025
b3e3b82
fix typo
jibril-b-coulibaly Nov 15, 2025
db12cdd
create special case for shape function, gradients and hessian of elli…
jibril-b-coulibaly Nov 15, 2025
999afa2
fix logic bug in flagging type of ellipsoid
jibril-b-coulibaly Nov 15, 2025
28a8369
clean up shape and derivatives functions. Refactor Newton's method to…
jibril-b-coulibaly Nov 16, 2025
da81a17
fix bug in initial shape evolution for first contact detection
jibril-b-coulibaly Nov 19, 2025
86d9aef
return the contact normal from determine_contact_point for overlap an…
jibril-b-coulibaly Nov 19, 2025
0f990d3
Added handwritten gauss elimination solvers for 4*4 system
JBil8 Nov 20, 2025
1ab6476
Implemented oriented bounding box separating axis check
JBil8 Nov 21, 2025
5a78515
Move derivatives and contact detection functions into MathExtraSupere…
jibril-b-coulibaly Nov 21, 2025
ad66804
Implemented nonspehrical contact force logic for hooke law
JBil8 Nov 22, 2025
5f36cea
Implemented scaled gradient for newton rapson surface contact point
JBil8 Nov 22, 2025
dc85799
Added newton-rapson for surface point detection. Analytical solution …
JBil8 Nov 22, 2025
2191b43
Corrected contact detection loop, added check for obb if aspect ratio…
JBil8 Nov 22, 2025
e94b09d
small cleanup on overlap calculation
jibril-b-coulibaly Nov 24, 2025
83a493e
fix more small bugs
jibril-b-coulibaly Nov 24, 2025
8bff226
pass flags for grain type to determine_contact_point()
jibril-b-coulibaly Nov 24, 2025
08f2ff0
compue omega from angmom. avec_ellipsoid does not define omega
jibril-b-coulibaly Nov 24, 2025
aab8afe
implement neigh history variables
jibril-b-coulibaly Nov 24, 2025
288c411
Implemented starting seed guess from OBB
JBil8 Nov 24, 2025
7878aeb
Fixed inconsistency with signed distance in NS and coresect the stabl…
JBil8 Nov 24, 2025
fa62b21
Added blockiness to compute_property_atom to easily dump it in output
JBil8 Nov 24, 2025
0df189c
Added regularization to gauss elimination solver
JBil8 Nov 25, 2025
75d0627
positive force on atom i goes from j to i, not from i to j
jibril-b-coulibaly Nov 24, 2025
31cff6d
add superellipsoid granular example
jibril-b-coulibaly Nov 25, 2025
0e62d4e
add Tikhonov regularization to Jacobian
jibril-b-coulibaly Nov 25, 2025
210e933
Corrected scale of regularization for linear system solve
JBil8 Nov 25, 2025
c806947
Added regularization to shape function to make gardient order one
JBil8 Nov 25, 2025
8b4fb3d
test convergence before line search descent: tiny residuals can fail …
jibril-b-coulibaly Nov 25, 2025
d40a03b
Fixed Tikhonov regularization for handwritten solver, added utility f…
JBil8 Nov 25, 2025
5c11207
Fixed direction of damping force
JBil8 Nov 25, 2025
be60709
Implmented particle contact with flat wall logic
JBil8 Nov 26, 2025
0884267
fix bug I introduced in refactoring Newton: contact point must be upd…
jibril-b-coulibaly Nov 25, 2025
d95a504
fix bad bug: shapefunctions computed but never assigned! My previous …
jibril-b-coulibaly Nov 25, 2025
cd4e2e2
Added example script for box compression to test multiple contacts
JBil8 Nov 26, 2025
8e38bc6
rename quaternion components in dump for explicit and automatic detec…
jibril-b-coulibaly Nov 26, 2025
6e43c32
modify output to map to Ovito: n1 corresponds to theta, n2 correspond…
jibril-b-coulibaly Nov 26, 2025
86b4c76
add bolwing example
jibril-b-coulibaly Nov 26, 2025
d3014ca
add description for block1 and block2 in doc of compute property/atom
jibril-b-coulibaly Dec 9, 2025
ba35169
start unit testing superellipsoid contact detection and overlap calcu…
jibril-b-coulibaly Dec 9, 2025
a134a83
use some MathExtra to simplify superellipsoids unit tests setup. Add …
jibril-b-coulibaly Dec 11, 2025
24929f9
Improve initial guess and residual scaling. Implement unit test for h…
jibril-b-coulibaly Dec 11, 2025
9750f06
make tikhonov regularization only when matrix found to be truly singu…
jibril-b-coulibaly Dec 12, 2025
74da3c1
WIP: write documentation for pair_style gran/ellipsoid/ TODO: Hertz
jibril-b-coulibaly Dec 30, 2025
7f31aca
remove atom2radii and atom2cut method following dccbfd46a1856f756fe36…
jibril-b-coulibaly Dec 31, 2025
0942d11
make bounding box check optional. refactor contact detection accordingly
jibril-b-coulibaly Dec 31, 2025
32dea6d
don't store n1/n2 in block
jibril-b-coulibaly Jan 2, 2026
040c1ea
remove Cephes library version of beta function from MathSpecial and u…
jibril-b-coulibaly Jan 2, 2026
fe13c5c
Change flag_super from bool to enum to distinguish more cases. Refact…
jibril-b-coulibaly Jan 3, 2026
bd2282b
WIP: cleanup math_extra_super_ellipsoid. Outstanding points to be dis…
jibril-b-coulibaly Jan 4, 2026
8c26038
Cleaned superquadrics helper by using HPC version of shape function c…
JBil8 Jan 4, 2026
b8ed27e
Added hertz contact implementation in old pair gran style. Picked mea…
JBil8 Jan 4, 2026
1bf5c2e
cleanup pair hertz + minor edits
jibril-b-coulibaly Jan 5, 2026
8c0a47c
Possible bug in the legacy pair style single function for relative ta…
jibril-b-coulibaly Jan 5, 2026
032da47
minor form fixes and clarified TODOs
jibril-b-coulibaly Jan 5, 2026
5549e9e
implement single() function for pair hooke ellipsoid
jibril-b-coulibaly Jan 5, 2026
2a0c8fe
implement single() function for pair hertz ellipsoid. Not sure it is …
JBil8 Jan 7, 2026
f3fa0c8
Skip newton-rapson if the initial guess is within tolerance (temporal…
JBil8 Jan 7, 2026
07da0d8
Made gauss elimination default, fallback on LAPACK solver in case of …
JBil8 Jan 7, 2026
0acded9
Made choice between mean and gaussian curvature in hertz contact opti…
JBil8 Jan 7, 2026
b717eea
Added option for Geometric contact point formulation (radial distance…
JBil8 Jan 13, 2026
0726e24
Fixed bug for old contact point when moving through periodic boundaries
JBil8 Jan 14, 2026
583339d
Updated documentation for the hertz formulation. Added example script…
JBil8 Jan 14, 2026
89fcf42
Improved previous contact point carry over.implemented transfer_history
JBil8 Jan 16, 2026
06bc8a9
Rescale residuals for both formualtions. Switched to warnings for fai…
JBil8 Jan 20, 2026
80b0db3
Formatted with clang
JBil8 Jan 20, 2026
3f34ce5
Added details in documentation about failed contacts
JBil8 Jan 20, 2026
dd58ef9
Fixed minor bug in math_special after rebase
JBil8 Jan 21, 2026
d2d4479
Corrected previous bug in NR exit. Fixed bugs for step clumping and L…
JBil8 Jan 30, 2026
c85052b
Removed Lapack solve and redundant handwritten solve functions. Added…
JBil8 Feb 20, 2026
f4e6031
Fixed instability in geometric formulation by imposing strict lower b…
JBil8 Feb 25, 2026
f70a06f
Fixed bug in moment of inertia assignment. Added inertia to the compu…
JBil8 Feb 25, 2026
21686dd
Fixed minor typos in doc and examples
JBil8 Feb 26, 2026
3ff12e7
Added author info to files
JBil8 Feb 26, 2026
2a44a36
Fixed minor bug in torque calculation. Added guard againt mathematica…
JBil8 Feb 28, 2026
51d6119
Removed LAPACK dependency from CMakaLists file, since it is no longer…
JBil8 Mar 2, 2026
746546f
Added inertia from compute property atom to the doc
JBil8 Mar 2, 2026
641479e
Removed LAPACK dependency from superellipsoid tests
JBil8 Mar 3, 2026
2e98ed6
Refactored code to 2 bonus data strcutres, with bonus_super inheritin…
JBil8 Mar 5, 2026
f63da6d
Updated the compute-property-atom class to branch between bonus and b…
JBil8 Mar 5, 2026
8b424fa
Updated pair gran ellipsoid to read the super_bonus correctly
JBil8 Mar 5, 2026
6b8e92d
Updated compute_erotate_asphere
JBil8 Mar 5, 2026
8845452
Updated support for temperature for superellipsoids
JBil8 Mar 6, 2026
02f7ff8
Revert unsupported fixes and computes to upstream state. Limiting PR …
JBil8 Mar 6, 2026
6ca3e1b
Added templates to nve_asphere integrators for superellipsoids
JBil8 Mar 6, 2026
377363a
Updated set to be compatible with bonus and bonus_super
JBil8 Mar 6, 2026
10dc90e
Added error for superellipsoids in integrators othr than nve-asphere
JBil8 Mar 6, 2026
f73d1a7
Fix move for superellipsoids
JBil8 Mar 6, 2026
9261363
Updated input scripts
JBil8 Mar 6, 2026
cf8daaf
Fixed small bugs created during refactroring
JBil8 Mar 6, 2026
0cb4352
Reverted test_atom_styles to upstream
JBil8 Mar 6, 2026
1b8f192
Fixed bug in inertia passing for nve asphere integrators
JBil8 Mar 9, 2026
19798d6
Updated doc to reflect changes in bonus struct of the ellipsoid atom …
JBil8 Mar 10, 2026
c453f35
Renaming super-ellipsoid to superellipsoid
JBil8 Mar 10, 2026
8351d00
Added specification on where curvature is computed
JBil8 Mar 10, 2026
97ab6ce
Added guard against point particles in ellipsoid granular pair_style
JBil8 Mar 10, 2026
ce2cb2a
Added unit test for atom style ellipsoid with superellipsoid flag. Fi…
JBil8 Mar 11, 2026
75b8a2d
Minor style changes (white space comments, constants) and extra error…
jtclemm Mar 11, 2026
7b13695
Removed multiplicity trick for algebraic formulation
JBil8 Mar 12, 2026
d9b1318
Removed column major lapack matrix format, old redundancy
JBil8 Mar 12, 2026
b70c084
Removed cout debug prints from math extra superellipsoids
JBil8 Mar 12, 2026
06b4dfb
Removed outdated TODOs
JBil8 Mar 12, 2026
dac73b2
Fixed residual scaling for polydisperse cases
JBil8 Mar 12, 2026
503c499
Sketching out superellipsoid version of granular
jtclemm Mar 12, 2026
35a6d53
Fixed minor bugs in torque and history for the new pair style
JBil8 Mar 13, 2026
62e6211
third take at history
jtclemm Mar 13, 2026
a8bb43e
Adjusting history passing in bounding box check
jtclemm Mar 13, 2026
488c2d3
Forgot to update transfer_history method
jtclemm Mar 13, 2026
3788d32
Patching bugs, aligning more with original granular, adding more subm…
jtclemm Mar 16, 2026
7b9611c
Fixed small bugs in damping and tangential velocity computation. Fixe…
JBil8 Mar 17, 2026
a5a2ad7
Fixed few bugs in settings
JBil8 Mar 17, 2026
a2dd94e
Fixed cached axis incorrect overwriting
JBil8 Mar 17, 2026
1616efb
Adding contact radius bugfix for classic model to pair granular
jtclemm Mar 17, 2026
843549a
Accidently overwrote update_history variable
jtclemm Mar 18, 2026
a1f1ac2
Fixed order of calls for history_sizedetermination
JBil8 Mar 18, 2026
f45f1e7
Added first draft for doc of the new pair_granular_supereliipsoid
JBil8 Mar 18, 2026
3777a6d
Clarifying variables and (I think) simplifying rescaling logic
jtclemm Mar 18, 2026
4cdc295
Only incrementing history size by maximumneeded from tangential
jtclemm Mar 18, 2026
3a7e1b5
more tangential rescaling clean ups
jtclemm Mar 18, 2026
074f677
add->add3
jtclemm Mar 18, 2026
5b8896d
Renamed and cleaned variable in pair style
JBil8 Mar 19, 2026
1aba54d
Commented out dumping in examples to follow guidelines
JBil8 Mar 19, 2026
84f7c22
Fixed bugs in meff declaration scope and damping sign
JBil8 Mar 19, 2026
1682e77
Forgot flag initialization
jtclemm Mar 19, 2026
a3e6b5d
Another valgrind error
jtclemm Mar 20, 2026
4be9d29
Edits/suggestions for superellipsoid granular doc page
jtclemm Mar 20, 2026
1412af4
Removed legacy pair gran ellipsoids files
JBil8 Mar 23, 2026
67667f4
Removed legacy pair gran ellipsoid doc
JBil8 Mar 23, 2026
b9daa86
Made bounding_box check the default option
JBil8 Mar 23, 2026
31ea5c9
Added safety guards to the curvature radius
JBil8 Mar 23, 2026
9257cef
Moved pair granular superllipsoid to ASPHERE package
JBil8 Mar 23, 2026
19bb345
Updated documentation
JBil8 Mar 23, 2026
4cf6069
Fixed unit test cmakelists
JBil8 Mar 23, 2026
e2588d9
Merge branch 'develop' into pr-submission
jtclemm Mar 23, 2026
95a51af
add support for superellipsoids to dump image
akohlmey Mar 23, 2026
66da20e
port rounding fix from collected-small-fixes
akohlmey Mar 23, 2026
f6474f9
fix whitespace issues
akohlmey Mar 23, 2026
782bae9
emulate std::beta() for improved portability
akohlmey Mar 23, 2026
e928050
Fixed multiple bugs as reported from Copilot. Fixed uninitialized mem…
JBil8 Mar 24, 2026
80a60be
Swapped tgamma for lgamma to prevent overflows
JBil8 Mar 24, 2026
267628d
Added fix to Commands_pair.rst
JBil8 Mar 24, 2026
f24ede5
Fixed version changes and additions in the doc
JBil8 Mar 24, 2026
2468c35
correct version tags for new features
akohlmey Mar 24, 2026
233a0b1
remove bogus leftover brightness adjustment call
akohlmey Mar 24, 2026
aaf5688
RHEO: guard property/atom setup against missing dependent fixes
poyais001 Mar 24, 2026
39b3828
Setting missing pressure_flags for stresses
jtclemm Mar 24, 2026
e6bc9e0
Merge pull request #4927 from poyais001/develop
akohlmey Mar 25, 2026
1530ad2
Merge pull request #4897 from jibril-b-coulibaly/pr-submission
akohlmey Mar 25, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions doc/src/Commands_pair.rst
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ OPT.
* :doc:`gran/hooke (o) <pair_gran>`
* :doc:`gran/hooke/history (ko) <pair_gran>`
* :doc:`granular <pair_granular>`
* :doc:`granular/superellipsoid <pair_granular_superellipsoid>`
* :doc:`gw <pair_gw>`
* :doc:`gw/zbl <pair_gw>`
* :doc:`harmonic/cut (o) <pair_harmonic_cut>`
Expand Down
12 changes: 8 additions & 4 deletions doc/src/Howto_granular.rst
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
Granular models
===============

Granular systems are composed of spherical particles with a diameter, as
opposed to point particles. This means they have an angular velocity
and torque can be imparted to them to cause them to rotate.
Granular systems are typically composed of spherical particles with a diameter,
as opposed to point particles. This means they have an angular
velocity and torque can be imparted to them to cause them to rotate.

To run a simulation of a granular model, you will want to use
To run a simulation of a granular model, you will typically want to use
the following commands:

* :doc:`atom_style sphere <atom_style>`
* :doc:`fix nve/sphere <fix_nve_sphere>`
* :doc:`fix gravity <fix_gravity>`

Aspherical granular particles can be simulated by creating clusters of spherical
particles using either the :doc:`rigid <fix_rigid>` or :doc:`BPM <Howto_bpm>`
package or by using :doc:`superellipsoids <pair_granular_superellipsoid>`.

This compute

* :doc:`compute erotate/sphere <compute_erotate_sphere>`
Expand Down
28 changes: 17 additions & 11 deletions doc/src/Howto_spherical.rst
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,16 @@ individual particles, after then are created.

The ellipsoid style defines particles that are ellipsoids and thus can
be aspherical. Each particle has a shape, specified by 3 diameters,
and mass (or density). These particles store an angular momentum and
their orientation (quaternion), and can be acted upon by torque. They
do not store an angular velocity (omega), which can be in a different
direction than angular momentum, rather they compute it as needed.
The "set" command can be used to modify the diameter, orientation, and
mass of individual particles, after then are created. It also has a
brief explanation of what quaternions are.
and mass (or density). Superellipsoid particles can be defined by
specifying 2 blockiness exponents (block) and adding the `superellipsoid`
keyword to the `atom_style ellipsoid` command. These particles store an angular
momentum and their orientation (quaternion), and can be acted upon by
torque. They do not store an angular velocity (omega), which can be
in a different direction than angular momentum, rather they compute it
as needed. The "set" command can be used to modify the diameter, orientation,
and mass of individual particles, after they are created.
The "set" command can also be used to modify the blockiness of superellipsoid
particles. It also has a brief explanation of what quaternions are.

The line style defines line segment particles with two end points and
a mass (or density). They can be used in 2d simulations, and they can
Expand Down Expand Up @@ -113,9 +116,11 @@ When a system with finite-size particles is defined, the particles
will only rotate and experience torque if the force field computes
such interactions. These are the various :doc:`pair styles <pair_style>` that generate torque:

* :doc:`pair_style gran/history <pair_gran>`
* :doc:`pair_style gran/hertz <pair_gran>`
* :doc:`pair_style gran/no_history <pair_gran>`
* :doc:`pair_style granular <pair_granular>`
* :doc:`pair_style gran/hooke <pair_gran>`
* :doc:`pair_style gran/hooke/history <pair_gran>`
* :doc:`pair_style gran/hertz/history <pair_gran>`
* :doc:`pair_style granular/superellipsoid <pair_granular_superellipsoid>`
* :doc:`pair_style dipole/cut <pair_dipole>`
* :doc:`pair_style gayberne <pair_gayberne>`
* :doc:`pair_style resquared <pair_resquared>`
Expand All @@ -126,7 +131,8 @@ such interactions. These are the various :doc:`pair styles <pair_style>` that g
* :doc:`pair_style body/nparticle <pair_body_nparticle>`

The granular pair styles are used with spherical particles. The
dipole pair style is used with the dipole atom style, which could be
*granular/superellipsoid* granular pair styles are used with superellipsoid particles.
The dipole pair style is used with the dipole atom style, which could be
applied to spherical or ellipsoidal particles. The GayBerne and
REsquared potentials require ellipsoidal particles, though they will
also work if the 3 shape parameters are the same (a sphere). The
Expand Down
5 changes: 3 additions & 2 deletions doc/src/Packages_details.rst
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,8 @@ ASPHERE package

**Contents:**

Computes, time-integration fixes, and pair styles for aspherical
particle models including ellipsoids, 2d lines, and 3d triangles.
Computes, time-integration fixes, and pair styles for aspherical particle models
including ellipsoids, granular superellipsoids, 2d lines, and 3d triangles.

**Supporting info:**

Expand All @@ -265,6 +265,7 @@ particle models including ellipsoids, 2d lines, and 3d triangles.
* :doc:`pair_style ylz <pair_ylz>`
* :doc:`pair_style line/lj <pair_line_lj>`
* :doc:`pair_style tri/lj <pair_tri_lj>`
* :doc:`pair_style granular/superellipsoid <pair_granular_superellipsoid>`
* `doc/PDF/pair_gayberne_extra.pdf <PDF/pair_gayberne_extra.pdf>`_
* `doc/PDF/pair_resquared_extra.pdf <PDF/pair_resquared_extra.pdf>`_
* ``examples/ASPHERE``
Expand Down
9 changes: 9 additions & 0 deletions doc/src/atom_style.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ Syntax
*template* arg = template-ID
template-ID = ID of molecule template specified in a separate :doc:`molecule <molecule>` command
*hybrid* args = list of one or more sub-styles, each with their args
*ellipsoid* arg = superellipsoid (optional) for superellipsoids instead of ellipsoids

* accelerated styles (with same args) = *angle/kk* or *atomic/kk* or *bond/kk* or *charge/kk* or *full/kk* or *molecular/kk* or *spin/kk*

Expand Down Expand Up @@ -354,6 +355,14 @@ quaternion 4-vector with its orientation. Each particle stores a flag
in the ellipsoid vector which indicates whether it is an ellipsoid (1)
or a point particle (0).

.. versionadded:: TBD

By adding the flag *superellipsoid* to the *ellipsoid* atom_style
command, the particles can be superellipsoids, which are a
generalization of ellipsoids with two additional blockiness parameters
that control the shape. Superellipsoids also store the principal
moments of inertia of the particle.

For the *line* style, particles can be are idealized line segments
which store a per-particle mass and length and orientation (i.e. the
end points of the line segment). Each particle stores a flag in the
Expand Down
18 changes: 18 additions & 0 deletions doc/src/compute_property_atom.rst
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ Syntax
temperature, heatflow,
angmomx, angmomy, angmomz,
shapex, shapey, shapez,
block1, block2,
inertiax, inertiay, inertiaz,
quatw, quati, quatj, quatk, tqx, tqy, tqz,
end1x, end1y, end1z, end2x, end2y, end2z,
corner1x, corner1y, corner1z,
Expand Down Expand Up @@ -64,6 +66,8 @@ Syntax
*heatflow* = internal heat flow of spherical particle
*angmomx,angmomy,angmomz* = angular momentum of aspherical particle
*shapex,shapey,shapez* = 3 diameters of aspherical particle
*block1,block2* = 2 blockiness exponents of aspherical (superellipsoid) particle
*inertiax,inertiay,inertiaz* = 3 principal moments of inertia of aspherical (superellipsoid) particle
*quatw,quati,quatj,quatk* = quaternion components for aspherical or body particles
*tqx,tqy,tqz* = torque on finite-size particles
*end12x, end12y, end12z* = end points of line segment
Expand Down Expand Up @@ -163,6 +167,20 @@ If :doc:`newton bond off <newton>` is set, it will be tallied with both atom
The quantities *shapex*, *shapey*, and *shapez* are defined for ellipsoidal
particles and define the 3d shape of each particle.

.. versionadded:: TBD

The quantities *block1*, and *block2*, are defined for superellipsoidal
particles and define the blockiness of each superellipsoid particle.
See the :doc:`set <set>` command for an explanation of the blockiness.

.. versionadded:: TBD

The quantities *inertiax*, *inertiay*, and *inertiaz* are defined for
superellipsoidal particles and define the 3 principal moments of inertia
of each particle. These are with respect to the particle's center of
mass and in a reference system aligned with the particle's principal
axes.

The quantities *quatw*, *quati*, *quatj*, and *quatk* are defined for
ellipsoidal particles and body particles and store the 4-vector quaternion
representing the orientation of each particle. See the :doc:`set <set>`
Expand Down
2 changes: 1 addition & 1 deletion doc/src/pair_granular.rst
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ global, but can be set to different values for different combinations
of particle types, as determined by the :doc:`pair_coeff <pair_coeff>`
command. If the contact model choice is the same for two particle
types, the mixing for the cross-coefficients can be carried out
automatically. This is shown in the last example, where model
automatically. This is shown in one of the examples, where model
choices are the same for type 1 - type 1 as for type 2 - type2
interactions, but coefficients are different. In this case, the
mixed coefficients for type 1 - type 2 interactions can be determined from
Expand Down
Loading