------------------------------------------------------------ revno: 3836 committer: Jerome Duriez <[email protected]> timestamp: Thu 2014-03-13 13:57:08 +0100 message: Small improvement in JCFPM doc about the cracks file, and typo in user.rst modified: doc/sphinx/user.rst pkg/dem/JointedCohesiveFrictionalPM.hpp
-- lp:yade https://code.launchpad.net/~yade-pkg/yade/git-trunk Your team Yade developers is subscribed to branch lp:yade. To unsubscribe from this branch go to https://code.launchpad.net/~yade-pkg/yade/git-trunk/+edit-subscription
=== modified file 'doc/sphinx/user.rst' --- doc/sphinx/user.rst 2013-12-20 14:12:32 +0000 +++ doc/sphinx/user.rst 2014-03-13 12:57:08 +0000 @@ -1379,7 +1379,7 @@ # … O.saveGnuplot(O.tags['id']+'/'+'graph1') -Controlling parallel compuation +Controlling parallel computation ------------------------------- Default total number of available cores is determined from ``/proc/cpuinfo`` (provided by Linux kernel); in addition, if ``OMP_NUM_THREADS`` environment variable is set, minimum of these two is taken. The ``-j``/``--jobs`` option can be used to override this number. === modified file 'pkg/dem/JointedCohesiveFrictionalPM.hpp' --- pkg/dem/JointedCohesiveFrictionalPM.hpp 2014-03-11 18:36:24 +0000 +++ pkg/dem/JointedCohesiveFrictionalPM.hpp 2014-03-13 12:57:08 +0000 @@ -102,7 +102,7 @@ ((string,Key,"",,"string specifying the name of saved file 'cracks___.txt', when :yref:`recordCracks<Law2_ScGeom_JCFpmPhys_JointedCohesiveFrictionalPM.recordCracks>` is true.")) ((bool,cracksFileExist,false,,"if true (and if :yref:`recordCracks<Law2_ScGeom_JCFpmPhys_JointedCohesiveFrictionalPM.recordCracks>`), data are appended to an existing 'cracksKey' text file; otherwise its content is reset.")) ((bool,smoothJoint,false,,"if true, interactions of particles belonging to joint surface (:yref:`JCFpmPhys.isOnJoint`) are handled according to a smooth contact logic [Ivars2011]_, [Scholtes2012]_.")) - ((bool,recordCracks,false,,"if true a text file cracksKey.txt (see :yref:`Key<Law2_ScGeom_JCFpmPhys_JointedCohesiveFrictionalPM.Key>`) will be created. It contains : apparition iteration, position, type (tensile or shear), cross section and contact normal.")) + ((bool,recordCracks,false,,"if true, data about interactions that lose their cohesive feature are stored in a text file cracksKey.txt (see :yref:`Key<Law2_ScGeom_JCFpmPhys_JointedCohesiveFrictionalPM.Key>` and :yref:`Key<Law2_ScGeom_JCFpmPhys_JointedCohesiveFrictionalPM.cracksFileExist>`). It contains 9 columns: the break iteration, the 3 coordinates of the contact point, the type (1 means shear break, while 0 corresponds to tensile break), the ''cross section'' (mean radius of the 2 spheres) and the 3 coordinates of the contact normal.")) ); DECLARE_LOGGER; };
_______________________________________________ Mailing list: https://launchpad.net/~yade-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~yade-dev More help : https://help.launchpad.net/ListHelp
