yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2128
committer: Václav Šmilauer <eudoxos@xxxxxxxx>
branch nick: trunk
timestamp: Mon 2010-04-05 12:43:04 +0200
message:
  Add doc to SimpleViscoelasticPhys, add Jean-Francois' paper to both bibtex and SpherePadder's docs
modified:
  doc/references.bib
  pkg/dem/meta/ViscoelasticPM.hpp
  py/pack/_packSpherePadder.cpp


--
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	2010-04-04 22:05:37 +0000
+++ doc/references.bib	2010-04-05 10:43:04 +0000
@@ -78,3 +78,15 @@
 	publisher={Université Joseph Fourier, Grenoble},
 	url={ http://geo.hmg.inpg.fr/frederic/Discrete_Element_Group_FVD.html }
 }
+
+@article{Jerier2009,
+	journal={Granular Matter},
+	title={A geometric algorithm based on tetrahedral meshes to generate a dense polydisperse sphere packing},
+	volume={11},
+	number={1},
+	pages={43--52},
+	year={2009},
+	author={Jean-François Jerier and  Didier Imbault and Fréderic-Victor Donzé and Pierre Doremus},
+	doi={10.1007/s10035-008-0116-0},
+	url=http://www.springerlink.com/content/w0x307g110421035}
+}

=== modified file 'pkg/dem/meta/ViscoelasticPM.hpp'
--- pkg/dem/meta/ViscoelasticPM.hpp	2010-03-16 15:34:25 +0000
+++ pkg/dem/meta/ViscoelasticPM.hpp	2010-04-05 10:43:04 +0000
@@ -30,17 +30,13 @@
 
 /// Interaction physics
 class SimpleViscoelasticPhys : public FrictPhys {
-	public :
-	    /// Normal viscous 
-	    Real cn;
-	    /// Shear viscous 
-	    Real cs;
-		SimpleViscoelasticPhys(){ createIndex(); }
+	public:
 		virtual ~SimpleViscoelasticPhys();
-	protected :
-	REGISTER_ATTRIBUTES(FrictPhys,(cn)(cs));
-	REGISTER_CLASS_AND_BASE(SimpleViscoelasticPhys,FrictPhys);
-	REGISTER_CLASS_INDEX(SimpleViscoelasticPhys,FrictPhys);
+	YADE_CLASS_BASE_DOC_ATTRS_CTOR(SimpleViscoelasticPhys,FrictPhys,"InteractionPhysics created from :yref:`SimpleViscoelasticMat`, for use with :yref:`Law2_Spheres_Viscoelastic_SimpleViscoelastic`.",
+		((Real,cn,NaN,"Normal viscous constant"))
+		((Real,cs,NaN,"Shear viscous constant")),
+		createIndex();
+	)
 };
 REGISTER_SERIALIZABLE(SimpleViscoelasticPhys);
 

=== modified file 'py/pack/_packSpherePadder.cpp'
--- py/pack/_packSpherePadder.cpp	2010-03-25 13:24:10 +0000
+++ py/pack/_packSpherePadder.cpp	2010-04-05 10:43:04 +0000
@@ -23,7 +23,7 @@
 		;
 	#endif
 
-    py::class_<SpherePadder>("SpherePadder",py::init<std::string,std::string>((py::arg("fileName"),py::arg("meshType")=""),"Initialize using tetrahedral mesh stored in *fileName*. Type of file is determined by extension: .gmsh implies *meshType*='GMSH', .inp implies *meshType*='INP'. If the extension is different, specify *meshType* explicitly. Possible values are 'GMSH' and 'INP'."))
+    py::class_<SpherePadder>("SpherePadder","Geometrical algorithm for filling tetrahedral mesh with spheres; the algorithm was designed by Jean-François Jerier and is described in [Jerier2009]_.",py::init<std::string,std::string>((py::arg("fileName"),py::arg("meshType")=""),"Initialize using tetrahedral mesh stored in *fileName*. Type of file is determined by extension: .gmsh implies *meshType*='GMSH', .inp implies *meshType*='INP'. If the extension is different, specify *meshType* explicitly. Possible values are 'GMSH' and 'INP'."))
 
             .add_property("radiusRatio", &SpherePadder::getRadiusRatio,&SpherePadder::setRadiusRatio)
             .add_property("radiusRange", &SpherePadder::getRadiusRange,&SpherePadder::setRadiusRange)