ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-03-11 03:14:32 +05:00
Code Issues Packages Projects Releases Wiki Activity

fix warnings conversion #2

Browse Source
This commit is contained in:
Viktor UZLOV 2021-02-08 18:56:02 +03:00
parent c58cc9d1ec
commit fc526c4dbf
5 changed files with 73 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/Controls/SMESH_Controls.cxx
View File

@ -2114,7 +2114,7 @@ double MultiConnection2D::GetValue( long theElementId )
while (anElemIter->more()) { while (anElemIter->more()) {
const SMDS_MeshElement* anElem = anElemIter->next(); const SMDS_MeshElement* anElem = anElemIter->next();
if (anElem != 0 && anElem->GetType() == SMDSAbs_Face) { if (anElem != 0 && anElem->GetType() == SMDSAbs_Face) {
int anId = anElem->GetID(); smIdType anId = anElem->GetID();
aMap.Add(anId); aMap.Add(anId);
if (aMapPrev.Contains(anId)) { if (aMapPrev.Contains(anId)) {
@ -2468,7 +2468,7 @@ void CoincidentNodes::SetMesh( const SMDS_Mesh* theMesh )
std::list< const SMDS_MeshNode*>& coincNodes = *groupIt; std::list< const SMDS_MeshNode*>& coincNodes = *groupIt;
std::list< const SMDS_MeshNode*>::iterator n = coincNodes.begin(); std::list< const SMDS_MeshNode*>::iterator n = coincNodes.begin();
for ( ; n != coincNodes.end(); ++n ) for ( ; n != coincNodes.end(); ++n )
myCoincidentIDs.Add( (*n)->GetID() ); myCoincidentIDs.Add( FromIdType<int>((*n)->GetID()) );
} }
} }
} }
@ -2582,7 +2582,7 @@ bool FreeEdges::IsFreeEdge( const SMDS_MeshNode** theNodes, const int theFaceId
{ {
if ( const SMDS_MeshElement* anElem = anElemIter->next()) if ( const SMDS_MeshElement* anElem = anElemIter->next())
{ {
const int anId = anElem->GetID(); const int anId = FromIdType<int>(anElem->GetID());
if ( anId != theFaceId && anElem->GetNodeIndex( theNodes[1] ) >= 0 ) if ( anId != theFaceId && anElem->GetNodeIndex( theNodes[1] ) >= 0 )
return false; return false;
} }
@ -3084,7 +3084,7 @@ void ConnectedElements::SetPoint( double x, double y, double z )
if ( !foundElems.empty() ) if ( !foundElems.empty() )
{ {
myNodeID = foundElems[0]->GetNode(0)->GetID(); myNodeID = FromIdType<int>(foundElems[0]->GetNode(0)->GetID());
if ( myOkIDsReady && !myMeshModifTracer.IsMeshModified() ) if ( myOkIDsReady && !myMeshModifTracer.IsMeshModified() )
isSameDomain = IsSatisfy( foundElems[0]->GetID() ); isSameDomain = IsSatisfy( foundElems[0]->GetID() );
} }
@ -3124,14 +3124,14 @@ bool ConnectedElements::IsSatisfy( long theElementId )
// keep elements of myType // keep elements of myType
const SMDS_MeshElement* element = eIt->next(); const SMDS_MeshElement* element = eIt->next();
if ( myType == SMDSAbs_All || element->GetType() == myType ) if ( myType == SMDSAbs_All || element->GetType() == myType )
myOkIDs.insert( myOkIDs.end(), element->GetID() ); myOkIDs.insert( myOkIDs.end(), FromIdType<int>(element->GetID()) );
// enqueue nodes of the element // enqueue nodes of the element
SMDS_ElemIteratorPtr nIt = element->nodesIterator(); SMDS_ElemIteratorPtr nIt = element->nodesIterator();
while ( nIt->more() ) while ( nIt->more() )
{ {
const SMDS_MeshNode* n = static_cast< const SMDS_MeshNode* >( nIt->next() ); const SMDS_MeshNode* n = static_cast< const SMDS_MeshNode* >( nIt->next() );
if ( checkedNodeIDs.insert( n->GetID() ).second ) if ( checkedNodeIDs.insert( FromIdType<int>(n->GetID()) ).second )
nodeQueue.push_back( n ); nodeQueue.push_back( n );
} }
} }
@ -3217,7 +3217,7 @@ void CoplanarFaces::SetMesh( const SMDS_Mesh* theMesh )
gp_Vec norm = getNormale( static_cast<const SMDS_MeshFace*>(f), &normOK ); gp_Vec norm = getNormale( static_cast<const SMDS_MeshFace*>(f), &normOK );
if (!normOK || isLessAngle( myNorm, norm, cosTol)) if (!normOK || isLessAngle( myNorm, norm, cosTol))
{ {
myCoplanarIDs.Add( f->GetID() ); myCoplanarIDs.Add( FromIdType<int>(f->GetID()) );
faceQueue.push_back( std::make_pair( f, norm )); faceQueue.push_back( std::make_pair( f, norm ));
} }
} }
@ -3830,10 +3830,10 @@ bool ManifoldPart::process()
// as result next time when fi will be equal to aStartIndx // as result next time when fi will be equal to aStartIndx
SMDS_MeshFace* aFacePtr = myAllFacePtr[ fi ]; SMDS_MeshFace* aFacePtr = myAllFacePtr[ fi ];
if ( aMapOfTreated.Contains( aFacePtr->GetID() ) ) if ( aMapOfTreated.Contains( FromIdType<int>(aFacePtr->GetID()) ) )
continue; continue;
aMapOfTreated.Add( aFacePtr->GetID() ); aMapOfTreated.Add( FromIdType<int>(aFacePtr->GetID()) );
TColStd_MapOfInteger aResFaces; TColStd_MapOfInteger aResFaces;
if ( !findConnected( myAllFacePtrIntDMap, aFacePtr, if ( !findConnected( myAllFacePtrIntDMap, aFacePtr,
aMapOfNonManifold, aResFaces ) ) aMapOfNonManifold, aResFaces ) )
@ -3885,13 +3885,13 @@ bool ManifoldPart::findConnected
if ( getNormale( theStartFace ).SquareModulus() <= gp::Resolution() ) if ( getNormale( theStartFace ).SquareModulus() <= gp::Resolution() )
{ {
myMapBadGeomIds.Add( theStartFace->GetID() ); myMapBadGeomIds.Add( FromIdType<int>(theStartFace->GetID()) );
return false; return false;
} }
ManifoldPart::TMapOfLink aMapOfBoundary, aMapToSkip; ManifoldPart::TMapOfLink aMapOfBoundary, aMapToSkip;
ManifoldPart::TVectorOfLink aSeqOfBoundary; ManifoldPart::TVectorOfLink aSeqOfBoundary;
theResFaces.Add( theStartFace->GetID() ); theResFaces.Add( FromIdType<int>(theStartFace->GetID()) );
ManifoldPart::TDataMapOfLinkFacePtr aDMapLinkFace; ManifoldPart::TDataMapOfLinkFacePtr aDMapLinkFace;
expandBoundary( aMapOfBoundary, aSeqOfBoundary, expandBoundary( aMapOfBoundary, aSeqOfBoundary,
@ -3945,7 +3945,7 @@ bool ManifoldPart::findConnected
SMDS_MeshFace* aNextFace = *pFace; SMDS_MeshFace* aNextFace = *pFace;
if ( aPrevFace == aNextFace ) if ( aPrevFace == aNextFace )
continue; continue;
int anNextFaceID = aNextFace->GetID(); int anNextFaceID = FromIdType<int>(aNextFace->GetID());
if ( myIsOnlyManifold && theResFaces.Contains( anNextFaceID ) ) if ( myIsOnlyManifold && theResFaces.Contains( anNextFaceID ) )
// should not be with non manifold restriction. probably bad topology // should not be with non manifold restriction. probably bad topology
continue; continue;
@ -3973,7 +3973,7 @@ bool ManifoldPart::isInPlane( const SMDS_MeshFace* theFace1,
gp_XYZ aNorm2XYZ = getNormale( theFace2 ); gp_XYZ aNorm2XYZ = getNormale( theFace2 );
if ( aNorm2XYZ.SquareModulus() <= gp::Resolution() ) if ( aNorm2XYZ.SquareModulus() <= gp::Resolution() )
{ {
myMapBadGeomIds.Add( theFace2->GetID() ); myMapBadGeomIds.Add( FromIdType<int>(theFace2->GetID()) );
return false; return false;
} }
if ( aNorm1.IsParallel( gp_Dir( aNorm2XYZ ), myAngToler ) ) if ( aNorm1.IsParallel( gp_Dir( aNorm2XYZ ), myAngToler ) )
@ -4176,7 +4176,7 @@ void ElementsOnSurface::process()
if ( !myMeshModifTracer.GetMesh() ) if ( !myMeshModifTracer.GetMesh() )
return; return;
myIds.ReSize( myMeshModifTracer.GetMesh()->GetMeshInfo().NbElements( myType )); myIds.ReSize( FromIdType<int>(myMeshModifTracer.GetMesh()->GetMeshInfo().NbElements( myType )));
SMDS_ElemIteratorPtr anIter = myMeshModifTracer.GetMesh()->elementsIterator( myType ); SMDS_ElemIteratorPtr anIter = myMeshModifTracer.GetMesh()->elementsIterator( myType );
for(; anIter->more(); ) for(; anIter->more(); )
@ -4197,7 +4197,7 @@ void ElementsOnSurface::process( const SMDS_MeshElement* theElemPtr )
} }
} }
if ( isSatisfy ) if ( isSatisfy )
myIds.Add( theElemPtr->GetID() ); myIds.Add( FromIdType<int>(theElemPtr->GetID()) );
} }
bool ElementsOnSurface::isOnSurface( const SMDS_MeshNode* theNode ) bool ElementsOnSurface::isOnSurface( const SMDS_MeshNode* theNode )

