remove some warnings

This commit is contained in:
Joachim Schoeberl 2014-08-15 15:19:10 +00:00
parent 4de47bdbeb
commit f7e2953ad9
8 changed files with 12 additions and 14 deletions

View File

@ -801,7 +801,7 @@ namespace netgen
const LineSeg<2> * linesegment = const LineSeg<2> * linesegment =
dynamic_cast<const LineSeg<2> *>(&faces[intersecting_faces[0]]->GetSpline()); dynamic_cast<const LineSeg<2> *>(&faces[intersecting_faces[0]]->GetSpline());
Vec<2> t1,t2; Vec<2> t1(0),t2(0);
if(linesegment) if(linesegment)
t1 = linesegment->StartPI() - linesegment->EndPI(); t1 = linesegment->StartPI() - linesegment->EndPI();

View File

@ -3871,7 +3871,7 @@ namespace netgen
const bool uselocalworsening = false; const bool uselocalworsening = false;
bool repaired = false; // bool repaired = false;
Validate(mesh,bad_elts,pure_badness,max_worsening,uselocalworsening); Validate(mesh,bad_elts,pure_badness,max_worsening,uselocalworsening);
@ -3906,7 +3906,7 @@ namespace netgen
pure_badness, pure_badness,
max_worsening,uselocalworsening, max_worsening,uselocalworsening,
idmaps); idmaps);
repaired = true; // repaired = true;
repaired_once = true; repaired_once = true;
} }
catch(NgException & ex) catch(NgException & ex)

View File

@ -74,13 +74,14 @@ Meshing3 :: ~Meshing3 ()
/*
// was war das ????
static double CalcLocH (const Array<Point3d> & locpoints, static double CalcLocH (const Array<Point3d> & locpoints,
const Array<MiniElement2d> & locfaces, const Array<MiniElement2d> & locfaces,
double h) double h)
{ {
return h; return h;
// was war das ????
int i, j; int i, j;
double hi, h1, d, dn, sum, weight, wi; double hi, h1, d, dn, sum, weight, wi;
@ -138,7 +139,7 @@ static double CalcLocH (const Array<Point3d> & locpoints,
return sum/weight; return sum/weight;
} }
*/
PointIndex Meshing3 :: AddPoint (const Point3d & p, PointIndex globind) PointIndex Meshing3 :: AddPoint (const Point3d & p, PointIndex globind)
{ {

View File

@ -669,7 +669,7 @@ namespace netgen
/// Calculates Volume of elemenet /// Calculates Volume of elemenet
double Volume (const T_POINTS & points) const; double Volume (const T_POINTS & points) const;
/// ///
virtual void Print (ostream & ost) const; void Print (ostream & ost) const;
/// ///
int GetNFaces () const int GetNFaces () const
{ {

View File

@ -54,6 +54,7 @@ namespace netgen
Array<SurfaceElementIndex> seia; Array<SurfaceElementIndex> seia;
mesh.GetSurfaceElementsOfFace (faceindex, seia); mesh.GetSurfaceElementsOfFace (faceindex, seia);
/*
bool mixed = 0; bool mixed = 0;
for (i = 0; i < seia.Size(); i++) for (i = 0; i < seia.Size(); i++)
if (mesh[seia[i]].GetNP() != 3) if (mesh[seia[i]].GetNP() != 3)
@ -61,7 +62,7 @@ namespace netgen
mixed = 1; mixed = 1;
break; break;
} }
*/
int loci; int loci;
double fact; double fact;

View File

@ -575,7 +575,7 @@ void STLSurfaceMeshing1 (STLGeometry & geom,
double starttime = GetTime (); double starttime = GetTime ();
mesh.SurfaceArea().ReCalc(); mesh.SurfaceArea().ReCalc();
int oldnp = mesh.GetNP(); // int oldnp = mesh.GetNP();
Array<int,PointIndex::BASE> compress(mesh.GetNP()); Array<int,PointIndex::BASE> compress(mesh.GetNP());
compress = 0; compress = 0;
@ -919,13 +919,10 @@ int MeshingSTLSurface ::
IsLineVertexOnChart (const Point3d & p1, const Point3d & p2, IsLineVertexOnChart (const Point3d & p1, const Point3d & p2,
int endpoint, const PointGeomInfo & gi) int endpoint, const PointGeomInfo & gi)
{ {
Vec3d baselinenormal = geom.meshtrignv;
int lineendtrig = gi.trignum; int lineendtrig = gi.trignum;
return geom.TrigIsInOC (lineendtrig, geom.meshchart); return geom.TrigIsInOC (lineendtrig, geom.meshchart);
// Vec3d baselinenormal = geom.meshtrignv;
// Vec3d linenormal = geom.GetTriangleNormal (lineendtrig); // Vec3d linenormal = geom.GetTriangleNormal (lineendtrig);
// return ( (baselinenormal * linenormal) > cos (30 * (M_PI/180)) ); // return ( (baselinenormal * linenormal) > cos (30 * (M_PI/180)) );
} }

View File

@ -2678,7 +2678,7 @@ void STLGeometry :: AddFaceEdges()
{ {
const STLChart& c = GetChart(chartindex.Get(i)); const STLChart& c = GetChart(chartindex.Get(i));
// bool foundone = false; // bool foundone = false;
int longest_ap1, longest_ap2 = -1; int longest_ap1 = -1, longest_ap2 = -1;
double maxlen = -1; double maxlen = -1;
for (int j = 1; j <= c.GetNChartT(); j++) for (int j = 1; j <= c.GetNChartT(); j++)
{ {

View File

@ -23,7 +23,6 @@ void STLGeometry :: MakeAtlas(Mesh & mesh)
int timer2 = NgProfiler::CreateTimer ("makeatlas - part 2"); int timer2 = NgProfiler::CreateTimer ("makeatlas - part 2");
int timer3 = NgProfiler::CreateTimer ("makeatlas - part 3"); int timer3 = NgProfiler::CreateTimer ("makeatlas - part 3");
int timer4 = NgProfiler::CreateTimer ("makeatlas - part 4"); int timer4 = NgProfiler::CreateTimer ("makeatlas - part 4");
int timer4a = NgProfiler::CreateTimer ("makeatlas - part 4a");
int timer5 = NgProfiler::CreateTimer ("makeatlas - part 5"); int timer5 = NgProfiler::CreateTimer ("makeatlas - part 5");
PushStatusF("Make Atlas"); PushStatusF("Make Atlas");