yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1713
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
branch nick: trunk
timestamp: Thu 2009-08-20 21:55:52 +0200
message:
  1. Almost fixed https://bugs.launchpad.net/yade/+bug/412892
  Just 1 warning:
  
  /home/anton/dem/bzr-current/yade/py/WeightedAverage2d.cpp:7: Warning: no matching file member found for 
  bool pyGaussAverage::pointInsidePolygon(const Vector2r &pt, const vector< Vector2r > &vertices)
  Possible candidates:
    bool pointInsidePolygon(python::tuple xy, python::object vertices)
  
  I have not fixed it, as was afraid to brake a code
  
  2. A couple addons to .bzrignore to ignore files, generated by Doxygen
modified:
  .bzrignore
  core/PhysicalParameters.cpp
  gui/qt3/YadeQtMainWindow.cpp
  gui/qt3/YadeQtMainWindow.hpp
  pkg/dem/DataClass/Clump.cpp
  pkg/dem/Engine/DeusExMachina/TriaxialStressController.cpp
  pkg/dem/PreProcessor/ClumpTestGen.cpp
  pkg/snow/Engine/Ef2_InteractingBox_BssSnowGrain_makeIstSnowLayersContact.cpp
  py/_utils.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 '.bzrignore'
--- .bzrignore	2009-08-18 12:26:24 +0000
+++ .bzrignore	2009-08-20 19:55:52 +0000
@@ -1,3 +1,5 @@
 tags
 scons.current-profile
 scons.profile-*
+.project
+./doc/doxygen

=== modified file 'core/PhysicalParameters.cpp'
--- core/PhysicalParameters.cpp	2009-07-27 17:08:23 +0000
+++ core/PhysicalParameters.cpp	2009-08-20 19:55:52 +0000
@@ -14,7 +14,7 @@
 	#undef _SET_DOF
 	return ret;
 }
