yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3001
committer: Bruno Chareyre <bruno.chareyre@xxxxxxxxxxx>
branch nick: yade
timestamp: Mon 2012-01-23 15:44:45 +0100
message:
  - missing reference update
  - remove the velocityBins lines in tests since velocityBins are removed from trunk
modified:
  doc/references.bib
  scripts/test/collider-stride-triax.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/references.bib'
--- doc/references.bib	2011-09-08 07:39:58 +0000
+++ doc/references.bib	2012-01-23 14:44:45 +0000
@@ -103,7 +103,7 @@
 
 @InProceedings{ Alonso2004,
 	title = "Micro-mechanical investigation of the granular ratcheting",
-	author = "F. Alonso-Marroqu{\'i}n and R. Garc{\'i}a-Rojo and H. J. Herrmann",
+	author = "F. Alonso-Marroquin and R. Garcia-Rojo and H.J. Herrmann",
 	booktitle = "Cyclic Behaviour of Soils and Liquefaction Phenomena",
 	publisher = "Taylor \& Francis",
 	year = "2004",
@@ -302,13 +302,13 @@
 }
 
 @InProceedings{ Addetta2001,
-	author = "G.~A. {D'Addetta} and F. {Kun} and E. {Ramm} and H.~J. {Herrmann}",
+	author = "G.A. {D'Addetta} and F. {Kun} and E. {Ramm} and H.J. {Herrmann}",
 	title = "{From solids to granulates - Discrete element simulations of fracture and fragmentation processes in geomaterials.}",
 	booktitle = "Continuous and Discontinuous Modelling of Cohesive-Frictional Materials",
 	year = 2001,
 	series = "Lecture Notes in Physics, Berlin Springer Verlag",
 	volume = 568,
-	editor = "{P.~A.~Vermeer, S.~Diebels, W.~Ehlers, H.~J.~Herrmann, S.~Luding, \& E.~Ramm}",
+	editor = "{P.A. Vermeer, S. Diebels, W. Ehlers, H.J. Herrmann, S. Luding, E. Ramm}",
 	pages = "231--+",
 	url = "http://www.comphys.ethz.ch/hans/p/267.pdf";
 }
@@ -490,3 +490,24 @@
 	number = {B},
 	year = {2004}
 }
+
+@InProceedings{Kettner2011,
+   AUTHOR       = {Lutz Kettner and Andreas Meyer and Afra Zomorodian},
+   BOOKTITLE    = {{CGAL} User and Reference Manual},
+   PUBLISHER    = {{CGAL Editorial Board}},
+   TITLE        = {Intersecting Sequences of {dD} Iso-oriented Boxes},
+   YEAR         = {2011},
+   EDITION      = {{3.9}},
+   url = {http://www.cgal.org/Manual/3.9/doc_html/cgal_manual/packages.html#Pkg:BoxIntersectionD}
+}
+
+@InProceedings{Pion2011,
+   AUTHOR       = {Sylvain Pion and Monique Teillaud},
+   BOOKTITLE    = {{CGAL} User and Reference Manual},
+   PUBLISHER    = {{CGAL Editorial Board}},
+   TITLE        = {{3D} Triangulations},
+   YEAR         = {2011},
+   EDITION      = {{3.9}},
+   url      = {http://www.cgal.org/Manual/3.9/doc_html/cgal_manual/packages.html#Pkg:Triangulation3}
+}
+

=== modified file 'scripts/test/collider-stride-triax.py'
--- scripts/test/collider-stride-triax.py	2010-05-30 13:41:00 +0000
+++ scripts/test/collider-stride-triax.py	2012-01-23 14:44:45 +0000
@@ -16,11 +16,6 @@
 if 1:
 	# length by which bboxes will be made larger
 	collider.sweepLength=.2*O.bodies[100].shape.radius
-	# if this is enabled, bboxes will be enlarged based on velocity bin for each body
-	if 1:
-		collider.nBins=3
-		collider.binCoeff=10
-		log.setLevel('VelocityBins',log.DEBUG)
 
 O.step() # filter out initialization
 O.timingEnabled=True