yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1918
committer: Bruno Chareyre <bchareyre@r1arduina>
branch nick: trunk
timestamp: Wed 2009-12-23 00:52:51 +0100
message:
  Fix some warnings.
modified:
  lib/triangulation/Deformation.h
  lib/triangulation/Empilement.cpp
  lib/triangulation/Empilement.h
  lib/triangulation/FlowBoundingSphere.cpp
  lib/triangulation/FlowBoundingSphere.h
  lib/triangulation/KinematicLocalisationAnalyser.hpp
  lib/triangulation/RegularTriangulation.h
  lib/triangulation/TesselationWrapper.cpp
  lib/triangulation/def_types.h
  pkg/dem/Engine/GlobalEngine/MicroMacroAnalyser.cpp
  pkg/dem/Engine/PartialEngine/FlowEngine.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 'lib/triangulation/Deformation.h'
--- lib/triangulation/Deformation.h	2009-12-22 18:19:41 +0000
+++ lib/triangulation/Deformation.h	2009-12-22 23:52:51 +0000
@@ -75,4 +75,4 @@
 
 
 } //namespace CGT
-#endif
\ No newline at end of file
+#endif

=== modified file 'lib/triangulation/Empilement.cpp'
--- lib/triangulation/Empilement.cpp	2009-12-22 18:19:41 +0000
+++ lib/triangulation/Empilement.cpp	2009-12-22 23:52:51 +0000
@@ -127,7 +127,6 @@
 
 void Triangule ( Empilement &E, RTriangulation &T)
 {	
-	int current = 0;
 	Vertex_handle Vh;
 	//Sphere* it;
 	std::cout << "top1" << std::endl;
@@ -222,4 +221,4 @@
 //				T.insert( E.sphere_to_wpoint() );
 //			}*/
 //}
-}
\ No newline at end of file
+}

=== modified file 'lib/triangulation/Empilement.h'
--- lib/triangulation/Empilement.h	2009-12-22 18:19:41 +0000
+++ lib/triangulation/Empilement.h	2009-12-22 23:52:51 +0000
@@ -17,9 +17,6 @@
 #define		_Rad_ecart		0.1
 
 namespace CGT{
-//// Macro to get a random integer with a specified range 
-//#define getrandom(min, max) \
-//    ((rand()%(int)(((max) + 1)-(min)))+ (min))
 
 double Rand_d (void);	//Tirage d'un double entre 0 et 1
 Sphere Rand_sph (double rad_max = 0.01); //Tirage d'une sph�re dans une bo�te (0,0,0) -> (1,1,1) 
@@ -108,4 +105,4 @@
 // 
 
 } //namespace CGT
-#endif
\ No newline at end of file
+#endif

=== modified file 'lib/triangulation/FlowBoundingSphere.cpp'
--- lib/triangulation/FlowBoundingSphere.cpp	2009-12-22 18:19:41 +0000
+++ lib/triangulation/FlowBoundingSphere.cpp	2009-12-22 23:52:51 +0000
@@ -334,7 +334,7 @@
 		std::ofstream oFile ( "Analytical_Consolidation",std::ios::out );
 
 		int H = 10;
-		double U = 0, Tv = 0, p0 = 10, dz = H/10;
+		double U = 0, Tv = 0, /*p0 = 10,*/ dz = H/10;
 
 		for ( double z=0; z<=H; z+=dz )
 		{

=== modified file 'lib/triangulation/FlowBoundingSphere.h'
--- lib/triangulation/FlowBoundingSphere.h	2009-12-22 18:19:41 +0000
+++ lib/triangulation/FlowBoundingSphere.h	2009-12-22 23:52:51 +0000
@@ -144,4 +144,4 @@
 
 
 } //namespace CGT
-#endif
\ No newline at end of file
+#endif

=== modified file 'lib/triangulation/KinematicLocalisationAnalyser.hpp'
--- lib/triangulation/KinematicLocalisationAnalyser.hpp	2009-12-13 19:58:33 +0000
+++ lib/triangulation/KinematicLocalisationAnalyser.hpp	2009-12-22 23:52:51 +0000
@@ -126,4 +126,4 @@
 
 };
 
-} // namespace CGT
\ No newline at end of file
+} // namespace CGT

