------------------------------------------------------------ revno: 3793 committer: Bruno Chareyre <[email protected]> timestamp: Wed 2016-02-10 18:09:03 +0100 message: fix some hyperlinks pointing to the old geo.hmg.inpg.fr modified: doc/sphinx/installation.rst doc/yade-conferences.bib examples/FluidCouplingPFV/oedometer.py pkg/pfv/FlowEngine.ipp.in
-- 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/installation.rst' --- doc/sphinx/installation.rst 2016-01-28 15:00:38 +0000 +++ doc/sphinx/installation.rst 2016-02-10 17:09:03 +0000 @@ -304,5 +304,5 @@ If you are not running Ubuntu nor Debian, there is a way to create a Yubuntu `live-usb <http://en.wikipedia.org/wiki/Live_USB>`_ on any usb mass-storage device (minimum recommended size is 5GB). It is a way to make a bootable usb-key with a preinstalled minimalist operating system (Xubuntu), including Yadedaily and Paraview. -More informations about this alternative are available `here <http://geo.hmg.inpg.fr/~chareyre/pubs/yubuntu/>`__ (see the README file first). +More informations about this alternative are available `here <http://people.3sr-grenoble.fr/users/bchareyre/pubs/yubuntu/>`_ (see the README file first). === modified file 'doc/yade-conferences.bib' --- doc/yade-conferences.bib 2016-01-28 15:00:38 +0000 +++ doc/yade-conferences.bib 2016-02-10 17:09:03 +0000 @@ -264,7 +264,7 @@ booktitle = {II International Conference on Particle-based Methods - Fundamentals and Applications}, address = {Barcelona, Spain}, pages = {1--12}, - url={http://geo.hmg.inpg.fr/~chareyre/pubs/CatalanoChareyreCortisBarthelemy_Particles2011.pdf} + url={http://people.3sr-grenoble.fr/users/bchareyre/pubs/CatalanoChareyreCortisBarthelemy_Particles2011.pdf} } @InProceedings{ Sari2011, @@ -276,7 +276,7 @@ booktitle = {II International Conference on Particle-based Methods - Fundamentals and Applications}, address = {Barcelona, Spain}, pages = {1--11}, - url={http://geo.hmg.inpg.fr/~chareyre/pubs/SariChareyreCatalanoPhilippeVincens_Particles2011.pdf} + url={http://people.3sr-grenoble.fr/users/bchareyre/pubs/SariChareyreCatalanoPhilippeVincens_Particles2011.pdf} } @InProceedings{Favier2009b, @@ -310,7 +310,7 @@ booktitle = {International Conference on Flows and Mechanics in Natural Porous Media from Pore to Field Scale - Pore2Field}, address = {Rueil-Malmaison, France}, pages = {4p}, - url = {http://geo.hmg.inpg.fr/~chareyre/pubs/IFPEN-Pore2Field-Chareyre_et_al_Meta.pdf} + url = {http://people.3sr-grenoble.fr/users/bchareyre/pubs/IFPEN-Pore2Field-Chareyre_et_al_Meta.pdf} } @InProceedings{ Scholtes2011b, @@ -860,7 +860,7 @@ booktitle={Annual Report 1}, editor={Grenoble Geomechanics Group}, title={Numerical modelling of the localized fluidization in a saturated granular medium using the coupled method DEM-PFV}, - url={http://geo.hmg.inpg.fr/~chareyre/pubs/GGG-Annual_Report_1-March_2015.pdf}, + url={http://people.3sr-grenoble.fr/users/bchareyre/pubs/GGG-Annual_Report_1-March_2015.pdf}, author={Toraldo, Marcella and Chareyre, Bruno and Sibille, Luc}, pages={131--138} } === modified file 'examples/FluidCouplingPFV/oedometer.py' --- examples/FluidCouplingPFV/oedometer.py 2014-11-18 19:46:27 +0000 +++ examples/FluidCouplingPFV/oedometer.py 2016-02-10 17:09:03 +0000 @@ -14,7 +14,7 @@ ## http://arxiv.org/pdf/1304.4895.pdf ## Also used in: ## * Tong et al.2012 (http://dx.doi.org/10.2516/ogst/2012032) -## * Sari et al 2011 (http://geo.hmg.inpg.fr/~chareyre/pubs/SariChareyreCatalanoPhilippeVincens_Particles2011.pdf) +## * Sari et al 2011 (http://people.3sr-grenoble.fr/users/bchareyre/pubs/SariChareyreCatalanoPhilippeVincens_Particles2011.pdf) ## The DEM-PFV is applied here to 1D consolidation (oedometer test). The example includes the determination of oedometer modulus Ee and permeability K. === modified file 'pkg/pfv/FlowEngine.ipp.in' --- pkg/pfv/FlowEngine.ipp.in 2015-05-04 16:59:30 +0000 +++ pkg/pfv/FlowEngine.ipp.in 2016-02-10 17:09:03 +0000 @@ -294,7 +294,8 @@ shared_ptr<Sphere> sph ( new Sphere ); const int Sph_Index = sph->getClassIndexStatic(); FOREACH ( const shared_ptr<Body>& b, *scene->bodies ) { - if (!b || ignoredBody==b->getId() || b->isClumpMember()) continue; +// if (!b || ignoredBody==b->getId() || b->isClumpMember()) continue; + if (!b || (mask<=0 or !b->maskCompatible(mask)) || b->isClumpMember()) continue; posData& dat = buffer[b->getId()]; dat.id=b->getId(); dat.pos=b->state->pos;
_______________________________________________ Mailing list: https://launchpad.net/~yade-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~yade-dev More help : https://help.launchpad.net/ListHelp
