reduce warnings

This commit is contained in:
Joachim Schoeberl 2009-06-14 10:49:08 +00:00
parent 7a6e3f64c1
commit 1fd07f3845
3 changed files with 21 additions and 16 deletions

View File

@ -54,7 +54,7 @@ AC_ARG_ENABLE([nglib],
AC_ARG_ENABLE([parallel], AC_ARG_ENABLE([parallel],
[ --enable-parallel enable mpi parallelization], [ --enable-parallel enable mpi parallelization],
[AC_SUBST([MPI_INCLUDES], "-I/opt/mpich/include -DPARALLEL -I/usr/share/metis/Lib -DMETIS") [AC_SUBST([MPI_INCLUDES], "-I/opt/mpich/include -DPARALLEL -I/usr/share/metis/Lib -DMETIS")
AC_SUBST([MPI_LIBS], "-lmetis -L/opt/mpich/ch-p4/lib -lmpich") AC_SUBST([MPI_LIBS], "-lmetis -L/opt/mpich/ch-p4/lib -lmpich")
] ]
) )

View File

@ -544,19 +544,21 @@ HPREF_ELEMENT_TYPE ClassifyPrism(HPRefElement & el, INDEX_2_HASHTABLE<int> & edg
break; break;
case 1: case 1:
if(sve[0] <= 1 && sve[1] <= 1) if(sve[0] <= 1 && sve[1] <= 1)
if(sve[2]==0) {
{ if(sve[2]==0)
types[0] = HP_PRISM_1FB_0E_0V; {
types[1] = HP_PRISM_1FA_1FB_0E_0V; types[0] = HP_PRISM_1FB_0E_0V;
types[2] = HP_PRISM_2FA_1FB_0E_0V; types[1] = HP_PRISM_1FA_1FB_0E_0V;
} types[2] = HP_PRISM_2FA_1FB_0E_0V;
else }
{ else
types[0] = HP_PRISM_1FB_1EC_0V; {
types[1] = HP_PRISM_1FA_1FB_1EC_0V; types[0] = HP_PRISM_1FB_1EC_0V;
types[2] = HP_PRISM_2FA_1FB_1EC_0V; types[1] = HP_PRISM_1FA_1FB_1EC_0V;
} types[2] = HP_PRISM_2FA_1FB_1EC_0V;
}
}
if(sve[0] > 1 && sve[2] >= 1 && sve[1] <= 1) if(sve[0] > 1 && sve[2] >= 1 && sve[1] <= 1)
{ {
types[0] = HP_PRISM_1FB_2EB_0V; types[0] = HP_PRISM_1FB_2EB_0V;

View File

@ -162,6 +162,8 @@ Ng_GetSurfaceElement (Ng_Mesh * mesh, int num, int * pi)
case 3: et = NG_TRIG; break; case 3: et = NG_TRIG; break;
case 4: et = NG_QUAD; break; case 4: et = NG_QUAD; break;
case 6: et = NG_TRIG6; break; case 6: et = NG_TRIG6; break;
default:
et = NG_TRIG; break; // for the compiler
} }
return et; return et;
} }
@ -179,6 +181,8 @@ Ng_GetVolumeElement (Ng_Mesh * mesh, int num, int * pi)
case 5: et = NG_PYRAMID; break; case 5: et = NG_PYRAMID; break;
case 6: et = NG_PRISM; break; case 6: et = NG_PRISM; break;
case 10: et = NG_TET10; break; case 10: et = NG_TET10; break;
default:
et = NG_TET; break; // for the compiler
} }
return et; return et;
} }
@ -428,9 +432,8 @@ DLL_HEADER Ng_Result Ng_STL_InitSTLGeometry (Ng_STL_Geometry * geom)
if (readedges.Size() != 0) if (readedges.Size() != 0)
{ {
int i;
/* /*
for (i = 1; i <= readedges.Size(); i+=2) for (int i = 1; i <= readedges.Size(); i+=2)
{ {
cout << "e(" << readedges.Get(i) << "," << readedges.Get(i+1) << ")" << endl; cout << "e(" << readedges.Get(i) << "," << readedges.Get(i+1) << ")" << endl;
} }