-void PhysicalParameters::blockedDOFs_vec_set(const std::vector<string>& dofs){
+void PhysicalParameters::blockedDOFs_vec_set(const std::vector<std::string>& dofs){
 	FOREACH(const std::string s, dofs){
 		#define _GET_DOF(DOF_ANY,str) if(s==str) { blockedDOFs|=PhysicalParameters::DOF_ANY; continue; }
 		_GET_DOF(DOF_X,"x"); _GET_DOF(DOF_Y,"y"); _GET_DOF(DOF_Z,"z"); _GET_DOF(DOF_RX,"rx"); _GET_DOF(DOF_RY,"ry"); _GET_DOF(DOF_RZ,"rz");

=== modified file 'gui/qt3/YadeQtMainWindow.cpp'
--- gui/qt3/YadeQtMainWindow.cpp	2009-06-17 11:49:09 +0000
+++ gui/qt3/YadeQtMainWindow.cpp	2009-08-20 19:55:52 +0000
@@ -102,7 +102,7 @@
 	}
 }
 
-void YadeQtMainWindow::loadSimulation(string file){createController(); while(!(bool)(controller)) usleep(50000); controller->loadSimulationFromFileName(file); lookDown(glViews[0]);}
+void YadeQtMainWindow::loadSimulation(std::string file){createController(); while(!(bool)(controller)) usleep(50000); controller->loadSimulationFromFileName(file); lookDown(glViews[0]);}
 void YadeQtMainWindow::centerViews(){FOREACH(const shared_ptr<GLViewer>& glv,glViews){ if(glv){ glv->centerScene();}}}
 
 

=== modified file 'gui/qt3/YadeQtMainWindow.hpp'
--- gui/qt3/YadeQtMainWindow.hpp	2009-06-17 11:49:09 +0000
+++ gui/qt3/YadeQtMainWindow.hpp	2009-08-20 19:55:52 +0000
@@ -38,7 +38,7 @@
 		size_t viewsSize(){return glViews.size();};
 		void centerViews();
 		void adjustCameraInCurrentView(qglviewer::Vec up,qglviewer::Vec dir);
-		void loadSimulation(string file);
+		void loadSimulation(std::string file);
 		void redrawAll(bool force=false);
 		void lookDown(shared_ptr<GLViewer> glv);
 

=== modified file 'pkg/dem/DataClass/Clump.cpp'
--- pkg/dem/DataClass/Clump.cpp	2009-08-05 17:00:48 +0000
+++ pkg/dem/DataClass/Clump.cpp	2009-08-20 19:55:52 +0000
@@ -18,8 +18,8 @@
 ClumpMemberMover::ClumpMemberMover(){/*createIndex();*/ }
 
 /*! We only call clump's method, since it belongs there logically. It makes encapsulation of private members nicer, too.
- * @param pp passed by the dispatcher
- * @param clump passed by the dispatcher
+ * _param pp passed by the dispatcher
+ * _param clump passed by the dispatcher
  */
 void ClumpMemberMover::applyCondition(MetaBody* rootBody){
 	for(BodyContainer::iterator I=rootBody->bodies->begin(); I!=rootBody->bodies->end(); ++I){

=== modified file 'pkg/dem/Engine/DeusExMachina/TriaxialStressController.cpp'
--- pkg/dem/Engine/DeusExMachina/TriaxialStressController.cpp	2009-08-12 08:27:41 +0000
+++ pkg/dem/Engine/DeusExMachina/TriaxialStressController.cpp	2009-08-20 19:55:52 +0000
@@ -354,7 +354,7 @@
 }
 
 /*!
-    \fn TriaxialStressController::ComputeUnbalancedForce()
+    \fn TriaxialStressController::ComputeUnbalancedForce(MetaBody * ncb, bool maxUnbalanced)
  */
 Real TriaxialStressController::ComputeUnbalancedForce(MetaBody * ncb, bool maxUnbalanced)
 {

=== modified file 'pkg/dem/PreProcessor/ClumpTestGen.cpp'
--- pkg/dem/PreProcessor/ClumpTestGen.cpp	2009-08-05 17:00:48 +0000
+++ pkg/dem/PreProcessor/ClumpTestGen.cpp	2009-08-20 19:55:52 +0000
@@ -77,12 +77,13 @@
  * Attention here: clump's id must be greater than id of any of its constituents; therefore
  *   1. create bodies that will be clumped, add them to bodies (at that moment they get their id) and save their ids in clumpMembers
  *   2. create (empty) clump and add it to bodies
- *	  3. add bodies to be clumped to the clump
- *	  4. call Clump::updateProperties to get physical properties physically right (inertia, position, orientation, mass, ...).
+ *   3. add bodies to be clumped to the clump
+ *   4. call Clump::updateProperties to get physical properties physically right (inertia, position, orientation, mass, ...).
  *
  * @param clumpPos Center of the clump (not necessarily centroid); serves merely as reference for sphere positions.
  * @param relPos Relative positions of individual spheres' centers.
  * @param radii Radii of composing spheres. Must have the same length as relPos.
+ * @param rootBody clumpedBodies.
  */
 void ClumpTestGen::createOneClump(shared_ptr<MetaBody>& rootBody, Vector3r clumpPos, vector<Vector3r> relPos, vector<Real> radii)
 {

=== modified file 'pkg/snow/Engine/Ef2_InteractingBox_BssSnowGrain_makeIstSnowLayersContact.cpp'
--- pkg/snow/Engine/Ef2_InteractingBox_BssSnowGrain_makeIstSnowLayersContact.cpp	2009-08-03 10:02:11 +0000
+++ pkg/snow/Engine/Ef2_InteractingBox_BssSnowGrain_makeIstSnowLayersContact.cpp	2009-08-20 19:55:52 +0000
@@ -249,16 +249,16 @@
 						const Se3r& se32,
 						const shared_ptr<Interaction>& c)
 {
-///	bool result = go(cm2,cm1,se32,se31,c);
-///	if(result)
-///	{
-///		shared_ptr<SpheresContactGeometry> scm;
-///		if(c->interactionGeometry) scm=YADE_PTR_CAST<SpheresContactGeometry>(c->interactionGeometry);
-///		else { std::cerr << "whooooooooops_2!" << __FILE__ << "\n"; return false; }
-///		scm->normal *= -1.0;
-///		std::swap(scm->radius1,scm->radius2);
-///	}
-///	return result;
+//	bool result = go(cm2,cm1,se32,se31,c);
+//	if(result)
+//	{
+//		shared_ptr<SpheresContactGeometry> scm;
+//		if(c->interactionGeometry) scm=YADE_PTR_CAST<SpheresContactGeometry>(c->interactionGeometry);
+//		else { std::cerr << "whooooooooops_2!" << __FILE__ << "\n"; return false; }
+//		scm->normal *= -1.0;
+//		std::swap(scm->radius1,scm->radius2);
+//	}
+//	return result;
 
 
 	//InteractingBox* m1=static_cast<InteractingBox*>(cm1.get()), *m2=static_cast<BssSnowGrain*>(cm2.get());
@@ -448,4 +448,4 @@
 
 }
 
-YADE_PLUGIN((Ef2_InteractingBox_BssSnowGrain_makeIstSnowLayersContact));
\ No newline at end of file
+YADE_PLUGIN((Ef2_InteractingBox_BssSnowGrain_makeIstSnowLayersContact));

=== modified file 'py/_utils.cpp'
--- py/_utils.cpp	2009-08-20 09:38:22 +0000
+++ py/_utils.cpp	2009-08-20 19:55:52 +0000
@@ -191,7 +191,8 @@
 
 /*!Sum moments acting on given bodies
  *
- * @param mask is Body::groupMask that must match for a body to be taken in account.
+ * @param ids is the calculated bodies ids
+ * param mask is Body::groupMask that must match for a body to be taken in account.
  * @param axis is the direction of axis with respect to which the moment is calculated.
  * @param axisPt is a point on the axis.
  *