yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3773
committer: jduriez <jerome.duriez@xxxxxxxxxxx>
timestamp: Wed 2016-01-13 11:56:48 -0700
message:
  Incorporating previous +1 paper in JCFpm doc
modified:
  doc/yade-articles.bib
  examples/jointedCohesiveFrictionalPM/README
  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/yade-articles.bib'
--- doc/yade-articles.bib	2016-01-13 18:21:25 +0000
+++ doc/yade-articles.bib	2016-01-13 18:56:48 +0000
@@ -209,7 +209,7 @@
 
 @article{Duriez2016,
 title = "Micromechanics of wing crack propagation for different flaw properties",
-author = "J. Duriez and L. Scholt\`es and F.-V. Donz\'e",
+author = "Duriez, J. and Scholtès, L. and Donzé, F.V.",
 journal = "Engineering Fracture Mechanics",
 volume = "153",
 pages = "378 - 398",

=== modified file 'examples/jointedCohesiveFrictionalPM/README'
--- examples/jointedCohesiveFrictionalPM/README	2013-10-04 09:47:21 +0000
+++ examples/jointedCohesiveFrictionalPM/README	2016-01-13 18:56:48 +0000
@@ -1,9 +1,6 @@
-Every files contained in this folder are part of ongoing work initiated by luc scholtes and phd students on the modelling of fractured/jointed media. For details/remarks/improvements, please send emails to lscholtes63@xxxxxxxxx. Also, please refer to following references for more details and explananations:
--[1] Harthong B., Scholtès L., Donzé F.V. (2012). Strength characterisation of rock masses using a DEM-DFN model, Geophys J Int, 191, 467-480.
--[2] Scholtès L., Donzé F.V. (2012). Modelling progressive failure in fractured rock masses using a 3D Discrete Element Method, Int J Rock Mech Min Sci, 52,18-30.
--[3] Scholtès L., Donzé F.V. (2011). Scale effects on strength of geomaterials, case study: coal, J Mech Phys Solids, 59(5), 1131-1146.
+This folder illustrates the modelling of fractured/jointed rock media, as initiated by Luc Scholtes: how Law2_ScGeom_JCFpmPhys_JointedCohesiveFrictionalPM can be used to deal with jointed media (media containing pre-existing discontinuity surfaces e.g. fractures). For details/remarks/improvements, please send emails to lscholtes63@xxxxxxxxx or use https://answers.launchpad.net/yade/+addquestion. Also, please refer to following references (from https://www.yade-dem.org/doc/publications.html) for more details and explananations: Hartong2012a, Scholtes2012, Scholtes2013, Duriez2016
 
-jcfPM folder contains files illustrating how Law2_ScGeom_JCFpmPhys_JointedCohesiveFrictionalPM can be used to deal with jointed media (media containing pre-existing discontinuity surfaces (fractures)).
+This folder includes the following files:
 
 1-packInGtsSurface.py is a simple script used to generate a packing (parallellepiped_10.spheres) from a meshed closed surface (parallellepiped.gts).
 Packing generation can be done with other methods. The point here is to generate a packing and to save it in a text file (parallellepiped_10.spheres).

=== modified file 'pkg/dem/JointedCohesiveFrictionalPM.hpp'
--- pkg/dem/JointedCohesiveFrictionalPM.hpp	2014-11-26 17:26:29 +0000
+++ pkg/dem/JointedCohesiveFrictionalPM.hpp	2016-01-13 18:56:48 +0000
@@ -87,7 +87,7 @@
 		FUNCTOR2D(JCFpmMat,JCFpmMat);
 		DECLARE_LOGGER;
 		
-		YADE_CLASS_BASE_DOC_ATTRS(Ip2_JCFpmMat_JCFpmMat_JCFpmPhys,IPhysFunctor,"Converts 2 :yref:`JCFpmMat` instances to one :yref:`JCFpmPhys` instance, with corresponding parameters.",
+                YADE_CLASS_BASE_DOC_ATTRS(Ip2_JCFpmMat_JCFpmMat_JCFpmPhys,IPhysFunctor,"Converts 2 :yref:`JCFpmMat` instances to one :yref:`JCFpmPhys` instance, with corresponding parameters. See :yref:`JCFpmMat` and [Duriez2016]_ for details",
 			((int,cohesiveTresholdIteration,1,,"should new contacts be cohesive? If strictly negativ, they will in any case. If positiv, they will before this iter, they won't afterward."))
 		);