X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHEXABLOCKPlugin%2FHEXABLOCKPlugin_FromSkin_3D.cxx;h=2814f2ca517e4d65a3ef3522ab0d5e9879052605;hb=1a8bde22be2ffdd748b725809f3f4672dc85386c;hp=1dc0e31dc90052c99486750b9b920c1a88df4cba;hpb=baafd500e618bc3f10c03ff03b103cec933c90d6;p=plugins%2Fhexablockplugin.git diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.cxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.cxx old mode 100755 new mode 100644 index 1dc0e31..2814f2c --- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.cxx +++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.cxx @@ -1,9 +1,9 @@ -// Copyright (C) 2009-2011 CEA/DEN, EDF R&D +// Copyright (C) 2009-2021 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either -// version 2.1 of the License. +// version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -27,6 +27,8 @@ #include "SMDS_VolumeTool.hxx" #include "SMESH_Block.hxx" #include "SMESH_MesherHelper.hxx" +#include "SMESH_MeshEditor.hxx" +#include "SMESH_MeshAlgos.hxx" #include @@ -53,7 +55,7 @@ #ifdef _DEBUG_ -static int MYDEBUG = 1; +static int MYDEBUG = HEXA_NS::on_debug (); #else static int MYDEBUG = 0; #endif @@ -112,7 +114,7 @@ namespace if ( nbF % 2 ) return true; - set nodesInInverseFaces; + std::set nodesInInverseFaces; SMDS_ElemIteratorPtr fIt = n->GetInverseElementIterator(SMDSAbs_Face ); while ( fIt->more() ) { @@ -212,7 +214,7 @@ namespace */ struct _BlockSide { - vector _grid; + std::vector _grid; _Indexer _index; int _nbBlocksExpected; int _nbBlocksFound; @@ -305,7 +307,7 @@ namespace struct _Block { _OrientedBlockSide _side[6]; // 6 sides of a sub-block - set _corners; + std::set _corners; const _OrientedBlockSide& getSide(int i) const { return _side[i]; } bool setSide( int i, const _OrientedBlockSide& s) @@ -349,14 +351,14 @@ namespace bool fillRowsUntilCorner(const SMDS_MeshElement* quad, const SMDS_MeshNode* n1, const SMDS_MeshNode* n2, - vector& verRow1, - vector& verRow2, + std::vector& verRow1, + std::vector& verRow2, bool alongN1N2 ); _OrientedBlockSide findBlockSide( EBoxSides startBlockSide, EQuadEdge sharedSideEdge1, EQuadEdge sharedSideEdge2, bool withGeometricAnalysis, - set< _BlockSide* >& sidesAround); + std::set< _BlockSide* >& sidesAround); //!< update own data and data of the side bound to block void setSideBoundToBlock( _BlockSide& side ) { @@ -369,11 +371,11 @@ namespace SMESH_Comment _error; - list< _BlockSide > _allSides; - vector< _Block > _blocks; + std::list< _BlockSide > _allSides; + std::vector< _Block > _blocks; //map< const SMDS_MeshNode*, set< _BlockSide* > > _corner2sides; - map< SMESH_OrientedLink, set< _BlockSide* > > _edge2sides; + std::map< SMESH_OrientedLink, std::set< _BlockSide* > > _edge2sides; }; //================================================================================ @@ -388,7 +390,7 @@ namespace // Find a node at any block corner - SMDS_NodeIteratorPtr nIt = meshDS->nodesIterator(/*idInceasingOrder=*/true); + SMDS_NodeIteratorPtr nIt = meshDS->nodesIterator(); if ( !nIt->more() ) return error("Empty mesh"); const SMDS_MeshNode* nCorner = 0; @@ -407,10 +409,10 @@ namespace // Find all block sides starting from mesh faces sharing the corner node // -------------------------------------------------------------------- - int nbFacesOnSides = 0; + smIdType nbFacesOnSides = 0; TIDSortedElemSet cornerFaces; // corner faces of found _BlockSide's - list< const SMDS_MeshNode* > corners( 1, nCorner ); - list< const SMDS_MeshNode* >::iterator corner = corners.begin(); + std::list< const SMDS_MeshNode* > corners( 1, nCorner ); + std::list< const SMDS_MeshNode* >::iterator corner = corners.begin(); while ( corner != corners.end() ) { SMDS_ElemIteratorPtr faceIt = (*corner)->GetInverseElementIterator( SMDSAbs_Face ); @@ -474,9 +476,9 @@ namespace // analyse sharing of sides by blocks and sort sides by nb of adjacent sides int nbBlockSides = 0; // total nb of block sides taking into account their sharing - multimap sortedSides; + std::multimap sortedSides; { - list < _BlockSide >::iterator sideIt = _allSides.begin(); + std::list < _BlockSide >::iterator sideIt = _allSides.begin(); for ( ; sideIt != _allSides.end(); ++sideIt ) { _BlockSide& side = *sideIt; @@ -491,7 +493,7 @@ namespace side._nbBlocksFound = 0; side._nbBlocksExpected = isSharedSide ? 2 : 1; nbBlockSides += side._nbBlocksExpected; - sortedSides.insert( make_pair( nbAdjacent, & side )); + sortedSides.insert( std::make_pair( nbAdjacent, & side )); } } @@ -500,7 +502,7 @@ namespace while ( nbBlockSides >= 6 ) { // get any side not bound to all blocks it belongs to - multimap::iterator i_side = sortedSides.begin(); + std::multimap::iterator i_side = sortedSides.begin(); while ( i_side != sortedSides.end() && i_side->second->isBound()) ++i_side; @@ -519,7 +521,7 @@ namespace EQuadEdge edgeOfAdj [4] = { Q_BOTTOM, Q_LEFT, Q_BOTTOM, Q_LEFT }; // first find all sides detectable w/o advanced analysis, // then repeat the search, which then may pass without advanced analysis - set< _BlockSide* > sidesAround; + std::set< _BlockSide* > sidesAround; for ( int advAnalys = 0; advAnalys < 2; ++advAnalys ) { // try to find 4 sides adjacent to a FRONT side @@ -601,7 +603,7 @@ namespace const SMDS_MeshNode* nOnEdge = firstQuad->GetNode( (iCorner+1) % 4); // find out size of block side - vector horRow1, horRow2, verRow1, verRow2; + std::vector horRow1, horRow2, verRow1, verRow2; if ( !fillRowsUntilCorner( firstQuad, nCorner, nOnEdge, horRow1, horRow2, true ) || !fillRowsUntilCorner( firstQuad, nCorner, nOnEdge, verRow1, verRow2, false )) return false; @@ -641,8 +643,8 @@ namespace const SMDS_MeshNode* n1down = side.getNode( 0, y-1 ); const SMDS_MeshNode* n2down = side.getNode( 1, y-1 ); avoidSet.clear(); avoidSet.insert( firstQuad ); - firstQuad = SMESH_MeshEditor::FindFaceInSet( n1down, n2down, emptySet, avoidSet, - &i1down, &i2down); + firstQuad = SMESH_MeshAlgos::FindFaceInSet( n1down, n2down, emptySet, avoidSet, + &i1down, &i2down); if ( !isQuadrangle( firstQuad )) return BAD_MESH_ERR; @@ -654,8 +656,8 @@ namespace x = 1; while ( ++x < nbX ) { - const SMDS_MeshElement* quad = SMESH_MeshEditor::FindFaceInSet( n2up, n2down, emptySet, - avoidSet, &i2up, &i2down); + const SMDS_MeshElement* quad = SMESH_MeshAlgos::FindFaceInSet( n2up, n2down, emptySet, + avoidSet, &i2up, &i2down); if ( !isQuadrangle( quad )) return BAD_MESH_ERR; @@ -685,7 +687,7 @@ namespace //================================================================================ bool isClosedChainOfSides( _BlockSide* startSide, - map< const SMDS_MeshNode*, list< _BlockSide* > > & corner2Sides ) + std::map< const SMDS_MeshNode*, std::list< _BlockSide* > > & corner2Sides ) { // get start and end nodes const SMDS_MeshNode *n1 = 0, *n2 = 0, *n; @@ -701,7 +703,7 @@ namespace } if ( !n2 ) return false; - map< const SMDS_MeshNode*, list< _BlockSide* > >::iterator + std::map< const SMDS_MeshNode*, std::list< _BlockSide* > >::iterator c2sides = corner2Sides.find( n1 ); if ( c2sides == corner2Sides.end() ) return false; @@ -711,7 +713,7 @@ namespace while ( n != n2 ) { // get the next side sharing n - list< _BlockSide* > & sides = c2sides->second; + std::list< _BlockSide* > & sides = c2sides->second; _BlockSide* nextSide = ( sides.back() == prevSide ? sides.front() : sides.back() ); if ( nextSide == prevSide ) return false; @@ -747,7 +749,7 @@ namespace EQuadEdge sharedSideEdge1, EQuadEdge sharedSideEdge2, bool withGeometricAnalysis, - set< _BlockSide* >& sidesAround) + std::set< _BlockSide* >& sidesAround) { _Block& block = _blocks.back(); _OrientedBlockSide& side1 = block._side[ startBlockSide ]; @@ -756,10 +758,10 @@ namespace SMESH_OrientedLink edge = side1.edge( sharedSideEdge1 ); const SMDS_MeshNode* n1 = edge.node1(); const SMDS_MeshNode* n2 = edge.node2(); - if ( edge._reversed ) swap( n1, n2 ); + if ( edge._reversed ) std::swap( n1, n2 ); // find all sides sharing both nodes n1 and n2 - set< _BlockSide* > sidesOnEdge = _edge2sides[ edge ]; // copy a set + std::set< _BlockSide* > sidesOnEdge = _edge2sides[ edge ]; // copy a set // exclude loaded sides of block from sidesOnEdge for (int i = 0; i < NB_BLOCK_SIDES; ++i ) @@ -778,7 +780,7 @@ namespace } else { - set< _BlockSide* >::iterator sideIt = sidesOnEdge.begin(); + std::set< _BlockSide* >::iterator sideIt = sidesOnEdge.begin(); int nbLoadedSides = block.nbSides(); if ( nbLoadedSides > 1 ) { @@ -810,7 +812,7 @@ namespace // Find a side starting from which we can walk around the startBlockSide // fill in corner2Sides - map< const SMDS_MeshNode*, list< _BlockSide* > > corner2Sides; + std::map< const SMDS_MeshNode*, std::list< _BlockSide* > > corner2Sides; for ( sideIt = sidesAround.begin(); sideIt != sidesAround.end(); ++sideIt ) { _BlockSide* sideI = *sideIt; @@ -820,7 +822,7 @@ namespace corner2Sides[ sideI->getCornerNode(1,1) ].push_back( sideI ); } // remove corners of startBlockSide from corner2Sides - set::iterator nIt = block._corners.begin(); + std::set::iterator nIt = block._corners.begin(); for ( ; nIt != block._corners.end(); ++nIt ) corner2Sides.erase( *nIt ); @@ -850,7 +852,7 @@ namespace _DUMP_(" Select adjacent for "<< side1._side << " - side dir (" << side1Dir.X() << ", " << side1Dir.Y() << ", " << side1Dir.Z() << ")" ); - map < double , _BlockSide* > angleOfSide; + std::map < double , _BlockSide* > angleOfSide; for (sideIt = sidesOnEdge.begin(); sideIt != sidesOnEdge.end(); ++sideIt ) { _BlockSide* sideI = *sideIt; @@ -861,7 +863,7 @@ namespace gp_Vec2d sideIDirProj( sideIDir * pln.XDirection(), sideIDir * pln.YDirection()); double angle = sideIDirProj.Angle( gp::DX2d() ); if ( angle < 0 ) angle += 2. * M_PI; // angle [0-2*PI] - angleOfSide.insert( make_pair( angle, sideI )); + angleOfSide.insert( std::make_pair( angle, sideI )); _DUMP_(" "<< sideI << " - side dir (" << sideIDir.X() << ", " << sideIDir.Y() << ", " << sideIDir.Z() << ")" << " angle " << angle); @@ -915,8 +917,8 @@ namespace bool _Skin::fillRowsUntilCorner(const SMDS_MeshElement* quad, const SMDS_MeshNode* n1, const SMDS_MeshNode* n2, - vector& row1, - vector& row2, + std::vector& row1, + std::vector& row2, const bool alongN1N2 ) { const SMDS_MeshNode* corner1 = n1; @@ -948,7 +950,7 @@ namespace while ( !isCornerNode( n2 ) ) { avoidSet.clear(); avoidSet.insert( quad ); - quad = SMESH_MeshEditor::FindFaceInSet( n1, n2, emptySet, avoidSet, &i1, &i2 ); + quad = SMESH_MeshAlgos::FindFaceInSet( n1, n2, emptySet, avoidSet, &i1, &i2 ); if ( !isQuadrangle( quad )) return BAD_MESH_ERR; @@ -1031,7 +1033,7 @@ HEXA_NS::Hexa* _block2Hexa( const _Block& block, const SMDS_MeshNode* n011 = block.getSide(B_TOP).cornerNode( 0, 1 ); const SMDS_MeshNode* n111 = block.getSide(B_TOP).cornerNode( 1, 1 ); - list nodeFromBlock; + std::list nodeFromBlock; nodeFromBlock.push_back(n000); nodeFromBlock.push_back(n100); nodeFromBlock.push_back(n010); @@ -1047,7 +1049,7 @@ HEXA_NS::Hexa* _block2Hexa( const _Block& block, int nHexa = doc->countUsedHexa(); for (int j=0; j getUsedHexa(j); - list nodeFromHexa; + std::list nodeFromHexa; int nVx = hexa->countVertex(); for ( int i=0; i getVertex(i); @@ -1078,15 +1080,15 @@ HEXA_NS::Hexa* _block2Hexa( const _Block& block, //purpose : //======================================================================= -// SMESH_HexaFromSkin_3D::SMESH_HexaFromSkin_3D(int hypId, int studyId, SMESH_Gen* gen) -// :SMESH_3D_Algo(hypId, studyId, gen) +// SMESH_HexaFromSkin_3D::SMESH_HexaFromSkin_3D(int hypId, SMESH_Gen* gen) +// :SMESH_3D_Algo(hypId, gen) // { // MESSAGE("SMESH_HexaFromSkin_3D::SMESH_HexaFromSkin_3D"); // _name = "HexaFromSkin_3D"; // } -SMESH_HexaFromSkin_3D::SMESH_HexaFromSkin_3D(int hypId, int studyId, SMESH_Gen* gen, HEXA_NS::Document* doc) - :SMESH_3D_Algo(hypId, studyId, gen), +SMESH_HexaFromSkin_3D::SMESH_HexaFromSkin_3D(int hypId, SMESH_Gen* gen, HEXA_NS::Document* doc) + :SMESH_3D_Algo(hypId, gen), _doc( doc ) { if(MYDEBUG) MESSAGE("SMESH_HexaFromSkin_3D::SMESH_HexaFromSkin_3D"); @@ -1112,7 +1114,7 @@ bool SMESH_HexaFromSkin_3D::Compute(SMESH_Mesh & aMesh, SMESH_MesherHelper* aHel if ( nbBlocks == 0 ) return error( skin.error()); - vector< vector< const SMDS_MeshNode* > > columns; + std::vector< std::vector< const SMDS_MeshNode* > > columns; int x, xSize, y, ySize, z, zSize; _Indexer colIndex; @@ -1133,8 +1135,8 @@ bool SMESH_HexaFromSkin_3D::Compute(SMESH_Mesh & aMesh, SMESH_MesherHelper* aHel // fill node columns by front and back box sides for ( x = 0; x < xSize; ++x ) { - vector< const SMDS_MeshNode* >& column0 = columns[ colIndex( x, 0 )]; - vector< const SMDS_MeshNode* >& column1 = columns[ colIndex( x, Y )]; + std::vector< const SMDS_MeshNode* >& column0 = columns[ colIndex( x, 0 )]; + std::vector< const SMDS_MeshNode* >& column1 = columns[ colIndex( x, Y )]; column0.resize( zSize ); column1.resize( zSize ); for ( z = 0; z < zSize; ++z ) { @@ -1144,8 +1146,8 @@ bool SMESH_HexaFromSkin_3D::Compute(SMESH_Mesh & aMesh, SMESH_MesherHelper* aHel } // fill node columns by left and right box sides for ( y = 1; y < ySize-1; ++y ) { - vector< const SMDS_MeshNode* >& column0 = columns[ colIndex( 0, y )]; - vector< const SMDS_MeshNode* >& column1 = columns[ colIndex( X, y )]; + std::vector< const SMDS_MeshNode* >& column0 = columns[ colIndex( 0, y )]; + std::vector< const SMDS_MeshNode* >& column1 = columns[ colIndex( X, y )]; column0.resize( zSize ); column1.resize( zSize ); for ( z = 0; z < zSize; ++z ) { @@ -1156,7 +1158,7 @@ bool SMESH_HexaFromSkin_3D::Compute(SMESH_Mesh & aMesh, SMESH_MesherHelper* aHel // get nodes from top and bottom box sides for ( x = 1; x < xSize-1; ++x ) { for ( y = 1; y < ySize-1; ++y ) { - vector< const SMDS_MeshNode* >& column = columns[ colIndex( x, y )]; + std::vector< const SMDS_MeshNode* >& column = columns[ colIndex( x, y )]; column.resize( zSize ); column.front() = block.getSide(B_BOTTOM).node( x, y ); column.back() = block.getSide(B_TOP) .node( x, y ); @@ -1168,7 +1170,7 @@ bool SMESH_HexaFromSkin_3D::Compute(SMESH_Mesh & aMesh, SMESH_MesherHelper* aHel // ---------------------------- // projection points of internal nodes on box sub-shapes by which // coordinates of internal nodes are computed - vector pointOnShape( SMESH_Block::ID_Shell ); + std::vector pointOnShape( SMESH_Block::ID_Shell ); // projections on vertices are constant pointOnShape[ SMESH_Block::ID_V000 ] = block.getSide(B_BOTTOM).xyz( 0, 0 ); @@ -1188,7 +1190,7 @@ bool SMESH_HexaFromSkin_3D::Compute(SMESH_Mesh & aMesh, SMESH_MesherHelper* aHel { params.SetCoord( 2, y / double(Y) ); // column to fill during z loop - vector< const SMDS_MeshNode* >& column = columns[ colIndex( x, y )]; + std::vector< const SMDS_MeshNode* >& column = columns[ colIndex( x, y )]; // projections on horizontal edges pointOnShape[ SMESH_Block::ID_Ex00 ] = block.getSide(B_BOTTOM).xyz( x, 0 ); pointOnShape[ SMESH_Block::ID_Ex10 ] = block.getSide(B_BOTTOM).xyz( x, Y ); @@ -1240,7 +1242,7 @@ bool SMESH_HexaFromSkin_3D::Compute(SMESH_Mesh & aMesh, SMESH_MesherHelper* aHel // find out orientation by a least distorted hexahedron (issue 0020855); // the last is defined by evaluating sum of face normals of 8 corner hexahedrons - double badness = numeric_limits::max(); + double badness = std::numeric_limits::max(); bool isForw = true; for ( int xMax = 0; xMax < 2; ++xMax ) for ( int yMax = 0; yMax < 2; ++yMax ) @@ -1249,10 +1251,10 @@ bool SMESH_HexaFromSkin_3D::Compute(SMESH_Mesh & aMesh, SMESH_MesherHelper* aHel x = xMax ? xSize-1 : 1; y = yMax ? ySize-1 : 1; z = zMax ? zSize-1 : 1; - vector< const SMDS_MeshNode* >& col00 = columns[ colIndex( x-1, y-1 )]; - vector< const SMDS_MeshNode* >& col10 = columns[ colIndex( x , y-1 )]; - vector< const SMDS_MeshNode* >& col01 = columns[ colIndex( x-1, y )]; - vector< const SMDS_MeshNode* >& col11 = columns[ colIndex( x , y )]; + std::vector< const SMDS_MeshNode* >& col00 = columns[ colIndex( x-1, y-1 )]; + std::vector< const SMDS_MeshNode* >& col10 = columns[ colIndex( x , y-1 )]; + std::vector< const SMDS_MeshNode* >& col01 = columns[ colIndex( x-1, y )]; + std::vector< const SMDS_MeshNode* >& col11 = columns[ colIndex( x , y )]; const SMDS_MeshNode* n000 = col00[z-1]; const SMDS_MeshNode* n100 = col10[z-1]; @@ -1285,10 +1287,10 @@ bool SMESH_HexaFromSkin_3D::Compute(SMESH_Mesh & aMesh, SMESH_MesherHelper* aHel // add elements for ( x = 0; x < xSize-1; ++x ) { for ( y = 0; y < ySize-1; ++y ) { - vector< const SMDS_MeshNode* >& col00 = columns[ colIndex( x, y )]; - vector< const SMDS_MeshNode* >& col10 = columns[ colIndex( x+1, y )]; - vector< const SMDS_MeshNode* >& col01 = columns[ colIndex( x, y+1 )]; - vector< const SMDS_MeshNode* >& col11 = columns[ colIndex( x+1, y+1 )]; + std::vector< const SMDS_MeshNode* >& col00 = columns[ colIndex( x, y )]; + std::vector< const SMDS_MeshNode* >& col10 = columns[ colIndex( x+1, y )]; + std::vector< const SMDS_MeshNode* >& col01 = columns[ colIndex( x, y+1 )]; + std::vector< const SMDS_MeshNode* >& col11 = columns[ colIndex( x+1, y+1 )]; // bottom face normal of a hexa mush point outside the volume if ( isForw ) for ( z = 0; z < zSize-1; ++z ) @@ -1321,7 +1323,7 @@ bool SMESH_HexaFromSkin_3D::Compute( SMESH_Mesh & aMesh, SMESH_MesherHelper* aHe if ( nbBlocks == 0 ) return error( skin.error()); - vector< vector< const SMDS_MeshNode* > > columns; + std::vector< std::vector< const SMDS_MeshNode* > > columns; int x, xSize, y, ySize, z, zSize; _Indexer colIndex; @@ -1342,8 +1344,8 @@ bool SMESH_HexaFromSkin_3D::Compute( SMESH_Mesh & aMesh, SMESH_MesherHelper* aHe // fill node columns by front and back box sides for ( x = 0; x < xSize; ++x ) { - vector< const SMDS_MeshNode* >& column0 = columns[ colIndex( x, 0 )]; - vector< const SMDS_MeshNode* >& column1 = columns[ colIndex( x, Y )]; + std::vector< const SMDS_MeshNode* >& column0 = columns[ colIndex( x, 0 )]; + std::vector< const SMDS_MeshNode* >& column1 = columns[ colIndex( x, Y )]; column0.resize( zSize ); column1.resize( zSize ); for ( z = 0; z < zSize; ++z ) { @@ -1353,8 +1355,8 @@ bool SMESH_HexaFromSkin_3D::Compute( SMESH_Mesh & aMesh, SMESH_MesherHelper* aHe } // fill node columns by left and right box sides for ( y = 1; y < ySize-1; ++y ) { - vector< const SMDS_MeshNode* >& column0 = columns[ colIndex( 0, y )]; - vector< const SMDS_MeshNode* >& column1 = columns[ colIndex( X, y )]; + std::vector< const SMDS_MeshNode* >& column0 = columns[ colIndex( 0, y )]; + std::vector< const SMDS_MeshNode* >& column1 = columns[ colIndex( X, y )]; column0.resize( zSize ); column1.resize( zSize ); for ( z = 0; z < zSize; ++z ) { @@ -1365,7 +1367,7 @@ bool SMESH_HexaFromSkin_3D::Compute( SMESH_Mesh & aMesh, SMESH_MesherHelper* aHe // get nodes from top and bottom box sides for ( x = 1; x < xSize-1; ++x ) { for ( y = 1; y < ySize-1; ++y ) { - vector< const SMDS_MeshNode* >& column = columns[ colIndex( x, y )]; + std::vector< const SMDS_MeshNode* >& column = columns[ colIndex( x, y )]; column.resize( zSize ); column.front() = block.getSide(B_BOTTOM).node( x, y ); column.back() = block.getSide(B_TOP) .node( x, y ); @@ -1377,7 +1379,7 @@ bool SMESH_HexaFromSkin_3D::Compute( SMESH_Mesh & aMesh, SMESH_MesherHelper* aHe // ---------------------------- // projection points of internal nodes on box subshapes by which // coordinates of internal nodes are computed - vector pointOnShape( SMESH_Block::ID_Shell ); + std::vector pointOnShape( SMESH_Block::ID_Shell ); // projections on vertices are constant pointOnShape[ SMESH_Block::ID_V000 ] = block.getSide(B_BOTTOM).xyz( 0, 0 ); @@ -1397,7 +1399,7 @@ bool SMESH_HexaFromSkin_3D::Compute( SMESH_Mesh & aMesh, SMESH_MesherHelper* aHe { params.SetCoord( 2, y / double(Y) ); // column to fill during z loop - vector< const SMDS_MeshNode* >& column = columns[ colIndex( x, y )]; + std::vector< const SMDS_MeshNode* >& column = columns[ colIndex( x, y )]; // projections on horizontal edges pointOnShape[ SMESH_Block::ID_Ex00 ] = block.getSide(B_BOTTOM).xyz( x, 0 ); pointOnShape[ SMESH_Block::ID_Ex10 ] = block.getSide(B_BOTTOM).xyz( x, Y ); @@ -1465,10 +1467,10 @@ bool SMESH_HexaFromSkin_3D::Compute( SMESH_Mesh & aMesh, SMESH_MesherHelper* aHe for ( x = 0; x < xSize-1; ++x ) { for ( y = 0; y < ySize-1; ++y ) { - vector< const SMDS_MeshNode* >& col00 = columns[ colIndex( x, y )]; - vector< const SMDS_MeshNode* >& col10 = columns[ colIndex( x+1, y )]; - vector< const SMDS_MeshNode* >& col01 = columns[ colIndex( x, y+1 )]; - vector< const SMDS_MeshNode* >& col11 = columns[ colIndex( x+1, y+1 )]; + std::vector< const SMDS_MeshNode* >& col00 = columns[ colIndex( x, y )]; + std::vector< const SMDS_MeshNode* >& col10 = columns[ colIndex( x+1, y )]; + std::vector< const SMDS_MeshNode* >& col01 = columns[ colIndex( x, y+1 )]; + std::vector< const SMDS_MeshNode* >& col11 = columns[ colIndex( x+1, y+1 )]; // bottom face normal of a hexa mush point outside the volume if ( isForw ) for ( z = 0; z < zSize-1; ++z ){ @@ -1524,7 +1526,7 @@ bool SMESH_HexaFromSkin_3D::Evaluate(SMESH_Mesh & aMesh, bool secondOrder = aMesh.NbFaces( ORDER_QUADRATIC ); int entity = secondOrder ? SMDSEntity_Quad_Hexa : SMDSEntity_Hexa; - vector& nbByType = aResMap[ aMesh.GetSubMesh( aShape )]; + std::vector& nbByType = aResMap[ aMesh.GetSubMesh( aShape )]; if ( entity >= nbByType.size() ) nbByType.resize( SMDSEntity_Last, 0 );