ForkMaster/netgenplugin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation after changes in SMESH headers

Browse Source 
+ Eliminate warnings
This commit is contained in:
eap 2016-06-29 16:10:15 +03:00
parent 14bbe7c9bf
commit a60d97e956
5 changed files with 127 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/NETGENPlugin/NETGENPlugin_Mesher.cxx
View File

@ -32,6 +32,7 @@
#include "NETGENPlugin_SimpleHypothesis_3D.hxx" #include "NETGENPlugin_SimpleHypothesis_3D.hxx"
#include <SMDS_FaceOfNodes.hxx> #include <SMDS_FaceOfNodes.hxx>
#include <SMDS_LinearEdge.hxx>
#include <SMDS_MeshElement.hxx> #include <SMDS_MeshElement.hxx>
#include <SMDS_MeshNode.hxx> #include <SMDS_MeshNode.hxx>
#include <SMESHDS_Mesh.hxx> #include <SMESHDS_Mesh.hxx>
@ -530,27 +531,27 @@ namespace
*/ */
//================================================================================ //================================================================================
void makeQuadratic( const TopTools_IndexedMapOfShape& shapes, // void makeQuadratic( const TopTools_IndexedMapOfShape& shapes,
SMESH_Mesh* mesh ) // SMESH_Mesh* mesh )
{ // {
for ( int i = 1; i <= shapes.Extent(); ++i ) // for ( int i = 1; i <= shapes.Extent(); ++i )
{ // {
SMESHDS_SubMesh* smDS = mesh->GetMeshDS()->MeshElements( shapes(i) ); // SMESHDS_SubMesh* smDS = mesh->GetMeshDS()->MeshElements( shapes(i) );
if ( !smDS ) continue; // if ( !smDS ) continue;
SMDS_ElemIteratorPtr elemIt = smDS->GetElements(); // SMDS_ElemIteratorPtr elemIt = smDS->GetElements();
if ( !elemIt->more() ) continue; // if ( !elemIt->more() ) continue;
const SMDS_MeshElement* e = elemIt->next(); // const SMDS_MeshElement* e = elemIt->next();
if ( !e || e->IsQuadratic() ) // if ( !e || e->IsQuadratic() )
continue; // continue;
TIDSortedElemSet elems; // TIDSortedElemSet elems;
elems.insert( e ); // elems.insert( e );
while ( elemIt->more() ) // while ( elemIt->more() )
elems.insert( elems.end(), elemIt->next() ); // elems.insert( elems.end(), elemIt->next() );
SMESH_MeshEditor( mesh ).ConvertToQuadratic( /*3d=*/false, elems, /*biQuad=*/false ); // SMESH_MeshEditor( mesh ).ConvertToQuadratic( /*3d=*/false, elems, /*biQuad=*/false );
} // }
} // }
} }
@ -2947,8 +2948,8 @@ bool NETGENPlugin_Mesher::Compute()
_ticTime = 0.98 / _progressTic; _ticTime = 0.98 / _progressTic;
int nbNod = _ngMesh->GetNP(); //int nbNod = _ngMesh->GetNP();
int nbSeg = _ngMesh->GetNSeg(); //int nbSeg = _ngMesh->GetNSeg();
int nbFac = _ngMesh->GetNSE(); int nbFac = _ngMesh->GetNSE();
int nbVol = _ngMesh->GetNE(); int nbVol = _ngMesh->GetNE();
bool isOK = ( !err && (_isVolume ? (nbVol > 0) : (nbFac > 0)) ); bool isOK = ( !err && (_isVolume ? (nbVol > 0) : (nbFac > 0)) );
@ -3435,7 +3436,7 @@ NETGENPlugin_Mesher::ReadErrors(const vector<const SMDS_MeshNode* >& nodeVec)
#ifdef _DEBUG_ #ifdef _DEBUG_
size_t nbBadElems = err->myBadElements.size(); size_t nbBadElems = err->myBadElements.size();
nbBadElems = 0; if ( nbBadElems ) nbBadElems++; // avoid warning: variable set but not used
#endif #endif
return err; return err;

69
src/NETGENPlugin/NETGENPlugin_NETGEN_2D_ONLY.cxx
View File

@ -184,41 +184,41 @@ bool NETGENPlugin_NETGEN_2D_ONLY::CheckHypothesis (SMESH_Mesh& aMesh,
return ( aStatus == HYP_OK ); return ( aStatus == HYP_OK );
} }
namespace // namespace
{ // {
void limitSize( netgen::Mesh* ngMesh, // 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 );
} // }
} // }
} // }
} // }
} // }
//============================================================================= //=============================================================================
/*! /*!
@ -569,11 +569,10 @@ bool NETGENPlugin_NETGEN_2D_ONLY::Compute(SMESH_Mesh& aMesh,
} }
if ( j > elem.GetNP() ) if ( j > elem.GetNP() )
{ {
SMDS_MeshFace* face = 0;
if ( elem.GetType() == TRIG ) if ( elem.GetType() == TRIG )
face = helper.AddFace(nodes[0],nodes[1],nodes[2]); helper.AddFace(nodes[0],nodes[1],nodes[2]);
else else
face = helper.AddFace(nodes[0],nodes[1],nodes[2],nodes[3]); helper.AddFace(nodes[0],nodes[1],nodes[2],nodes[3]);
} }
} }

130
src/NETGENPlugin/NETGENPlugin_NETGEN_3D.cxx
View File

@ -336,77 +336,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
{ // {
void limitVolumeSize( netgen::Mesh* ngMesh, // 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 );
} // }
} // }
} // }
} // }
} // }
//================================================================================ //================================================================================
/*! /*!

3
src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_2D.cxx
View File

@ -26,9 +26,10 @@
#include "NETGENPlugin_SimpleHypothesis_2D.hxx" #include "NETGENPlugin_SimpleHypothesis_2D.hxx"
#include "NETGENPlugin_Hypothesis.hxx" #include "NETGENPlugin_Hypothesis.hxx"
#include <SMESHDS_SubMesh.hxx>
#include <SMESH_ControlsDef.hxx>
#include <SMESH_Mesh.hxx> #include <SMESH_Mesh.hxx>
#include <SMESH_subMesh.hxx> #include <SMESH_subMesh.hxx>
#include <SMESH_ControlsDef.hxx>
#include <TopExp_Explorer.hxx> #include <TopExp_Explorer.hxx>

3
src/NETGENPlugin/NETGENPlugin_SimpleHypothesis_3D.cxx
View File

@ -26,6 +26,9 @@
#include "NETGENPlugin_SimpleHypothesis_3D.hxx" #include "NETGENPlugin_SimpleHypothesis_3D.hxx"
#include "NETGENPlugin_Hypothesis.hxx" #include "NETGENPlugin_Hypothesis.hxx"
#include <SMDS_Mesh.hxx>
#include <SMESHDS_Mesh.hxx>
#include <SMESHDS_SubMesh.hxx>
#include <SMESH_ControlsDef.hxx> #include <SMESH_ControlsDef.hxx>
#include <SMESH_Mesh.hxx> #include <SMESH_Mesh.hxx>
#include <SMESH_subMesh.hxx> #include <SMESH_subMesh.hxx>