fix warnings

This commit is contained in:
Joachim Schöberl 2018-03-08 23:47:58 +01:00
parent 7c1cee3817
commit ee7ac2e0a0
8 changed files with 27 additions and 27 deletions

View File

@ -1599,7 +1599,7 @@ void EllipticCone :: CalcData ()
c1 = pow(va*nvl,2) + ellipt2*pow(va*nvs,2) - t1*t1; c1 = pow(va*nvl,2) + ellipt2*pow(va*nvs,2) - t1*t1;
double lvltop = vlr*lvl; double lvltop = vlr*lvl;
double minlvl = (lvl < lvltop) ? lvl : lvltop; // double minlvl = (lvl < lvltop) ? lvl : lvltop;
double maxlvl = max2( lvl,lvltop); double maxlvl = max2( lvl,lvltop);
cxx /= maxlvl; cyy /= maxlvl; czz /= maxlvl; cxx /= maxlvl; cyy /= maxlvl; czz /= maxlvl;
cxy /= maxlvl; cxz /= maxlvl; cyz /= maxlvl; cxy /= maxlvl; cxz /= maxlvl; cyz /= maxlvl;

View File

@ -1255,7 +1255,7 @@ BuildSurfaceElements (Array<Segment> & segs,
Vec<3> ns = surf->GetNormalVector (mesh[s1[0]]); Vec<3> ns = surf->GetNormalVector (mesh[s1[0]]);
Vec<3> t1 = mesh[s1[1]] - mesh[s1[0]]; Vec<3> t1 = mesh[s1[1]] - mesh[s1[0]];
Vec<3> t2 = mesh[s2[1]] - mesh[s2[0]]; // Vec<3> t2 = mesh[s2[1]] - mesh[s2[0]];
Vec<3> nst1 = Cross(t1, ns); Vec<3> nst1 = Cross(t1, ns);
// Vec<3> nst2 = Cross(t2, ns); // Vec<3> nst2 = Cross(t2, ns);
Vec<3> dvec = Center(mesh[s1[0]], mesh[s1[1]])-Center(mesh[s2[0]], mesh[s2[1]]); Vec<3> dvec = Center(mesh[s1[0]], mesh[s1[1]])-Center(mesh[s2[0]], mesh[s2[1]]);

View File

@ -2659,7 +2659,7 @@ namespace netgen
static int timer2 = NgProfiler::CreateTimer ("Bisect 2"); static int timer2 = NgProfiler::CreateTimer ("Bisect 2");
static int timer2a = NgProfiler::CreateTimer ("Bisect 2a"); static int timer2a = NgProfiler::CreateTimer ("Bisect 2a");
static int timer2b = NgProfiler::CreateTimer ("Bisect 2b"); static int timer2b = NgProfiler::CreateTimer ("Bisect 2b");
static int timer2c = NgProfiler::CreateTimer ("Bisect 2c"); // static int timer2c = NgProfiler::CreateTimer ("Bisect 2c");
static int timer3 = NgProfiler::CreateTimer ("Bisect 3"); static int timer3 = NgProfiler::CreateTimer ("Bisect 3");
static int timer3a = NgProfiler::CreateTimer ("Bisect 3a"); static int timer3a = NgProfiler::CreateTimer ("Bisect 3a");
static int timer3b = NgProfiler::CreateTimer ("Bisect 3b"); static int timer3b = NgProfiler::CreateTimer ("Bisect 3b");

View File

@ -3563,7 +3563,7 @@ namespace netgen
x + y +(z), x + y +(z),
(1-x)+ y +(z), (1-x)+ y +(z),
}; };
int ii = 8; // int ii = 8;
const ELEMENT_EDGE * edges = MeshTopology::GetEdges1 (HEX); const ELEMENT_EDGE * edges = MeshTopology::GetEdges1 (HEX);
for (int i = 0; i < 8; i++) for (int i = 0; i < 8; i++)

View File

