yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4097
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
timestamp: Mon 2014-07-21 11:09:14 +0200
message:
  Remove some warnings.
modified:
  pkg/dem/PeriIsoCompressor.hpp
  pkg/dem/ViscoelasticCapillarPM.cpp


--
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 'pkg/dem/PeriIsoCompressor.hpp'
--- pkg/dem/PeriIsoCompressor.hpp	2014-05-22 15:26:55 +0000
+++ pkg/dem/PeriIsoCompressor.hpp	2014-07-21 09:09:14 +0000
@@ -76,11 +76,8 @@
 
 class Peri3dController: public BoundaryController{
 	public:
-		Vector6r stressOld;//, stressGoal, strainGoal;
-		//Vector6i pe, ps;
+		Vector6r stressOld;
 		Matrix3r sigma, epsilon, epsilonRate, rot, nonrot;
-		//int pathSizes[6], pathsCounter[6], lenPe, lenPs;
-		//vector<Vector2r>* paths[6];
 		
 		virtual void action();
 	YADE_CLASS_BASE_DOC_ATTRS_CTOR_PY(Peri3dController,BoundaryController,"Experimental controller of full strain/stress tensors on periodic cell. Detailed documentation is in py/_extraDocs.py.",
@@ -114,15 +111,10 @@
 		((Vector6i,pathsCounter,Vector6i::Zero(),Attr::readonly,"Peri3dController internal variable"))
 		((int,lenPe,NaN,Attr::readonly,"Peri3dController internal variable"))
 		((int,lenPs,NaN,Attr::readonly,"Peri3dController internal variable"))
-		// not yet used
-		//((Real,currUnbalanced,NaN,,"current unbalanced force |yupdate|"))
-		//((Real,maxUnbalanced,1e-4,,"Maximum unbalanced force"))
 		,
 		/*ctor*/
 		,
 		/*py*/
-			
 	);
-	DECLARE_LOGGER;
 };
 REGISTER_SERIALIZABLE(Peri3dController);

=== modified file 'pkg/dem/ViscoelasticCapillarPM.cpp'
--- pkg/dem/ViscoelasticCapillarPM.cpp	2014-07-18 18:18:50 +0000
+++ pkg/dem/ViscoelasticCapillarPM.cpp	2014-07-21 09:09:14 +0000
@@ -65,8 +65,8 @@
 bool Law2_ScGeom_ViscElCapPhys_Basic::go(shared_ptr<IGeom>& _geom, shared_ptr<IPhys>& _phys, Interaction* I) {
   Vector3r force = Vector3r::Zero();
   
-  const int id1 = I->getId1();
-  const int id2 = I->getId2();
+  const id_t id1 = I->getId1();
+  const id_t id2 = I->getId2();
     
   const ScGeom& geom=*static_cast<ScGeom*>(_geom.get());
   Scene* scene=Omega::instance().getScene().get();