yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2875
committer: Bruno Chareyre <bruno.chareyre@xxxxxxxxxxx>
branch nick: trunk
timestamp: Wed 2011-06-08 18:21:31 +0200
message:
  - an attempt to fix builbot-side compile error in the html version of "formulation" chapter (compile ok locally) 
modified:
  doc/sphinx/conf.py
  doc/sphinx/formulation.rst
  doc/yade-conferences.bib
  doc/yade-theses.bib


--
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/conf.py'
--- doc/sphinx/conf.py	2011-06-07 08:10:19 +0000
+++ doc/sphinx/conf.py	2011-06-08 16:21:31 +0000
@@ -410,6 +410,7 @@
 
 my_latex_preamble=r'''
 \usepackage{euler} % must be loaded before fontspec for the whole doc (below); this must be kept for pngmath, however
+\usepackage{hyperref}
 \usepackage{amsmath}
 \usepackage{amsbsy}
 %\usepackage{mathabx}

=== modified file 'doc/sphinx/formulation.rst'
--- doc/sphinx/formulation.rst	2011-02-02 08:13:42 +0000
+++ doc/sphinx/formulation.rst	2011-06-08 16:21:31 +0000
@@ -981,8 +981,8 @@
   
   where $p$ is packing porosity, roughly $\frac{1}{2}$ for dense irregular packings of spheres of similar radius.
 
-  The dependency is not strictly linear (which would be the best case), as some algorithms do not scale linearly; a case in point is the sweep and prune collision detection algorithm introduced in :ref:`sect-sweep-and-prune`_, with scaling roughly $\bigO{N \log N}$.
-	
+  The dependency is not strictly linear (which would be the best case), as some algorithms do not scale linearly; a case in point is the sweep and prune collision detection algorithm introduced in sect.~\ref{sect-sweep-and-prune}, with scaling roughly $\bigO{N \log N}$.
+
   The number of interactions scales with $N$, as long as packing characteristics are the same.
 * the number of computational cores $\numCPU$; in the ideal case, the dependency would be inverse-linear were all algorithms parallelized (in Yade, collision detection is not).
 

=== modified file 'doc/yade-conferences.bib'
--- doc/yade-conferences.bib	2011-04-18 18:09:42 +0000
+++ doc/yade-conferences.bib	2011-06-08 16:21:31 +0000
@@ -35,7 +35,7 @@
 	month={October}
 }
 
-@inproceedings{Chen2009,
+@inproceedings{Chen2009b,
 	title={3D DEM Analysis Of Graded Rock Fill Sinkhole Repair: Particle Size Effects On The Probability Of Stability},
 	author={Chen, F. and Drumm, E.C. and Guiochon, G.},
 	booktitle={Transportation Research Board Conference (Washington DC)},

=== modified file 'doc/yade-theses.bib'
--- doc/yade-theses.bib	2011-06-07 16:56:16 +0000
+++ doc/yade-theses.bib	2011-06-08 16:21:31 +0000
@@ -14,14 +14,14 @@
 	url={https://yade-dem.org/w/images/a/af/SlopeStability.pdf}
 }
 
-@phdthesis{Chen2009,
-  title={Coupled Flow Discrete Element Method Application in Granular Porous Media using Open Source Codes},
-  author={Chen, F.},
-  school = {University of Tennessee, Knoxville},
-  journal={Doctoral Dissertations},
-  pages={21},
-  year={2009},
-  url={http://trace.tennessee.edu/cgi/viewcontent.cgi?article=1051&context=utk_graddiss}
+@phdthesis{Chen2009a,
+	title={Coupled Flow Discrete Element Method Application in Granular Porous Media using Open Source Codes},
+	author={Chen, F.},
+	school = {University of Tennessee, Knoxville},
+	journal={Doctoral Dissertations},
+	pages={21},
+	year={2009},
+	url={http://trace.tennessee.edu/cgi/viewcontent.cgi?article=1051&context=utk_graddiss}
 }
 
 @phdthesis{Duriez2009a,