16
src/DriverGMF/DriverGMF_Read.cxx
View File

@ -89,7 +89,7 @@ Driver_Mesh::Status DriverGMF_Read::Perform()
int ref; int ref;
const int nodeIDShift = myMesh->GetMeshInfo().NbNodes(); const smIdType nodeIDShift = myMesh->GetMeshInfo().NbNodes();
if ( version != GmfFloat ) if ( version != GmfFloat )
{ {
double x, y, z; double x, y, z;
@ -114,7 +114,7 @@ Driver_Mesh::Status DriverGMF_Read::Perform()
int iN[28]; // 28 - nb nodes in HEX27 (+ 1 for safety :) int iN[28]; // 28 - nb nodes in HEX27 (+ 1 for safety :)
/* Read edges */ /* Read edges */
const int edgeIDShift = myMesh->GetMeshInfo().NbElements(); const smIdType edgeIDShift = myMesh->GetMeshInfo().NbElements();
if ( int nbEdges = GmfStatKwd(meshID, GmfEdges)) if ( int nbEdges = GmfStatKwd(meshID, GmfEdges))
{ {
// read extra vertices for quadratic edges // read extra vertices for quadratic edges
@ -150,7 +150,7 @@ Driver_Mesh::Status DriverGMF_Read::Perform()
} }
/* Read triangles */ /* Read triangles */
const int triaIDShift = myMesh->GetMeshInfo().NbElements(); const smIdType triaIDShift = myMesh->GetMeshInfo().NbElements();
if ( int nbTria = GmfStatKwd(meshID, GmfTriangles)) if ( int nbTria = GmfStatKwd(meshID, GmfTriangles))
{ {
// read extra vertices for quadratic triangles // read extra vertices for quadratic triangles
@ -194,7 +194,7 @@ Driver_Mesh::Status DriverGMF_Read::Perform()
} }
/* Read quadrangles */ /* Read quadrangles */
const int quadIDShift = myMesh->GetMeshInfo().NbElements(); const smIdType quadIDShift = myMesh->GetMeshInfo().NbElements();
if ( int nbQuad = GmfStatKwd(meshID, GmfQuadrilaterals)) if ( int nbQuad = GmfStatKwd(meshID, GmfQuadrilaterals))
{ {
// read extra vertices for quadratic quadrangles // read extra vertices for quadratic quadrangles
@ -248,7 +248,7 @@ Driver_Mesh::Status DriverGMF_Read::Perform()
} }
/* Read terahedra */ /* Read terahedra */
const int tetIDShift = myMesh->GetMeshInfo().NbElements(); const smIdType tetIDShift = myMesh->GetMeshInfo().NbElements();
if ( int nbTet = GmfStatKwd( meshID, GmfTetrahedra )) if ( int nbTet = GmfStatKwd( meshID, GmfTetrahedra ))
{ {
// read extra vertices for quadratic tetrahedra // read extra vertices for quadratic tetrahedra
@ -293,7 +293,7 @@ Driver_Mesh::Status DriverGMF_Read::Perform()
} }
/* Read pyramids */ /* Read pyramids */
const int pyrIDShift = myMesh->GetMeshInfo().NbElements(); const smIdType pyrIDShift = myMesh->GetMeshInfo().NbElements();
if ( int nbPyr = GmfStatKwd(meshID, GmfPyramids)) if ( int nbPyr = GmfStatKwd(meshID, GmfPyramids))
{ {
GmfGotoKwd(meshID, GmfPyramids); GmfGotoKwd(meshID, GmfPyramids);
@ -306,7 +306,7 @@ Driver_Mesh::Status DriverGMF_Read::Perform()
} }
/* Read hexahedra */ /* Read hexahedra */
const int hexIDShift = myMesh->GetMeshInfo().NbElements(); const smIdType hexIDShift = myMesh->GetMeshInfo().NbElements();
if ( int nbHex = GmfStatKwd(meshID, GmfHexahedra)) if ( int nbHex = GmfStatKwd(meshID, GmfHexahedra))
{ {
// read extra vertices for quadratic hexahedra // read extra vertices for quadratic hexahedra
@ -389,7 +389,7 @@ Driver_Mesh::Status DriverGMF_Read::Perform()
} }
/* Read prism */ /* Read prism */
const int prismIDShift = myMesh->GetMeshInfo().NbElements(); const smIdType prismIDShift = myMesh->GetMeshInfo().NbElements();
if ( int nbPrism = GmfStatKwd(meshID, GmfPrisms)) if ( int nbPrism = GmfStatKwd(meshID, GmfPrisms))
{ {
GmfGotoKwd(meshID, GmfPrisms); GmfGotoKwd(meshID, GmfPrisms);

2
src/DriverMED/DriverMED_W_Field.cxx
View File

@ -90,7 +90,7 @@ bool DriverMED_W_Field::Set(SMESHDS_Mesh * mesh,
} }
// find out "MED order" of elements - sort elements by geom type // find out "MED order" of elements - sort elements by geom type
int nbElems; smIdType nbElems;
if ( _nbElemsByGeom.empty() || _elemType != type ) if ( _nbElemsByGeom.empty() || _elemType != type )
{ {
_elemType = type; _elemType = type;

88
src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx
View File

@ -475,12 +475,12 @@ Driver_Mesh::Status DriverMED_W_SMESHDS_Mesh::Perform()
int myEdgesDefaultFamilyId = 0; int myEdgesDefaultFamilyId = 0;
int myFacesDefaultFamilyId = 0; int myFacesDefaultFamilyId = 0;
int myVolumesDefaultFamilyId = 0; int myVolumesDefaultFamilyId = 0;
int nbNodes = myMesh->NbNodes(); smIdType nbNodes = myMesh->NbNodes();
int nb0DElements = myMesh->Nb0DElements(); smIdType nb0DElements = myMesh->Nb0DElements();
int nbBalls = myMesh->NbBalls(); smIdType nbBalls = myMesh->NbBalls();
int nbEdges = myMesh->NbEdges(); smIdType nbEdges = myMesh->NbEdges();
int nbFaces = myMesh->NbFaces(); smIdType nbFaces = myMesh->NbFaces();
int nbVolumes = myMesh->NbVolumes(); smIdType nbVolumes = myMesh->NbVolumes();
if (myDoGroupOfNodes) myNodesDefaultFamilyId = REST_NODES_FAMILY; if (myDoGroupOfNodes) myNodesDefaultFamilyId = REST_NODES_FAMILY;
if (myDoGroupOfEdges) myEdgesDefaultFamilyId = REST_EDGES_FAMILY; if (myDoGroupOfEdges) myEdgesDefaultFamilyId = REST_EDGES_FAMILY;
if (myDoGroupOfFaces) myFacesDefaultFamilyId = REST_FACES_FAMILY; if (myDoGroupOfFaces) myFacesDefaultFamilyId = REST_FACES_FAMILY;
@ -539,7 +539,7 @@ Driver_Mesh::Status DriverMED_W_SMESHDS_Mesh::Perform()
const EBooleen theIsElemNames = eFAUX; const EBooleen theIsElemNames = eFAUX;
const EConnectivite theConnMode = eNOD; const EConnectivite theConnMode = eNOD;
TInt aNbNodes = myMesh->NbNodes(); TInt aNbNodes = FromIdType<int>(myMesh->NbNodes());
PNodeInfo aNodeInfo = myMed->CrNodeInfo(aMeshInfo, aNbNodes, PNodeInfo aNodeInfo = myMed->CrNodeInfo(aMeshInfo, aNbNodes,
theMode, theSystem, theIsElemNum, theIsElemNames); theMode, theSystem, theIsElemNum, theIsElemNames);
@ -625,66 +625,66 @@ Driver_Mesh::Status DriverMED_W_SMESHDS_Mesh::Perform()
#endif #endif
aTElemTypeDatas.push_back( TElemTypeData(anEntity, aTElemTypeDatas.push_back( TElemTypeData(anEntity,
eBALL, eBALL,
nbElemInfo.NbBalls(), FromIdType<int>(nbElemInfo.NbBalls()),
SMDSAbs_Ball)); SMDSAbs_Ball));
#ifdef _ELEMENTS_BY_DIM_ #ifdef _ELEMENTS_BY_DIM_
anEntity = eARETE; anEntity = eARETE;
#endif #endif
aTElemTypeDatas.push_back( TElemTypeData(anEntity, aTElemTypeDatas.push_back( TElemTypeData(anEntity,
eSEG2, eSEG2,
nbElemInfo.NbEdges( ORDER_LINEAR ), FromIdType<int>(nbElemInfo.NbEdges( ORDER_LINEAR )),
SMDSAbs_Edge)); SMDSAbs_Edge));
aTElemTypeDatas.push_back( TElemTypeData(anEntity, aTElemTypeDatas.push_back( TElemTypeData(anEntity,
eSEG3, eSEG3,
nbElemInfo.NbEdges( ORDER_QUADRATIC ), FromIdType<int>(nbElemInfo.NbEdges( ORDER_QUADRATIC )),
SMDSAbs_Edge)); SMDSAbs_Edge));
#ifdef _ELEMENTS_BY_DIM_ #ifdef _ELEMENTS_BY_DIM_
anEntity = eFACE; anEntity = eFACE;
#endif #endif
aTElemTypeDatas.push_back( TElemTypeData(anEntity, aTElemTypeDatas.push_back( TElemTypeData(anEntity,
eTRIA3, eTRIA3,
nbElemInfo.NbTriangles( ORDER_LINEAR ), FromIdType<int>(nbElemInfo.NbTriangles( ORDER_LINEAR )),
SMDSAbs_Face)); SMDSAbs_Face));
aTElemTypeDatas.push_back( TElemTypeData(anEntity, aTElemTypeDatas.push_back( TElemTypeData(anEntity,
eTRIA6, eTRIA6,
nbElemInfo.NbTriangles( ORDER_QUADRATIC ) - FromIdType<int>(nbElemInfo.NbTriangles( ORDER_QUADRATIC ) -
nbElemInfo.NbBiQuadTriangles(), nbElemInfo.NbBiQuadTriangles()),
SMDSAbs_Face)); SMDSAbs_Face));
aTElemTypeDatas.push_back( TElemTypeData(anEntity, aTElemTypeDatas.push_back( TElemTypeData(anEntity,
eTRIA7, eTRIA7,
nbElemInfo.NbBiQuadTriangles(), FromIdType<int>(nbElemInfo.NbBiQuadTriangles()),
SMDSAbs_Face)); SMDSAbs_Face));
aTElemTypeDatas.push_back( TElemTypeData(anEntity, aTElemTypeDatas.push_back( TElemTypeData(anEntity,
eQUAD4, eQUAD4,
nbElemInfo.NbQuadrangles( ORDER_LINEAR ), FromIdType<int>(nbElemInfo.NbQuadrangles( ORDER_LINEAR )),
SMDSAbs_Face)); SMDSAbs_Face));
aTElemTypeDatas.push_back( TElemTypeData(anEntity, aTElemTypeDatas.push_back( TElemTypeData(anEntity,
eQUAD8, eQUAD8,
nbElemInfo.NbQuadrangles( ORDER_QUADRATIC ) - FromIdType<int>(nbElemInfo.NbQuadrangles( ORDER_QUADRATIC ) -
nbElemInfo.NbBiQuadQuadrangles(), nbElemInfo.NbBiQuadQuadrangles()),
SMDSAbs_Face)); SMDSAbs_Face));
aTElemTypeDatas.push_back( TElemTypeData(anEntity, aTElemTypeDatas.push_back( TElemTypeData(anEntity,
eQUAD9, eQUAD9,
nbElemInfo.NbBiQuadQuadrangles(), FromIdType<int>(nbElemInfo.NbBiQuadQuadrangles()),
SMDSAbs_Face)); SMDSAbs_Face));
if ( polyTypesSupported ) { if ( polyTypesSupported ) {
aTElemTypeDatas.push_back( TElemTypeData(anEntity, aTElemTypeDatas.push_back( TElemTypeData(anEntity,
ePOLYGONE, ePOLYGONE,
nbElemInfo.NbPolygons( ORDER_LINEAR ), FromIdType<int>(nbElemInfo.NbPolygons( ORDER_LINEAR )),
SMDSAbs_Face)); SMDSAbs_Face));
// we need one more loop on poly elements to count nb of their nodes // we need one more loop on poly elements to count nb of their nodes
aTElemTypeDatas.push_back( TElemTypeData(anEntity, aTElemTypeDatas.push_back( TElemTypeData(anEntity,
ePOLYGONE, ePOLYGONE,
nbElemInfo.NbPolygons( ORDER_LINEAR ), FromIdType<int>(nbElemInfo.NbPolygons( ORDER_LINEAR )),
SMDSAbs_Face)); SMDSAbs_Face));
aTElemTypeDatas.push_back( TElemTypeData(anEntity, aTElemTypeDatas.push_back( TElemTypeData(anEntity,
ePOLYGON2, ePOLYGON2,
nbElemInfo.NbPolygons( ORDER_QUADRATIC ), FromIdType<int>(nbElemInfo.NbPolygons( ORDER_QUADRATIC )),
SMDSAbs_Face)); SMDSAbs_Face));
// we need one more loop on QUAD poly elements to count nb of their nodes // we need one more loop on QUAD poly elements to count nb of their nodes
aTElemTypeDatas.push_back( TElemTypeData(anEntity, aTElemTypeDatas.push_back( TElemTypeData(anEntity,
ePOLYGON2, ePOLYGON2,
nbElemInfo.NbPolygons( ORDER_QUADRATIC ), FromIdType<int>(nbElemInfo.NbPolygons( ORDER_QUADRATIC )),
SMDSAbs_Face)); SMDSAbs_Face));
} }
#ifdef _ELEMENTS_BY_DIM_ #ifdef _ELEMENTS_BY_DIM_
@ -692,58 +692,58 @@ Driver_Mesh::Status DriverMED_W_SMESHDS_Mesh::Perform()
#endif #endif
aTElemTypeDatas.push_back( TElemTypeData(anEntity, aTElemTypeDatas.push_back( TElemTypeData(anEntity,
eTETRA4, eTETRA4,
nbElemInfo.NbTetras( ORDER_LINEAR ), FromIdType<int>(nbElemInfo.NbTetras( ORDER_LINEAR )),
SMDSAbs_Volume)); SMDSAbs_Volume));
aTElemTypeDatas.push_back( TElemTypeData(anEntity, aTElemTypeDatas.push_back( TElemTypeData(anEntity,
eTETRA10, eTETRA10,
nbElemInfo.NbTetras( ORDER_QUADRATIC ), FromIdType<int>(nbElemInfo.NbTetras( ORDER_QUADRATIC )),
SMDSAbs_Volume)); SMDSAbs_Volume));
aTElemTypeDatas.push_back( TElemTypeData(anEntity, aTElemTypeDatas.push_back( TElemTypeData(anEntity,
ePYRA5, ePYRA5,
nbElemInfo.NbPyramids( ORDER_LINEAR ), FromIdType<int>(nbElemInfo.NbPyramids( ORDER_LINEAR )),
SMDSAbs_Volume)); SMDSAbs_Volume));
aTElemTypeDatas.push_back( TElemTypeData(anEntity, aTElemTypeDatas.push_back( TElemTypeData(anEntity,
ePYRA13, ePYRA13,
nbElemInfo.NbPyramids( ORDER_QUADRATIC ), FromIdType<int>(nbElemInfo.NbPyramids( ORDER_QUADRATIC )),
SMDSAbs_Volume)); SMDSAbs_Volume));
aTElemTypeDatas.push_back( TElemTypeData(anEntity, aTElemTypeDatas.push_back( TElemTypeData(anEntity,
ePENTA6, ePENTA6,
nbElemInfo.NbPrisms( ORDER_LINEAR ), FromIdType<int>(nbElemInfo.NbPrisms( ORDER_LINEAR )),
SMDSAbs_Volume)); SMDSAbs_Volume));
aTElemTypeDatas.push_back( TElemTypeData(anEntity, aTElemTypeDatas.push_back( TElemTypeData(anEntity,
ePENTA15, ePENTA15,
nbElemInfo.NbQuadPrisms(), FromIdType<int>(nbElemInfo.NbQuadPrisms()),
SMDSAbs_Volume)); SMDSAbs_Volume));
aTElemTypeDatas.push_back( TElemTypeData(anEntity, aTElemTypeDatas.push_back( TElemTypeData(anEntity,
ePENTA18, ePENTA18,
nbElemInfo.NbBiQuadPrisms(), FromIdType<int>(nbElemInfo.NbBiQuadPrisms()),
SMDSAbs_Volume)); SMDSAbs_Volume));
aTElemTypeDatas.push_back( TElemTypeData(anEntity, aTElemTypeDatas.push_back( TElemTypeData(anEntity,
eHEXA8, eHEXA8,
nbElemInfo.NbHexas( ORDER_LINEAR ), FromIdType<int>(nbElemInfo.NbHexas( ORDER_LINEAR )),
SMDSAbs_Volume)); SMDSAbs_Volume));
aTElemTypeDatas.push_back( TElemTypeData(anEntity, aTElemTypeDatas.push_back( TElemTypeData(anEntity,
eHEXA20, eHEXA20,
nbElemInfo.NbHexas( ORDER_QUADRATIC )- FromIdType<int>(nbElemInfo.NbHexas( ORDER_QUADRATIC )-
nbElemInfo.NbTriQuadHexas(), nbElemInfo.NbTriQuadHexas()),
SMDSAbs_Volume)); SMDSAbs_Volume));
aTElemTypeDatas.push_back( TElemTypeData(anEntity, aTElemTypeDatas.push_back( TElemTypeData(anEntity,
eHEXA27, eHEXA27,
nbElemInfo.NbTriQuadHexas(), FromIdType<int>(nbElemInfo.NbTriQuadHexas()),
SMDSAbs_Volume)); SMDSAbs_Volume));
aTElemTypeDatas.push_back( TElemTypeData(anEntity, aTElemTypeDatas.push_back( TElemTypeData(anEntity,
eOCTA12, eOCTA12,
nbElemInfo.NbHexPrisms(), FromIdType<int>(nbElemInfo.NbHexPrisms()),
SMDSAbs_Volume)); SMDSAbs_Volume));
if ( polyTypesSupported ) { if ( polyTypesSupported ) {
aTElemTypeDatas.push_back( TElemTypeData(anEntity, aTElemTypeDatas.push_back( TElemTypeData(anEntity,
ePOLYEDRE, ePOLYEDRE,
nbElemInfo.NbPolyhedrons(), FromIdType<int>(nbElemInfo.NbPolyhedrons()),
SMDSAbs_Volume)); SMDSAbs_Volume));
// we need one more loop on poly elements to count nb of their nodes // we need one more loop on poly elements to count nb of their nodes
aTElemTypeDatas.push_back( TElemTypeData(anEntity, aTElemTypeDatas.push_back( TElemTypeData(anEntity,
ePOLYEDRE, ePOLYEDRE,
nbElemInfo.NbPolyhedrons(), FromIdType<int>(nbElemInfo.NbPolyhedrons()),
SMDSAbs_Volume)); SMDSAbs_Volume));
} }
@ -822,13 +822,13 @@ Driver_Mesh::Status DriverMED_W_SMESHDS_Mesh::Perform()
for(TInt iNode = 0; iNode < aNbNodes; iNode++) { for(TInt iNode = 0; iNode < aNbNodes; iNode++) {
const SMDS_MeshElement* aNode = anElem->GetNode( iNode ); const SMDS_MeshElement* aNode = anElem->GetNode( iNode );
#ifdef _EDF_NODE_IDS_ #ifdef _EDF_NODE_IDS_
aTConnSlice[ iNode ] = aNodeIdMap[aNode->GetID()]; aTConnSlice[ iNode ] = aNodeIdMap[FromIdType<int>(aNode->GetID())];
#else #else
aTConnSlice[ iNode ] = aNode->GetID(); aTConnSlice[ iNode ] = aNode->GetID();
#endif #endif
} }
// element number // element number
aPolygoneInfo->SetElemNum( iElem, anElem->GetID() ); aPolygoneInfo->SetElemNum( iElem, FromIdType<int>(anElem->GetID()) );
// family number // family number
int famNum = getFamilyId( anElemFamMap, anElem, defaultFamilyId ); int famNum = getFamilyId( anElemFamMap, anElem, defaultFamilyId );
@ -896,14 +896,14 @@ Driver_Mesh::Status DriverMED_W_SMESHDS_Mesh::Perform()
while ( nodeIt->more() ) { while ( nodeIt->more() ) {
const SMDS_MeshElement* aNode = nodeIt->next(); const SMDS_MeshElement* aNode = nodeIt->next();
#ifdef _EDF_NODE_IDS_ #ifdef _EDF_NODE_IDS_
conn[ iNode ] = aNodeIdMap[aNode->GetID()]; conn[ iNode ] = aNodeIdMap[FromIdType<int>(aNode->GetID())];
#else #else
conn[ iNode ] = aNode->GetID(); conn[ iNode ] = aNode->GetID();
#endif #endif
++iNode; ++iNode;
} }
// element number // element number
aPolyhInfo->SetElemNum( iElem, anElem->GetID() ); aPolyhInfo->SetElemNum( iElem, FromIdType<int>(anElem->GetID()) );
// family number // family number
int famNum = getFamilyId( anElemFamMap, anElem, defaultFamilyId ); int famNum = getFamilyId( anElemFamMap, anElem, defaultFamilyId );
@ -930,12 +930,12 @@ Driver_Mesh::Status DriverMED_W_SMESHDS_Mesh::Perform()
// connectivity // connectivity
const SMDS_MeshElement* aNode = anElem->GetNode( 0 ); const SMDS_MeshElement* aNode = anElem->GetNode( 0 );
#ifdef _EDF_NODE_IDS_ #ifdef _EDF_NODE_IDS_
(*aBallInfo->myConn)[ iElem ] = aNodeIdMap[aNode->GetID()]; (*aBallInfo->myConn)[ iElem ] = aNodeIdMap[FromIdType<int>(aNode->GetID())];
#else #else
(*aBallInfo->myConn)[ iElem ] = aNode->GetID(); (*aBallInfo->myConn)[ iElem ] = aNode->GetID();
#endif #endif
// element number // element number
aBallInfo->SetElemNum( iElem, anElem->GetID() ); aBallInfo->SetElemNum( iElem, FromIdType<int>(anElem->GetID()) );
// diameter // diameter
aBallInfo->myDiameters[ iElem ] = aBallInfo->myDiameters[ iElem ] =
@ -978,13 +978,13 @@ Driver_Mesh::Status DriverMED_W_SMESHDS_Mesh::Perform()
for (TInt iNode = 0; iNode < aNbNodes; iNode++) { for (TInt iNode = 0; iNode < aNbNodes; iNode++) {
const SMDS_MeshElement* aNode = anElem->GetNode( iNode ); const SMDS_MeshElement* aNode = anElem->GetNode( iNode );
#ifdef _EDF_NODE_IDS_ #ifdef _EDF_NODE_IDS_
aTConnSlice[ iNode ] = aNodeIdMap[aNode->GetID()]; aTConnSlice[ iNode ] = aNodeIdMap[FromIdType<int>(aNode->GetID())];
#else #else
aTConnSlice[ iNode ] = aNode->GetID(); aTConnSlice[ iNode ] = aNode->GetID();
#endif #endif
} }
// element number // element number
aCellInfo->SetElemNum( iElem, anElem->GetID() ); aCellInfo->SetElemNum( iElem, FromIdType<int>(anElem->GetID()) );
// family number // family number
int famNum = getFamilyId( anElemFamMap, anElem, defaultFamilyId ); int famNum = getFamilyId( anElemFamMap, anElem, defaultFamilyId );

10
src/DriverUNV/DriverUNV_W_SMDS_Mesh.cxx
View File

@ -113,7 +113,7 @@ Driver_Mesh::Status DriverUNV_W_SMDS_Mesh::Perform()
{ {
const SMDS_MeshNode* aNode = aNodesIter->next(); const SMDS_MeshNode* aNode = aNodesIter->next();
if ( nodeLabelByID.empty() ) if ( nodeLabelByID.empty() )
aRec.node_labels.push_back( aNode->GetID() ); aRec.node_labels.push_back( FromIdType<int>(aNode->GetID()) );
else else
aRec.node_labels.push_back( nodeLabelByID[ aNode->GetID() ]); aRec.node_labels.push_back( nodeLabelByID[ aNode->GetID() ]);
} }
@ -137,7 +137,7 @@ Driver_Mesh::Status DriverUNV_W_SMDS_Mesh::Perform()
for ( aRec.node_labels.clear(); aNodesIter->more(); ) { for ( aRec.node_labels.clear(); aNodesIter->more(); ) {
const SMDS_MeshNode* aNode = aNodesIter->next(); const SMDS_MeshNode* aNode = aNodesIter->next();
if ( nodeLabelByID.empty() ) if ( nodeLabelByID.empty() )
aRec.node_labels.push_back( aNode->GetID() ); aRec.node_labels.push_back( FromIdType<int>(aNode->GetID()) );
else else
aRec.node_labels.push_back( nodeLabelByID[ aNode->GetID() ]); aRec.node_labels.push_back( nodeLabelByID[ aNode->GetID() ]);
} }
@ -195,7 +195,7 @@ Driver_Mesh::Status DriverUNV_W_SMDS_Mesh::Perform()
{ {
const SMDS_MeshElement* aNode = aNodesIter->next(); const SMDS_MeshElement* aNode = aNodesIter->next();
if ( nodeLabelByID.empty() ) if ( nodeLabelByID.empty() )
aRec.node_labels.push_back( aNode->GetID() ); aRec.node_labels.push_back( FromIdType<int>(aNode->GetID()) );
else else
aRec.node_labels.push_back( nodeLabelByID[ aNode->GetID() ]); aRec.node_labels.push_back( nodeLabelByID[ aNode->GetID() ]);
} }
@ -226,7 +226,7 @@ Driver_Mesh::Status DriverUNV_W_SMDS_Mesh::Perform()
while ( aIter->more() ) { while ( aIter->more() ) {
const SMDS_MeshElement* aNode = aIter->next(); const SMDS_MeshElement* aNode = aIter->next();
if ( nodeLabelByID.empty() ) if ( nodeLabelByID.empty() )
aRec.NodeList.push_back( aNode->GetID() ); aRec.NodeList.push_back( FromIdType<int>(aNode->GetID()) );
else else
aRec.NodeList.push_back( nodeLabelByID[ aNode->GetID() ]); aRec.NodeList.push_back( nodeLabelByID[ aNode->GetID() ]);
} }
@ -236,7 +236,7 @@ Driver_Mesh::Status DriverUNV_W_SMDS_Mesh::Perform()
while ( aIter->more() ) { while ( aIter->more() ) {
const SMDS_MeshElement* aElem = aIter->next(); const SMDS_MeshElement* aElem = aIter->next();
if ( elemLabelByID.empty() ) if ( elemLabelByID.empty() )
aRec.ElementList.push_back( aElem->GetID() ); aRec.ElementList.push_back( FromIdType<int>(aElem->GetID()) );
else else
aRec.ElementList.push_back( elemLabelByID[ aElem->GetID() ]); aRec.ElementList.push_back( elemLabelByID[ aElem->GetID() ]);
} }