@ -208,11 +208,11 @@ namespace netgen
int cntsteps = 0; int cntsteps = 0;
if (mesh3d.GetNOpenElements()) if (mesh3d.GetNOpenElements())
do do
{ {
if (multithread.terminate) if (multithread.terminate)
break; break;
mesh3d.FindOpenElements(k); mesh3d.FindOpenElements(k);
PrintMessage (5, mesh3d.GetNOpenElements(), " open faces"); PrintMessage (5, mesh3d.GetNOpenElements(), " open faces");
cntsteps++; cntsteps++;
@ -248,10 +248,10 @@ namespace netgen
mp.giveuptol = 15 + 10 * cntsteps; mp.giveuptol = 15 + 10 * cntsteps;
mp.sloppy = 5; mp.sloppy = 5;
meshing.GenerateMesh (mesh3d, mp); meshing.GenerateMesh (mesh3d, mp);
for (ElementIndex ei = oldne; ei < mesh3d.GetNE(); ei++) for (ElementIndex ei = oldne; ei < mesh3d.GetNE(); ei++)
mesh3d[ei].SetIndex (k); mesh3d[ei].SetIndex (k);
mesh3d.CalcSurfacesOfNode(); mesh3d.CalcSurfacesOfNode();
mesh3d.FindOpenElements(k); mesh3d.FindOpenElements(k);
@ -288,17 +288,17 @@ namespace netgen
mesh3d.FindOpenElements(k); mesh3d.FindOpenElements(k);
} }
else else
{ {
meshed = 1; meshed = 1;
PrintMessage (1, "Success !"); PrintMessage (1, "Success !");
} }
} }
while (!meshed); while (!meshed);
PrintMessage (1, mesh3d.GetNP(), " points, ", PrintMessage (1, mesh3d.GetNP(), " points, ",
mesh3d.GetNE(), " elements"); mesh3d.GetNE(), " elements");
} }
mp.maxh = globmaxh; mp.maxh = globmaxh;
MeshQuality3d (mesh3d); MeshQuality3d (mesh3d);

View File

@ -105,8 +105,8 @@ namespace netgen
surfnr2(other.surfnr2), surfnr2(other.surfnr2),
epgeominfo(), epgeominfo(),
meshdocval(other.meshdocval), meshdocval(other.meshdocval),
hp_elnr(other.hp_elnr), is_curved(other.is_curved),
is_curved(other.is_curved) hp_elnr(other.hp_elnr)
{ {
for (int j = 0; j < 3; j++) for (int j = 0; j < 3; j++)
pnums[j] = other.pnums[j]; pnums[j] = other.pnums[j];

View File

@ -159,7 +159,7 @@ namespace netgen
else else
{ {
// quad // quad
int facenum; // int facenum;
INDEX_4 face4(el[elfaces[j][0]], el[elfaces[j][1]], INDEX_4 face4(el[elfaces[j][0]], el[elfaces[j][1]],
el[elfaces[j][2]], el[elfaces[j][3]]); el[elfaces[j][2]], el[elfaces[j][3]]);
@ -224,7 +224,7 @@ namespace netgen
{ // triangle { // triangle
int facenum; // int facenum;
int facedir; int facedir;
INDEX_4 face(el.PNum(elfaces[0][0]), INDEX_4 face(el.PNum(elfaces[0][0]),
@ -273,7 +273,7 @@ namespace netgen
{ {
// quad // quad
int facenum; // int facenum;
int facedir; int facedir;
INDEX_4 face4(el.PNum(elfaces[0][0]), INDEX_4 face4(el.PNum(elfaces[0][0]),
@ -1646,7 +1646,7 @@ namespace netgen
else else
{ {
// quad // quad
int facenum; // int facenum;
INDEX_4 face4(el[elfaces[j][0]], el[elfaces[j][1]], INDEX_4 face4(el[elfaces[j][0]], el[elfaces[j][1]],
el[elfaces[j][2]], el[elfaces[j][3]]); el[elfaces[j][2]], el[elfaces[j][3]]);
@ -1713,7 +1713,7 @@ namespace netgen
else else
{ {
// quad // quad
int facenum; // int facenum;
INDEX_4 face4(el[elfaces[j][0]], el[elfaces[j][1]], INDEX_4 face4(el[elfaces[j][0]], el[elfaces[j][1]],
el[elfaces[j][2]], el[elfaces[j][3]]); el[elfaces[j][2]], el[elfaces[j][3]]);

View File

@ -19,7 +19,7 @@ int chartdebug = 0;
void STLGeometry :: MakeAtlas(Mesh & mesh) void STLGeometry :: MakeAtlas(Mesh & mesh)
{ {
int timer1 = NgProfiler::CreateTimer ("makeatlas"); // int timer1 = NgProfiler::CreateTimer ("makeatlas");
/* /*
int timerb = NgProfiler::CreateTimer ("makeatlas - begin"); int timerb = NgProfiler::CreateTimer ("makeatlas - begin");
int timere = NgProfiler::CreateTimer ("makeatlas - end"); int timere = NgProfiler::CreateTimer ("makeatlas - end");