Merge authors: Christian Jakob (jakob-ifgt) jduriez (jduriez) ------------------------------------------------------------ revno: 3702 [merge] committer: Jan Stransky <[email protected]> timestamp: Mon 2013-10-07 16:56:57 +0200 message: Merge branch 'master' of github.com:yade/trunk modified: doc/sphinx/user.rst pkg/dem/TesselationWrapper.hpp py/utils.py
-- 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/user.rst' --- doc/sphinx/user.rst 2013-10-04 13:41:43 +0000 +++ doc/sphinx/user.rst 2013-10-07 06:14:15 +0000 @@ -1475,6 +1475,8 @@ * :yref:`fileName<VTKRecorder.fileName>` is the prefix for files being saved. In this case, output files will be named ``/tmp/p1-spheres.0.vtu`` and ``/tmp/p1-facets.0.vtu``, where the number is the number of iteration; many files are created, putting them in a separate directory is advisable. * :yref:`recorders<VTKRecorder.recorders>` determines what data to save +:yref:`yade.exporter.VTKExporter` plays a similar role, with the difference that it is more flexible. It will save any user defined variable associated to the bodies. + Loading data into Paraview ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -1565,7 +1567,7 @@ s=bodyStressTensors() stress = s[b.id]**4.*pi/3.*b.shape.radius**3/TW.volume(b.id) -As any other value, the stress can be exported to a vtk file for display in Paraview using :yref:`VTKRecorder`. +As any other value, the stress can be exported to a vtk file for display in Paraview using :yref:`yade.exporter.VTKExporter`. ****************************** Python specialties and tricks === modified file 'pkg/dem/TesselationWrapper.hpp' --- pkg/dem/TesselationWrapper.hpp 2013-08-22 18:35:55 +0000 +++ pkg/dem/TesselationWrapper.hpp 2013-10-07 06:19:35 +0000 @@ -113,7 +113,7 @@ Finite_edges_iterator facet_it; MicroMacroAnalyser mma; - YADE_CLASS_BASE_DOC_ATTRS_CTOR_PY(TesselationWrapper,GlobalEngine,"Handle the triangulation of spheres in a scene, build tesselation on request, and give access to computed quantities (see also the `dedicated section in user manual <https://yade-dem.org/doc/user.html#micro-stress-and-micro-strain-using-tesselationwrapper>`_). The calculation of microstrain is explained in [Catalano2013a]_ \n\nSee example usage in script example/tesselationWrapper/tesselationWrapper.py.\n\nBelow is an output of the :yref:`defToVtk<TesselationWrapper::defToVtk>` function visualized with paraview (in this case Yade's TesselationWrapper was used to process experimental data obtained on sand by Edward Ando at Grenoble University, 3SR lab.)\n\n.. figure:: fig/localstrain.*", + YADE_CLASS_BASE_DOC_ATTRS_CTOR_PY(TesselationWrapper,GlobalEngine,"Handle the triangulation of spheres in a scene, build tesselation on request, and give access to computed quantities (see also the `dedicated section in user manual <https://yade-dem.org/doc/current/user.html#micro-stress-and-micro-strain>`_). The calculation of microstrain is explained in [Catalano2013a]_ \n\nSee example usage in script example/tesselationWrapper/tesselationWrapper.py.\n\nBelow is an output of the :yref:`defToVtk<TesselationWrapper::defToVtk>` function visualized with paraview (in this case Yade's TesselationWrapper was used to process experimental data obtained on sand by Edward Ando at Grenoble University, 3SR lab.)\n\n.. figure:: fig/localstrain.*", ((unsigned int,n_spheres,0,,"|ycomp|")) ,/*ctor*/ Tes = new Tesselation; === modified file 'py/utils.py' --- py/utils.py 2013-10-04 12:04:43 +0000 +++ py/utils.py 2013-10-07 09:10:44 +0000 @@ -497,6 +497,7 @@ pylab.title('Number of interactions histogram, average %g (cutoff=%g)'%(avgNumInteractions(cutoff),cutoff)) pylab.xlabel('Number of interactions') pylab.ylabel('Body count') + pylab.ion() pylab.show() def plotDirections(aabb=(),mask=0,bins=20,numHist=True,noShow=False): @@ -524,7 +525,9 @@ pylab.axvline(x=avg,linewidth=3,color='r') pylab.ylabel('Body count') if noShow: return pylab.gcf() - else: pylab.show() + else: + pylab.ion() + pylab.show() def encodeVideoFromFrames(*args,**kw):
_______________________________________________ Mailing list: https://launchpad.net/~yade-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~yade-dev More help : https://help.launchpad.net/ListHelp
