Skip to content

Commit

Permalink
comment out unused global functions, fix -Wconstant-logical-operand
Browse files Browse the repository at this point in the history
  • Loading branch information
@wwmayer
wwmayer committed Dec 30, 2016
1 parent efe1461 commit e770b0c
Show file tree
Hide file tree
Showing 4 changed files with 109 additions and 108 deletions.
4 changes: 2 additions & 2 deletions src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_Mesher.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -890,7 +890,7 @@ bool NETGENPlugin_Mesher::FillNgMesh(netgen::OCCGeometry& occgeom,
#endif
if ( isSeam )
{
if ( helper.GetPeriodicIndex() && 1 ) {
if ( helper.GetPeriodicIndex() & 1 ) {
seg.epgeominfo[ 0 ].u = otherSeamParam;
seg.epgeominfo[ 1 ].u = otherSeamParam;
swap (seg.epgeominfo[0].v, seg.epgeominfo[1].v);
Expand All @@ -906,7 +906,7 @@ bool NETGENPlugin_Mesher::FillNgMesh(netgen::OCCGeometry& occgeom,
#ifdef DUMP_SEGMENTS
cout << "Segment: " << seg.edgenr << endl
<< "\t is SEAM (reverse) of the previous. "
<< " Other " << (helper.GetPeriodicIndex() && 1 ? "U" : "V")
<< " Other " << (helper.GetPeriodicIndex() & 1 ? "U" : "V")
<< " = " << otherSeamParam << endl;
#endif
}
Expand Down
70 changes: 35 additions & 35 deletions src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,41 +191,41 @@ bool NETGENPlugin_NETGEN_2D_ONLY::CheckHypothesis (SMESH_Mesh& aMesh,
return ( aStatus == HYP_OK );
}

namespace
{
inline void limitSize( netgen::Mesh* ngMesh,
const double maxh )
{
// get bnd box
netgen::Point3d pmin, pmax;
ngMesh->GetBox( pmin, pmax, 0 );
const double dx = pmax.X() - pmin.X();
const double dy = pmax.Y() - pmin.Y();
const double dz = pmax.Z() - pmin.Z();

const int nbX = Max( 2, int( dx / maxh * 3 ));
const int nbY = Max( 2, int( dy / maxh * 3 ));
const int nbZ = Max( 2, int( dz / maxh * 3 ));

if ( ! & ngMesh->LocalHFunction() )
ngMesh->SetLocalH( pmin, pmax, 0.1 );

netgen::Point3d p;
for ( int i = 0; i <= nbX; ++i )
{
p.X() = pmin.X() + i * dx / nbX;
for ( int j = 0; j <= nbY; ++j )
{
p.Y() = pmin.Y() + j * dy / nbY;
for ( int k = 0; k <= nbZ; ++k )
{
p.Z() = pmin.Z() + k * dz / nbZ;
ngMesh->RestrictLocalH( p, maxh );
}
}
}
}
}
//namespace
//{
// inline void limitSize( netgen::Mesh* ngMesh,
// const double maxh )
// {
// // get bnd box
// netgen::Point3d pmin, pmax;
// ngMesh->GetBox( pmin, pmax, 0 );
// const double dx = pmax.X() - pmin.X();
// const double dy = pmax.Y() - pmin.Y();
// const double dz = pmax.Z() - pmin.Z();

// const int nbX = Max( 2, int( dx / maxh * 3 ));
// const int nbY = Max( 2, int( dy / maxh * 3 ));
// const int nbZ = Max( 2, int( dz / maxh * 3 ));

// if ( ! & ngMesh->LocalHFunction() )
// ngMesh->SetLocalH( pmin, pmax, 0.1 );

// netgen::Point3d p;
// for ( int i = 0; i <= nbX; ++i )
// {
// p.X() = pmin.X() + i * dx / nbX;
// for ( int j = 0; j <= nbY; ++j )
// {
// p.Y() = pmin.Y() + j * dy / nbY;
// for ( int k = 0; k <= nbZ; ++k )
// {
// p.Z() = pmin.Z() + k * dz / nbZ;
// ngMesh->RestrictLocalH( p, maxh );
// }
// }
// }
// }
//}

//=============================================================================
/*!
Expand Down
142 changes: 71 additions & 71 deletions src/3rdParty/salomesmesh/src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -348,77 +348,77 @@ bool NETGENPlugin_NETGEN_3D::Compute(SMESH_Mesh& aMesh,
return ( ngLib._isComputeOk = compute( aMesh, helper, nodeVec, Netgen_mesh));
}

namespace
{
inline void limitVolumeSize( netgen::Mesh* ngMesh,
double maxh )
{
// get average h of faces
double faceh = 0;
int nbh = 0;
for (int i = 1; i <= ngMesh->GetNSE(); i++)
{
const netgen::Element2d& face = ngMesh->SurfaceElement(i);
for (int j=1; j <= face.GetNP(); ++j)
{
const netgen::PointIndex & i1 = face.PNumMod(j);
const netgen::PointIndex & i2 = face.PNumMod(j+1);
if ( i1 < i2 )
{
const netgen::Point3d & p1 = ngMesh->Point( i1 );
const netgen::Point3d & p2 = ngMesh->Point( i2 );
faceh += netgen::Dist2( p1, p2 );
nbh++;
}
}
}
faceh = Sqrt( faceh / nbh );

double compareh;
if ( faceh < 0.5 * maxh ) compareh = -1;
else if ( faceh > 1.5 * maxh ) compareh = 1;
else compareh = 0;
// cerr << "faceh " << faceh << endl;
// cerr << "init maxh " << maxh << endl;
// cerr << "compareh " << compareh << endl;

if ( compareh > 0 )
maxh *= 1.2;
else
maxh *= 0.8;
// cerr << "maxh " << maxh << endl;

// get bnd box
netgen::Point3d pmin, pmax;
ngMesh->GetBox( pmin, pmax, 0 );
const double dx = pmax.X() - pmin.X();
const double dy = pmax.Y() - pmin.Y();
const double dz = pmax.Z() - pmin.Z();

if ( ! & ngMesh->LocalHFunction() )
ngMesh->SetLocalH( pmin, pmax, compareh <= 0 ? 0.1 : 0.5 );

// adjusted by SALOME_TESTS/Grids/smesh/bugs_08/I8
const int nbX = Max( 2, int( dx / maxh * 2 ));
const int nbY = Max( 2, int( dy / maxh * 2 ));
const int nbZ = Max( 2, int( dz / maxh * 2 ));

netgen::Point3d p;
for ( int i = 0; i <= nbX; ++i )
{
p.X() = pmin.X() + i * dx / nbX;
for ( int j = 0; j <= nbY; ++j )
{
p.Y() = pmin.Y() + j * dy / nbY;
for ( int k = 0; k <= nbZ; ++k )
{
p.Z() = pmin.Z() + k * dz / nbZ;
ngMesh->RestrictLocalH( p, maxh );
}
}
}
}
}
//namespace
//{
// inline void limitVolumeSize( netgen::Mesh* ngMesh,
// double maxh )
// {
// // get average h of faces
// double faceh = 0;
// int nbh = 0;
// for (int i = 1; i <= ngMesh->GetNSE(); i++)
// {
// const netgen::Element2d& face = ngMesh->SurfaceElement(i);
// for (int j=1; j <= face.GetNP(); ++j)
// {
// const netgen::PointIndex & i1 = face.PNumMod(j);
// const netgen::PointIndex & i2 = face.PNumMod(j+1);
// if ( i1 < i2 )
// {
// const netgen::Point3d & p1 = ngMesh->Point( i1 );
// const netgen::Point3d & p2 = ngMesh->Point( i2 );
// faceh += netgen::Dist2( p1, p2 );
// nbh++;
// }
// }
// }
// faceh = Sqrt( faceh / nbh );

// double compareh;
// if ( faceh < 0.5 * maxh ) compareh = -1;
// else if ( faceh > 1.5 * maxh ) compareh = 1;
// else compareh = 0;
// // cerr << "faceh " << faceh << endl;
// // cerr << "init maxh " << maxh << endl;
// // cerr << "compareh " << compareh << endl;

// if ( compareh > 0 )
// maxh *= 1.2;
// else
// maxh *= 0.8;
// // cerr << "maxh " << maxh << endl;

// // get bnd box
// netgen::Point3d pmin, pmax;
// ngMesh->GetBox( pmin, pmax, 0 );
// const double dx = pmax.X() - pmin.X();
// const double dy = pmax.Y() - pmin.Y();
// const double dz = pmax.Z() - pmin.Z();

// if ( ! & ngMesh->LocalHFunction() )
// ngMesh->SetLocalH( pmin, pmax, compareh <= 0 ? 0.1 : 0.5 );

// // adjusted by SALOME_TESTS/Grids/smesh/bugs_08/I8
// const int nbX = Max( 2, int( dx / maxh * 2 ));
// const int nbY = Max( 2, int( dy / maxh * 2 ));
// const int nbZ = Max( 2, int( dz / maxh * 2 ));

// netgen::Point3d p;
// for ( int i = 0; i <= nbX; ++i )
// {
// p.X() = pmin.X() + i * dx / nbX;
// for ( int j = 0; j <= nbY; ++j )
// {
// p.Y() = pmin.Y() + j * dy / nbY;
// for ( int k = 0; k <= nbZ; ++k )
// {
// p.Z() = pmin.Z() + k * dz / nbZ;
// ngMesh->RestrictLocalH( p, maxh );
// }
// }
// }
// }
//}

//================================================================================
/*!
Expand Down
1 change: 1 addition & 0 deletions src/Gui/WidgetFactory.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
#if defined(__clang__)
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wmismatched-tags"
# pragma clang diagnostic ignored "-Wunused-parameter"
#elif defined (__GNUC__)
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wunused-parameter"
Expand Down

0 comments on commit e770b0c

Please sign in to comment.