------------------------------------------------------------
revno: 2582
committer: jduriez <jdur...@c1solimara-l>
branch nick: yade
timestamp: Wed 2010-12-01 15:31:15 +0100
message:
Few typos corrected in doc, and pack.py.
modified:
doc/sphinx/formulation.rst
py/pack/pack.py
--
lp:yade
https://code.launchpad.net/~yade-dev/yade/trunk
Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to
https://code.launchpad.net/~yade-dev/yade/trunk/+edit-subscription
=== modified file 'doc/sphinx/formulation.rst'
--- doc/sphinx/formulation.rst 2010-09-30 18:00:41 +0000
+++ doc/sphinx/formulation.rst 2010-12-01 14:31:15 +0000
@@ -361,9 +361,9 @@
.. math:: \curruT=\prevuT+(\Delta\uT)_1 + (\Delta\uT)_2 + (\Delta\uT)_3.
.. _sect-formulation-total-shear:
-Total alogithm
+Total algorithm
^^^^^^^^^^^^^^^
-The following algorithm, aiming at stabilization of response even with large rotation speeds or $\Delta t$ approaching stability limit, was designed by the author of this thesis. (A similar algorithm based on total formulation, which covers additionally bending and torsion, was proposed in [Wang2009]_.) It is based on tracking original contact points (with zero shear) in the particle-local frame.
+The following algorithm, aiming at stabilization of response even with large rotation speeds or $\Delta t$ approaching stability limit, was designed in [Smilauer2010b]_. (A similar algorithm based on total formulation, which covers additionally bending and torsion, was proposed in [Wang2009]_.) It is based on tracking original contact points (with zero shear) in the particle-local frame.
In this section, variable symbols implicitly denote their current values unless explicitly stated otherwise.
@@ -460,8 +460,7 @@
\vec{F}_T^t & \hbox{otherwise.}
\end{cases}
\end{align*}
-S
-ummary force $\vec{F}=\vec{F}_N+\vec{F}_T$ is then applied to both particles -- each particle accumulates forces and torques acting on it in the course of each step. Because the force computed acts at contact point $\vec{C}$, which is difference from sphes' centers, torque generated by $\vec{F}$ must also be considered.
+Summary force $\vec{F}=\vec{F}_N+\vec{F}_T$ is then applied to both particles -- each particle accumulates forces and torques acting on it in the course of each step. Because the force computed acts at contact point $\vec{C}$, which is difference from spheres' centers, torque generated by $\vec{F}$ must also be considered.
.. math::
:nowrap:
@@ -620,7 +619,7 @@
:nowrap:
\begin{align*}
- \vec{F}_c&=\sum F_i/m_c, \\
+ \vec{F}_c&=\sum F_i, \\
\vec{T}_c&=\sum r_i\times F_i + T_i.
\end{align*}
=== modified file 'py/pack/pack.py'
--- py/pack/pack.py 2010-11-22 17:58:56 +0000
+++ py/pack/pack.py 2010-12-01 14:31:15 +0000
@@ -363,7 +363,7 @@
def randomDensePack(predicate,radius,material=-1,dim=None,cropLayers=0,rRelFuzz=0.,spheresInCell=0,memoizeDb=None,useOBB=True,memoDbg=False,color=None):
"""Generator of random dense packing with given geometry properties, using TriaxialTest (aperiodic)
- or PeriIsoCompressor (periodic). The priodicity depens on whether the spheresInCell parameter is given.
+ or PeriIsoCompressor (periodic). The periodicity depens on whether the spheresInCell parameter is given.
*O.switchScene()* magic is used to have clean simulation for TriaxialTest without deleting the original simulation.
This function therefore should never run in parallel with some code accessing your simulation.
_______________________________________________
Mailing list: https://launchpad.net/~yade-dev
Post to : yade-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~yade-dev
More help : https://help.launchpad.net/ListHelp
