ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-11-12 00:59:16 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix_warnings_intel' into 'master'

Browse Source 
Fix warnings (Intel compiler)

See merge request !37
This commit is contained in:
Joachim Schöberl 2017-03-23 16:35:11 +01:00
commit dceed125d8
1 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
libsrc/meshing/meshing3.cpp
View File

@ -109,7 +109,7 @@ static double CalcLocH (const Array<Point3d> & locpoints,
sum = 0;
weight = 0;
for (i = 1; i <= locfaces.Size(); i++)
for(int i = 1; i <= locfaces.Size(); i++)
{
pc.X() = pc.Y() = pc.Z() = 0;
for (j = 1; j <= 3; j++)
@ -187,7 +187,7 @@ GenerateMesh (Mesh & mesh, const MeshingParameters & mp)
Array<int> delpoints, delfaces; // points and lines to be deleted
Array<Element> locelements; // new generated elements
int i, j, oldnp, oldnf;
int j, oldnp, oldnf;
int found;
referencetransform trans;
int rotind;
@ -344,7 +344,7 @@ GenerateMesh (Mesh & mesh, const MeshingParameters & mp)
allowpoint.SetSize(locpoints.Size());
if (uselocalh && stat.qualclass <= 3)
for (i = 1; i <= allowpoint.Size(); i++)
for(int i = 1; i <= allowpoint.Size(); i++)
{
allowpoint.Elem(i) =
(mesh.GetH (locpoints.Get(i)) > 0.4 * hshould / mp.sloppy) ? 2 : 1;
@ -378,10 +378,10 @@ GenerateMesh (Mesh & mesh, const MeshingParameters & mp)
{
(*testout) << "inner point found" << endl;
for (i = 1; i <= groupfaces.Size(); i++)
for(int i = 1; i <= groupfaces.Size(); i++)
adfront -> DeleteFace (groupfindex.Get(i));
for (i = 1; i <= groupfaces.Size(); i++)
for(int i = 1; i <= groupfaces.Size(); i++)
for (j = 1; j <= locfaces.Size(); j++)
if (findex.Get(j) == groupfindex.Get(i))
delfaces.Append (j);
@ -396,7 +396,7 @@ GenerateMesh (Mesh & mesh, const MeshingParameters & mp)
newel.SetNP(4);
newel.PNum(4) = npi;
for (i = 1; i <= groupfaces.Size(); i++)
for(int i = 1; i <= groupfaces.Size(); i++)
{
for (j = 1; j <= 3; j++)
{
@ -417,14 +417,14 @@ GenerateMesh (Mesh & mesh, const MeshingParameters & mp)
// int optother = 0;
/*
for (i = 1; i <= locfaces.Size(); i++)
for(int i = 1; i <= locfaces.Size(); i++)
{
(*testout) << "Face " << i << ": ";
for (j = 1; j <= locfaces.Get(i).GetNP(); j++)
(*testout) << pindex.Get(locfaces.Get(i).PNum(j)) << " ";
(*testout) << endl;
}
for (i = 1; i <= locpoints.Size(); i++)
for(int i = 1; i <= locpoints.Size(); i++)
{
(*testout) << "p" << i
<< ", gi = " << pindex.Get(i)
@ -470,7 +470,7 @@ GenerateMesh (Mesh & mesh, const MeshingParameters & mp)
if (stat.cnttrials % 100 == 0)
{
(*testout) << "\n";
for (i = 1; i <= canuse.Size(); i++)
for(int i = 1; i <= canuse.Size(); i++)
{
(*testout) << foundmap.Get(i) << "/"
<< canuse.Get(i) << "/"
@ -565,7 +565,7 @@ GenerateMesh (Mesh & mesh, const MeshingParameters & mp)
if (testmode)
{
(*testout) << "found is active, 3" << endl;
for (i = 1; i <= plainpoints.Size(); i++)
for(int i = 1; i <= plainpoints.Size(); i++)
{
(*testout) << "p";
if (i <= pindex.Size())
@ -582,19 +582,19 @@ GenerateMesh (Mesh & mesh, const MeshingParameters & mp)
minerr = err;
tempnewpoints.SetSize (0);
for (i = oldnp+1; i <= locpoints.Size(); i++)
for(int i = oldnp+1; i <= locpoints.Size(); i++)
tempnewpoints.Append (locpoints.Get(i));
tempnewfaces.SetSize (0);
for (i = oldnf+1; i <= locfaces.Size(); i++)
for(int i = oldnf+1; i <= locfaces.Size(); i++)
tempnewfaces.Append (locfaces.Get(i));
tempdelfaces.SetSize (0);
for (i = 1; i <= delfaces.Size(); i++)
for(int i = 1; i <= delfaces.Size(); i++)
tempdelfaces.Append (delfaces.Get(i));
templocelements.SetSize (0);
for (i = 1; i <= locelements.Size(); i++)
for(int i = 1; i <= locelements.Size(); i++)
templocelements.Append (locelements.Get(i));
/*
@ -624,20 +624,20 @@ GenerateMesh (Mesh & mesh, const MeshingParameters & mp)
}
*/
for (i = 1; i <= tempnewpoints.Size(); i++)
for(int i = 1; i <= tempnewpoints.Size(); i++)
locpoints.Append (tempnewpoints.Get(i));
for (i = 1; i <= tempnewfaces.Size(); i++)
for(int i = 1; i <= tempnewfaces.Size(); i++)
locfaces.Append (tempnewfaces.Get(i));
for (i = 1; i <= tempdelfaces.Size(); i++)
for(int i = 1; i <= tempdelfaces.Size(); i++)
delfaces.Append (tempdelfaces.Get(i));
for (i = 1; i <= templocelements.Size(); i++)
for(int i = 1; i <= templocelements.Size(); i++)
locelements.Append (templocelements.Get(i));
if (loktestmode)
{
(*testout) << "apply rule" << endl;
for (i = 1; i <= locpoints.Size(); i++)
for(int i = 1; i <= locpoints.Size(); i++)
{
(*testout) << "p";
if (i <= pindex.Size())
@ -676,7 +676,7 @@ GenerateMesh (Mesh & mesh, const MeshingParameters & mp)
stat.cntelem++;
}
for (i = oldnf+1; i <= locfaces.Size(); i++)
for(int i = oldnf+1; i <= locfaces.Size(); i++)
{
for (j = 1; j <= locfaces.Get(i).GetNP(); j++)
locfaces.Elem(i).PNum(j) =
@ -685,7 +685,7 @@ GenerateMesh (Mesh & mesh, const MeshingParameters & mp)
adfront->AddFace (locfaces.Get(i));
}
for (i = 1; i <= delfaces.Size(); i++)
for(int i = 1; i <= delfaces.Size(); i++)
adfront->DeleteFace (findex.Get(delfaces.Get(i)));
}
else
@ -709,7 +709,7 @@ GenerateMesh (Mesh & mesh, const MeshingParameters & mp)
PrintMessage (5, ""); // line feed after statistics
for (i = 1; i <= ruleused.Size(); i++)
for(int i = 1; i <= ruleused.Size(); i++)
(*testout) << setw(4) << ruleused.Get(i)
<< " times used rule " << rules.Get(i) -> Name() << endl;
@ -742,7 +742,7 @@ void Meshing3 :: BlockFill (Mesh & mesh, double gh)
double xminb, xmaxb, yminb, ymaxb, zminb, zmaxb;
//double rad = 0.7 * gh;
for (i = 1; i <= adfront->GetNP(); i++)
for(int i = 1; i <= adfront->GetNP(); i++)
{
const Point3d & p = adfront->GetPoint(PointIndex(i));
if (i == 1)
@ -780,13 +780,13 @@ void Meshing3 :: BlockFill (Mesh & mesh, double gh)
// initialize inner to 1
for (i = 1; i <= n; i++)
for(int i = 1; i <= n; i++)
inner.Elem(i) = BLOCKUNDEF;
// set blocks cutting surfaces to 0
for (i = 1; i <= adfront->GetNF(); i++)
for(int i = 1; i <= adfront->GetNF(); i++)
{
const MiniElement2d & el = adfront->GetFace(i);
xminb = xmax; xmaxb = xmin;
@ -916,14 +916,14 @@ void Meshing3 :: BlockFill (Mesh & mesh, double gh)
filled = 0;
for (i = 1; i <= n; i++)
for(int i = 1; i <= n; i++)
if (inner.Elem(i) == BLOCKINNER)
{
filled++;
}
PrintMessage (5, "Filled blocks: ", filled);
for (i = 1; i <= n; i++)
for(int i = 1; i <= n; i++)
{
pointnr.Elem(i) = 0;
frontpointnr.Elem(i) = 0;