=== modified file 'lib/triangulation/RegularTriangulation.h'
--- lib/triangulation/RegularTriangulation.h	2009-12-13 19:58:33 +0000
+++ lib/triangulation/RegularTriangulation.h	2009-12-22 23:52:51 +0000
@@ -4,8 +4,8 @@
 #include "stdafx.h"
 #include "def_types.h"
 #include <cassert>
-
-namespace CGT {
+
+namespace CGT {
 
 typedef Vertex_Info				vertex_info;		//d�fini le type des infos li�es � chaque sommet
 typedef	Cell_Info				cell_info;		//d�fini le type des infos li�es � chaque cellule
@@ -52,4 +52,4 @@
 int	Regular_Triangule( );
 void Delete_liste_edges (Real** ppCoordonnes, long N_edges=0);
 
-} // namespace CGT
\ No newline at end of file
+} // namespace CGT

=== modified file 'lib/triangulation/TesselationWrapper.cpp'
--- lib/triangulation/TesselationWrapper.cpp	2009-12-13 19:58:33 +0000
+++ lib/triangulation/TesselationWrapper.cpp	2009-12-22 23:52:51 +0000
@@ -14,7 +14,6 @@
 #include "TesselationWrapper.h"
 #include "Tesselation.h"
 
-
 using namespace std;
 
 namespace CGT {

=== modified file 'lib/triangulation/def_types.h'
--- lib/triangulation/def_types.h	2009-12-22 18:19:41 +0000
+++ lib/triangulation/def_types.h	2009-12-22 23:52:51 +0000
@@ -19,6 +19,7 @@
 
 #define FLOW_ENGINE
 
+
 namespace CGT{
 
 typedef CGAL::Cartesian<double> K;
@@ -82,7 +83,7 @@
 	Cell_Info& operator= (const Point &p) { Point::operator= (p); return *this; }
 	//Info& operator= (const Vecteur &u) { Vecteur::operator= (u); return *this; }
 #ifdef FLOW_ENGINE
-	Cell_Info& operator= (const vector<double> &v) { for (int i=0; i<4;) module_permeability[i]= v[i++]; return *this; }
+	Cell_Info& operator= (const vector<double> &v) { for (int i=0; i<4;i++) module_permeability[i]= v[i]; return *this; }
 #endif
 	Cell_Info& operator= (const float &scalar) { s=scalar; return *this; }
 // 	Cell_Info& operator= (const float &scalar) { VolumeVariation=scalar; return *this; }

=== modified file 'pkg/dem/Engine/GlobalEngine/MicroMacroAnalyser.cpp'
--- pkg/dem/Engine/GlobalEngine/MicroMacroAnalyser.cpp	2009-12-13 20:30:13 +0000
+++ pkg/dem/Engine/GlobalEngine/MicroMacroAnalyser.cpp	2009-12-22 23:52:51 +0000
@@ -84,7 +84,7 @@
 	}
 
 	shared_ptr<BodyContainer>& bodies = ncb->bodies;
-	CGT::TriaxialState* ts;
+	CGT::TriaxialState* ts=0;
 	if ( state==1 ) ts = analyser->TS0;
 	else if ( state==2 ) ts = analyser->TS1;
 	else LOG_ERROR ( "state must be 1 or 2, instead of " << state );

=== modified file 'pkg/dem/Engine/PartialEngine/FlowEngine.cpp'
--- pkg/dem/Engine/PartialEngine/FlowEngine.cpp	2009-12-22 18:19:41 +0000
+++ pkg/dem/Engine/PartialEngine/FlowEngine.cpp	2009-12-22 23:52:51 +0000
@@ -1,6 +1,6 @@
 /*************************************************************************
-*  Copyright (C) 2009 by Bruno Chareyre                                  *
-*  bruno.chareyre@xxxxxxxxxxx                                            *
+*  Copyright (C) 2009 by Emanuele Catalano                               *
+*  emanuele.catalanog.inpg.fr                                            *
 *                                                                        *
 *  This program is free software; it is licensed under the terms of the  *
 *  GNU General Public License v2 or later. See file LICENSE for details. *
@@ -314,7 +314,7 @@
 Real FlowEngine::Volume_cell_single_fictious (CGT::Cell_handle cell, Scene* ncb)
 {
 	Real V[3][3];
-	int b;
+	int b=0;
 	int w=0;
 	
 	Real Wall_point[3];