yade-dev team mailing list archive
-
yade-dev team
-
Mailing list archive
-
Message #11938
[Branch ~yade-pkg/yade/git-trunk] Rev 3619: remove '..only:' from sphinx files - not yet supported on older sphinx then breaking the html bui...
------------------------------------------------------------
revno: 3619
committer: Bruno Chareyre <bruno.chareyre@xxxxxxxxxxx>
timestamp: Mon 2015-03-09 10:26:53 +0100
message:
remove '..only:' from sphinx files - not yet supported on older sphinx then breaking the html build | update bib's
modified:
doc/sphinx/index-toctree.rst
doc/sphinx/publications.rst.in
doc/sphinx/references.rst.in
doc/yade-articles.bib
doc/yade-conferences.bib
--
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/index-toctree.rst'
--- doc/sphinx/index-toctree.rst 2015-03-05 20:44:30 +0000
+++ doc/sphinx/index-toctree.rst 2015-03-09 09:26:53 +0000
@@ -36,10 +36,9 @@
references.rst
-.. only:: html and epub
- Indices and tables
- ==================
- * :ref:`genindex`
- * :ref:`modindex`
- * :ref:`search`
+Indices and tables
+==================
+* :ref:`genindex`
+* :ref:`modindex`
+* :ref:`search`
=== modified file 'doc/sphinx/publications.rst.in'
--- doc/sphinx/publications.rst.in 2015-03-05 20:44:30 +0000
+++ doc/sphinx/publications.rst.in 2015-03-09 09:26:53 +0000
@@ -1,34 +1,27 @@
-.. only:: html and epub
- Publications on Yade
- =====================
- This page should be a relatively complete list of publications on Yade itself or done with Yade. If you publish something, do not hesitate to add it on the list. If you don't have direct access to the source code, please send the reference (as a bibtex item) to the `editorial board <mailto:yadedemboard@xxxxxxxxx>`_. If PDF is freely available, add url for direct fulltext downlad. If not, consider uploading fulltext in PDF, either to `Yade wiki <https://www.yade-dem.org/wiki/>`_ or to other website, if legally permitted.
-
-.. only:: html and epub
- The first section gives the references that we kindly ask you to use for citing Yade in publications, as explained in the `"Acknowledging Yade" <citing.html>`_ section.
-
-.. only:: html and epub
- .. note:: This file is generated from :ysrc:`doc/yade-articles.bib`, :ysrc:`doc/yade-conferences.bib`, :ysrc:`doc/yade-theses.bib` and :ysrc:`doc/yade-docref.bib`.
-
-.. only:: html and epub
- Citing Yade
- ---------------------
- Corresponding bibtex entries `here <https://github.com/yade/trunk/blob/master/doc/citing_yade.bib>`_. Pdf versions are available for each of them. See also `"Acknowledging Yade" <citing.html>`_.
+Publications on Yade
+=====================
+This page should be a relatively complete list of publications on Yade itself or done with Yade. If you publish something, do not hesitate to add it on the list. If you don't have direct access to the source code, please send the reference (as a bibtex item) to the `editorial board <mailto:yadedemboard@xxxxxxxxx>`_. If PDF is freely available, add url for direct fulltext downlad. If not, consider uploading fulltext in PDF, either to `Yade wiki <https://www.yade-dem.org/wiki/>`_ or to other website, if legally permitted.
+
+The first section gives the references that we kindly ask you to use for citing Yade in publications, as explained in the `"Acknowledging Yade" <citing.html>`_ section.
+
+.. note:: This file is generated from :ysrc:`doc/yade-articles.bib`, :ysrc:`doc/yade-conferences.bib`, :ysrc:`doc/yade-theses.bib` and :ysrc:`doc/yade-docref.bib`.
+
+Citing Yade
+---------------------
+Corresponding bibtex entries `here <https://github.com/yade/trunk/blob/master/doc/citing_yade.bib>`_. Pdf versions are available for each of them. See also `"Acknowledging Yade" <citing.html>`_.
@bib2rst.bib2rst('../yade-docref.bib')@
-.. only:: html and epub
- Journal articles
- -----------------
+Journal articles
+-----------------
@bib2rst.bib2rst('../yade-articles.bib')@
-.. only:: html and epub
- Conference materials and book chapters
- --------------------------------------
+Conference materials and book chapters
+--------------------------------------
@bib2rst.bib2rst('../yade-conferences.bib')@
-.. only:: html and epub
- Master and PhD theses
- -----------------------
+Master and PhD theses
+-----------------------
@bib2rst.bib2rst('../yade-theses.bib')@
=== modified file 'doc/sphinx/references.rst.in'
--- doc/sphinx/references.rst.in 2015-03-05 20:44:30 +0000
+++ doc/sphinx/references.rst.in 2015-03-09 09:26:53 +0000
@@ -1,9 +1,9 @@
-.. only:: html and epub
- References
- ============
-
- All external articles referenced in Yade documentation.
-
- .. note:: This file is generated from :ysrc:`doc/references.bib`.
+
+References
+============
+
+All external articles referenced in Yade documentation.
+
+.. note:: This file is generated from :ysrc:`doc/references.bib`.
@bib2rst.bib2rst('../references.bib')@
=== modified file 'doc/yade-articles.bib'
--- doc/yade-articles.bib 2015-03-05 20:44:30 +0000
+++ doc/yade-articles.bib 2015-03-09 09:26:53 +0000
@@ -1,3 +1,14 @@
+@article{Bance2014,
+ title={Micromagnetics of shape anisotropy based permanent magnets},
+ author={Bance, S. and Fischbacher, J. and Schrefl, T. and Zins, I. and Rieger, G. and Cassignol, C.},
+ journal={Journal of Magnetism and Magnetic Materials},
+ volume={363},
+ pages={121--124},
+ year={2014},
+ publisher={Elsevier}
+}
+
+
@article{Bonilla2015,
year={2015},
journal={Acta Geotechnica},
=== modified file 'doc/yade-conferences.bib'
--- doc/yade-conferences.bib 2015-03-05 20:44:30 +0000
+++ doc/yade-conferences.bib 2015-03-09 09:26:53 +0000
@@ -704,7 +704,7 @@
year={2011}
}
-@InProceedings{nitka2015b,
+@InProceedings{Nitka2015b,
title={Discrete Modelling of Micro-structural Phenomena in Granular Shear Zones},
author={Nitka, Michal and Tejchman, Jacek and Kozicki, Jan},
booktitle={Bifurcation and Degradation of Geomaterials in the New Millennium},
@@ -713,7 +713,7 @@
publisher={Springer}
}
-@InProceedings{bonilla2014,
+@InProceedings{Bonilla2014,
title={Coupling photogrammetric data with a discrete element model for rock slope stability assessment},
author={Bonilla-Sierra, V and Donzé, FV and Scholtès, L and Elmouttie, M},
booktitle={Rock Engineering and Rock Mechanics: Structures in and on Rock Masses},
@@ -722,7 +722,7 @@
publisher={CRC Press}
}
-@InProceedings{skarzynski2014,
+@InProceedings{Skarzynski2014,
title={Two-scale model for concrete beams subjected to three point bending—numerical analyses and experiments},
author={Skarzynski, M Nitka and Tejchman, J},
booktitle={Computational Modelling of Concrete Structures},
@@ -732,7 +732,7 @@
publisher={CRC Press}
}
-@InProceedings{nitka2014,
+@InProceedings{Nitka2014,
title={Discrete modeling of micro-structure evolution during concrete fracture using DEM},
author={Nitka, M and Tejchman, J},
booktitle={Computational Modelling of Concrete Structures},
@@ -742,7 +742,7 @@
publisher={CRC Press}
}
-@InProceedings{sayeed2014,
+@InProceedings{Sayeed2014,
title={Mechanical Behavior of Granular Materials Considering Confining Pressure Dependency},
author={Sayeed, Md Abu and Sazzad, Md Mahmud and Suzuki, Kiichi},
booktitle={GeoCongress 2012},
@@ -751,7 +751,7 @@
year={2014}
}
-@InProceedings{nicot2015,
+@InProceedings{Nicot2015,
title={Micromechanical Analysis of Second Order Work in Granular Media},
author={Nicot, F and Hadda, N and Bourrier, F and Sibille, L and Tordesillas, A and Darve, F},
booktitle={Bifurcation and Degradation of Geomaterials in the New Millennium},
@@ -760,7 +760,7 @@
publisher={Springer}
}
-@InProceedings{albaba2015,
+@InProceedings{Albaba2015,
title={Modeling the Impact of Granular Flow against an Obstacle},
author={Albaba, Adel and Lambert, Stéphane and Nicot, François and Chareyre, Bruno},
booktitle={Recent Advances in Modeling Landslides and Debris Flows},
@@ -769,7 +769,7 @@
publisher={Springer}
}
-@InProceedings{hadda2015b,
+@InProceedings{Hadda2015b,
title={A microstructural cluster-based description of diffuse and localized failures},
author={Hadda, N and Bourrier, F and Sibille, L and Nicot, F and Wan, R and Darve, F},
booktitle={Geomechanics from Micro to Macro: Proceedings of the International Symposium on Geomechanics from Micro and Macro (IS-Cambridge 2014)},
@@ -778,7 +778,7 @@
publisher={CRC Press/Balkema}
}
-@InProceedings{bourrier2015b,
+@InProceedings{Bourrier2015b,
title={How Can Reliability-Based Approaches Improve the Design of Rockfall Protection Fences?},
author={Bourrier, Franck and Baroth, Julien and Lambert, Stéphane},
booktitle={Engineering Geology for Society and Territory-Volume 2},
@@ -787,7 +787,7 @@
publisher={Springer}
}
-@InProceedings{wan2015,
+@InProceedings{Wan2015,
title={Plastic Deformations in Granular Materials with Rotation of Principal Stress Axes},
author={Wan, Richard and Hadda, Nejib},
booktitle={Bifurcation and Degradation of Geomaterials in the New Millennium},
@@ -796,7 +796,7 @@
publisher={Springer}
}
-@InProceedings{li2014,
+@InProceedings{Li2014,
title={Constrictions and filtration of fine particles in numerical granular filters: Influence of the fabric within the material},
author={Li, W and Vincens, E and Reboul, N and Chareyre, B},
booktitle={Scour and Erosion: Proceedings of the 7th International Conference on Scour and Erosion, Perth, Australia, 2-4 December 2014},
@@ -805,7 +805,7 @@
organization={CRC Press}
}
-@InProceedings{uhlmann2014,
+@InProceedings{Uhlmann2014,
title={Investigation of material removal and surface topography formation in vibratory finishing},
author={Uhlmann, Eckart and Dethlefs, Arne and Eulitz, Alexander},
journal={Procedia CIRP},
@@ -815,7 +815,7 @@
publisher={Elsevier}
}
-@InProceedings{nitka2014b,
+@InProceedings{Nitka2014b,
title={Discrete modeling of micro-structure evolution during concrete fracture using DEM},
author={Nitka, M and Tejchman, J},
journal={Computational Modelling of Concrete Structures},
@@ -825,7 +825,7 @@
publisher={CRC Press}
}
-@InProceedings{nitka2014c,
+@InProceedings{Nitka2014c,
title={Effect of mean grain diameter on vortices, force chains and local volume changes in granular shear zones},
author={Nitka, M and Tejchman, J and Kozicki, J and Lesniewska, D},
journal={Digital Humanitarians: How Big Data Is Changing the Face of Humanitarian Response},
