suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

comment out unused global functions, fix -Wconstant-logical-operand

Browse Source
This commit is contained in:
wmayer 2016-12-30 14:38:49 +01:00
parent efe14610b7
commit e770b0c146
4 changed files with 100 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp vendored
View File

@ -890,7 +890,7 @@ bool NETGENPlugin_Mesher::FillNgMesh(netgen::OCCGeometry& occgeom,
#endif #endif
if ( isSeam ) if ( isSeam )
{ {
if ( helper.GetPeriodicIndex() && 1 ) { if ( helper.GetPeriodicIndex() & 1 ) {
seg.epgeominfo[ 0 ].u = otherSeamParam; seg.epgeominfo[ 0 ].u = otherSeamParam;
seg.epgeominfo[ 1 ].u = otherSeamParam; seg.epgeominfo[ 1 ].u = otherSeamParam;
swap (seg.epgeominfo[0].v, seg.epgeominfo[1].v); swap (seg.epgeominfo[0].v, seg.epgeominfo[1].v);
@ -906,7 +906,7 @@ bool NETGENPlugin_Mesher::FillNgMesh(netgen::OCCGeometry& occgeom,
#ifdef DUMP_SEGMENTS #ifdef DUMP_SEGMENTS
cout << "Segment: " << seg.edgenr << endl cout << "Segment: " << seg.edgenr << endl
<< "\t is SEAM (reverse) of the previous. " << "\t is SEAM (reverse) of the previous. "
<< " Other " << (helper.GetPeriodicIndex() && 1 ? "U" : "V") << " Other " << (helper.GetPeriodicIndex() & 1 ? "U" : "V")
<< " = " << otherSeamParam << endl; << " = " << otherSeamParam << endl;
#endif #endif
} }

64
src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp vendored
View File

@ -191,41 +191,41 @@ bool NETGENPlugin_NETGEN_2D_ONLY::CheckHypothesis (SMESH_Mesh& aMesh,
return ( aStatus == HYP_OK ); return ( aStatus == HYP_OK );
} }
namespace //namespace
{ //{
inline void limitSize( netgen::Mesh* ngMesh, // inline void limitSize( netgen::Mesh* ngMesh,
const double maxh ) // const double maxh )
{ // {
// get bnd box // // get bnd box
netgen::Point3d pmin, pmax; // netgen::Point3d pmin, pmax;
ngMesh->GetBox( pmin, pmax, 0 ); // ngMesh->GetBox( pmin, pmax, 0 );
const double dx = pmax.X() - pmin.X(); // const double dx = pmax.X() - pmin.X();
const double dy = pmax.Y() - pmin.Y(); // const double dy = pmax.Y() - pmin.Y();
const double dz = pmax.Z() - pmin.Z(); // const double dz = pmax.Z() - pmin.Z();
const int nbX = Max( 2, int( dx / maxh * 3 )); // const int nbX = Max( 2, int( dx / maxh * 3 ));
const int nbY = Max( 2, int( dy / maxh * 3 )); // const int nbY = Max( 2, int( dy / maxh * 3 ));
const int nbZ = Max( 2, int( dz / maxh * 3 )); // const int nbZ = Max( 2, int( dz / maxh * 3 ));
if ( ! & ngMesh->LocalHFunction() ) // if ( ! & ngMesh->LocalHFunction() )
ngMesh->SetLocalH( pmin, pmax, 0.1 ); // ngMesh->SetLocalH( pmin, pmax, 0.1 );
netgen::Point3d p; // netgen::Point3d p;
for ( int i = 0; i <= nbX; ++i ) // for ( int i = 0; i <= nbX; ++i )
{ // {
p.X() = pmin.X() + i * dx / nbX; // p.X() = pmin.X() + i * dx / nbX;
for ( int j = 0; j <= nbY; ++j ) // for ( int j = 0; j <= nbY; ++j )
{ // {
p.Y() = pmin.Y() + j * dy / nbY; // p.Y() = pmin.Y() + j * dy / nbY;
for ( int k = 0; k <= nbZ; ++k ) // for ( int k = 0; k <= nbZ; ++k )
{ // {
p.Z() = pmin.Z() + k * dz / nbZ; // p.Z() = pmin.Z() + k * dz / nbZ;
ngMesh->RestrictLocalH( p, maxh ); // ngMesh->RestrictLocalH( p, maxh );
} // }
} // }
} // }
} // }
} //}
//============================================================================= //=============================================================================
/*! /*!

130
src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cpp vendored
View File

@ -348,77 +348,77 @@ bool NETGENPlugin_NETGEN_3D::Compute(SMESH_Mesh& aMesh,
return ( ngLib._isComputeOk = compute( aMesh, helper, nodeVec, Netgen_mesh)); return ( ngLib._isComputeOk = compute( aMesh, helper, nodeVec, Netgen_mesh));
} }
namespace //namespace
{ //{
inline void limitVolumeSize( netgen::Mesh* ngMesh, // inline void limitVolumeSize( netgen::Mesh* ngMesh,
double maxh ) // double maxh )
{ // {
// get average h of faces // // get average h of faces
double faceh = 0; // double faceh = 0;
int nbh = 0; // int nbh = 0;
for (int i = 1; i <= ngMesh->GetNSE(); i++) // for (int i = 1; i <= ngMesh->GetNSE(); i++)
{ // {
const netgen::Element2d& face = ngMesh->SurfaceElement(i); // const netgen::Element2d& face = ngMesh->SurfaceElement(i);
for (int j=1; j <= face.GetNP(); ++j) // for (int j=1; j <= face.GetNP(); ++j)
{ // {
const netgen::PointIndex & i1 = face.PNumMod(j); // const netgen::PointIndex & i1 = face.PNumMod(j);
const netgen::PointIndex & i2 = face.PNumMod(j+1); // const netgen::PointIndex & i2 = face.PNumMod(j+1);
if ( i1 < i2 ) // if ( i1 < i2 )
{ // {
const netgen::Point3d & p1 = ngMesh->Point( i1 ); // const netgen::Point3d & p1 = ngMesh->Point( i1 );
const netgen::Point3d & p2 = ngMesh->Point( i2 ); // const netgen::Point3d & p2 = ngMesh->Point( i2 );
faceh += netgen::Dist2( p1, p2 ); // faceh += netgen::Dist2( p1, p2 );
nbh++; // nbh++;
} // }
} // }
} // }
faceh = Sqrt( faceh / nbh ); // faceh = Sqrt( faceh / nbh );
double compareh; // double compareh;
if ( faceh < 0.5 * maxh ) compareh = -1; // if ( faceh < 0.5 * maxh ) compareh = -1;
else if ( faceh > 1.5 * maxh ) compareh = 1; // else if ( faceh > 1.5 * maxh ) compareh = 1;
else compareh = 0; // else compareh = 0;
// cerr << "faceh " << faceh << endl; // // cerr << "faceh " << faceh << endl;
// cerr << "init maxh " << maxh << endl; // // cerr << "init maxh " << maxh << endl;
// cerr << "compareh " << compareh << endl; // // cerr << "compareh " << compareh << endl;
if ( compareh > 0 ) // if ( compareh > 0 )
maxh *= 1.2; // maxh *= 1.2;
else // else
maxh *= 0.8; // maxh *= 0.8;
// cerr << "maxh " << maxh << endl; // // cerr << "maxh " << maxh << endl;
// get bnd box // // get bnd box
netgen::Point3d pmin, pmax; // netgen::Point3d pmin, pmax;
ngMesh->GetBox( pmin, pmax, 0 ); // ngMesh->GetBox( pmin, pmax, 0 );
const double dx = pmax.X() - pmin.X(); // const double dx = pmax.X() - pmin.X();
const double dy = pmax.Y() - pmin.Y(); // const double dy = pmax.Y() - pmin.Y();
const double dz = pmax.Z() - pmin.Z(); // const double dz = pmax.Z() - pmin.Z();
if ( ! & ngMesh->LocalHFunction() ) // if ( ! & ngMesh->LocalHFunction() )
ngMesh->SetLocalH( pmin, pmax, compareh <= 0 ? 0.1 : 0.5 ); // ngMesh->SetLocalH( pmin, pmax, compareh <= 0 ? 0.1 : 0.5 );
// adjusted by SALOME_TESTS/Grids/smesh/bugs_08/I8 // // adjusted by SALOME_TESTS/Grids/smesh/bugs_08/I8
const int nbX = Max( 2, int( dx / maxh * 2 )); // const int nbX = Max( 2, int( dx / maxh * 2 ));
const int nbY = Max( 2, int( dy / maxh * 2 )); // const int nbY = Max( 2, int( dy / maxh * 2 ));
const int nbZ = Max( 2, int( dz / maxh * 2 )); // const int nbZ = Max( 2, int( dz / maxh * 2 ));
netgen::Point3d p; // netgen::Point3d p;
for ( int i = 0; i <= nbX; ++i ) // for ( int i = 0; i <= nbX; ++i )
{ // {
p.X() = pmin.X() + i * dx / nbX; // p.X() = pmin.X() + i * dx / nbX;
for ( int j = 0; j <= nbY; ++j ) // for ( int j = 0; j <= nbY; ++j )
{ // {
p.Y() = pmin.Y() + j * dy / nbY; // p.Y() = pmin.Y() + j * dy / nbY;
for ( int k = 0; k <= nbZ; ++k ) // for ( int k = 0; k <= nbZ; ++k )
{ // {
p.Z() = pmin.Z() + k * dz / nbZ; // p.Z() = pmin.Z() + k * dz / nbZ;
ngMesh->RestrictLocalH( p, maxh ); // ngMesh->RestrictLocalH( p, maxh );
} // }
} // }
} // }
} // }
} //}
//================================================================================ //================================================================================
/*! /*!

1
src/Gui/WidgetFactory.cpp
View File

@ -44,6 +44,7 @@
#if defined(__clang__) #if defined(__clang__)
# pragma clang diagnostic push # pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wmismatched-tags" # pragma clang diagnostic ignored "-Wmismatched-tags"
# pragma clang diagnostic ignored "-Wunused-parameter"
#elif defined (__GNUC__) #elif defined (__GNUC__)
# pragma GCC diagnostic push # pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wunused-parameter" # pragma GCC diagnostic ignored "-Wunused-parameter"