X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FDriverCGNS%2FDriverCGNS_Read.cxx;h=86aae7294094c0446d6912ef726e0c4c214edd89;hb=b09372829929f8f561495d6c16527134971a1909;hp=7786b09d4a62cd858a5c69cef8b4bac91f53bfb2;hpb=a274ade365bd0f0e19d56c577acc4a13aa1972a7;p=modules%2Fsmesh.git diff --git a/src/DriverCGNS/DriverCGNS_Read.cxx b/src/DriverCGNS/DriverCGNS_Read.cxx index 7786b09d4..86aae7294 100644 --- a/src/DriverCGNS/DriverCGNS_Read.cxx +++ b/src/DriverCGNS/DriverCGNS_Read.cxx @@ -33,6 +33,8 @@ #include "SMESH_Comment.hxx" #include "SMESH_TypeDefs.hxx" +#include + #include #include @@ -59,9 +61,9 @@ namespace struct TZoneData { int _id; - int _nodeIdShift; // nb nodes in previously read zones - int _elemIdShift; // nb faces in previously read zones - int _nbNodes, _nbElems; + smIdType _nodeIdShift; // nb nodes in previously read zones + smIdType _elemIdShift; // nb faces in previously read zones + smIdType _nbNodes, _nbElems; int _meshDim; int _sizeX, _sizeY, _sizeZ, _nbCells; // structured cgsize_t _sizes[NB_ZONE_SIZE_VAL]; @@ -544,12 +546,16 @@ namespace ids[14],ids[13],ids[19],ids[18],ids[17],ids[16], ids[20],ids[24],ids[23],ids[22],ids[21],ids[25],ids[26], ID ); } - SMDS_MeshElement* add_NGON(cgsize_t* ids, SMESHDS_Mesh* mesh, int ID) + SMDS_MeshElement* add_NGON(cgsize_t* ids, int nbNodes, SMESHDS_Mesh* mesh, int ID) { - vector idVec( ids[0] ); +#if CGNS_VERSION < 4000 + nbNodes = ids[0]; + ++ids; +#endif + vector idVec( ids[0] ); for ( int i = 0; i < ids[0]; ++i ) - idVec[ i ] = (int) ids[ i + 1]; - return mesh->AddPolygonalFaceWithID( idVec, ID ); + idVec[ i ] = ToSmIdType( ids[ i + 1]); + return mesh->AddPolygonalFaceWithID( idVec, ToSmIdType(ID) ); } typedef SMDS_MeshElement* (* PAddElemFun) (cgsize_t* ids, SMESHDS_Mesh* mesh, int ID); @@ -585,7 +591,7 @@ namespace funVec[ CGNS_ENUMV( HEXA_8 )] = add_HEXA_8 ; funVec[ CGNS_ENUMV( HEXA_20 )] = add_HEXA_20 ; funVec[ CGNS_ENUMV( HEXA_27 )] = add_HEXA_27 ; - funVec[ CGNS_ENUMV( NGON_n )] = add_NGON ; + //funVec[ CGNS_ENUMV( NGON_n )] = add_NGON ; } return &funVec[0]; } @@ -854,16 +860,34 @@ Driver_Mesh::Status DriverCGNS_Read::Perform() addMessage( cg_get_error() ); continue; } - vector< cgsize_t > elemData( eDataSize ); - if ( cg_elements_read( _fn, cgnsBase, iZone, iSec, &elemData[0], NULL ) != CG_OK ) + vector< cgsize_t > elemData( eDataSize ), polyOffset; +#if CGNS_VERSION >= 4000 + if ( elemType == CGNS_ENUMV( MIXED ) || + elemType == CGNS_ENUMV( NGON_n ) || + elemType == CGNS_ENUMV( NFACE_n )) { - addMessage( cg_get_error() ); - continue; + polyOffset.resize( end - start + 2 ); + if ( cg_poly_elements_read( _fn, cgnsBase, iZone, iSec, + elemData.data(), polyOffset.data(), NULL ) != CG_OK ) + { + addMessage( cg_get_error() ); + continue; + } + } + else +#endif + { + if ( cg_elements_read( _fn, cgnsBase, iZone, iSec, elemData.data(), NULL ) != CG_OK ) + { + addMessage( cg_get_error() ); + continue; + } } // store elements MESSAGE(" store elements"); int pos = 0, cgnsNbNodes = 0, elemID = start + zone._elemIdShift; + size_t iElem = 0; cg_npe( elemType, &cgnsNbNodes ); // get nb nodes by element type curAddElemFun = addElemFuns[ elemType ]; SMDS_MeshElement* newElem = 0; @@ -885,17 +909,26 @@ Driver_Mesh::Status DriverCGNS_Read::Perform() { if ( currentType == CGNS_ENUMV( NFACE_n )) // polyhedron { - //ElementConnectivity = Nfaces1, Face11, Face21, ... FaceN1, - // Nfaces2, Face12, Face22, ... FaceN2, - // ... - // NfacesM, Face1M, Face2M, ... FaceNM - const int nbFaces = elemData[ pos++ ]; + int nbFaces = 0; + if ( polyOffset.empty() ) + //ElementConnectivity = Nfaces1, Face11, Face21, ... FaceN1, + // Nfaces2, Face12, Face22, ... FaceN2, + // ... + // NfacesM, Face1M, Face2M, ... FaceNM + nbFaces = elemData[ pos++ ]; + else // CGNS_VERSION >= 4000 + // ElementConnectivity = Face11, Face21, ... FaceN1, + // Face12, Face22, ... FaceN2, + // ... + // Face1M, Face2M, ... FaceNM + nbFaces = polyOffset[ iElem + 1 ] - polyOffset[ iElem ]; + vector quantities( nbFaces ); vector nodes, faceNodes; nodes.reserve( nbFaces * 4 ); for ( int iF = 0; iF < nbFaces; ++iF ) { - const int faceID = std::abs( elemData[ pos++ ]) + zone._elemIdShift; + const int faceID = std::abs( elemData[ pos++ ]) + zone._elemIdShift; if (( face = myMesh->FindElement( faceID )) && face->GetType() == SMDSAbs_Face ) { const bool reverse = ( elemData[ pos-1 ] < 0 ); @@ -924,14 +957,23 @@ Driver_Mesh::Status DriverCGNS_Read::Perform() } else if ( currentType == CGNS_ENUMV( NGON_n )) // polygon { - // ElementConnectivity = Nnodes1, Node11, Node21, ... NodeN1, - // Nnodes2, Node12, Node22, ... NodeN2, - // ... - // NnodesM, Node1M, Node2M, ... NodeNM - const int nbNodes = elemData[ pos ]; - zone.ReplaceNodes( &elemData[pos+1], nbNodes, zone._nodeIdShift ); - newElem = add_NGON( &elemData[pos ], myMesh, elemID ); - pos += nbNodes + 1; + int nbNodes; + if ( polyOffset.empty() ) + // ElementConnectivity = Nnodes1, Node11, Node21, ... NodeN1, + // Nnodes2, Node12, Node22, ... NodeN2, + // ... + // NnodesM, Node1M, Node2M, ... NodeNM + nbNodes = elemData[ pos ]; + else // CGNS_VERSION >= 4000 + // ElementConnectivity = Node11, Node21, ... NodeN1, + // Node12, Node22, ... NodeN2, + // ... + // Node1M, Node2M, ... NodeNM + nbNodes = polyOffset[ iElem + 1 ] - polyOffset[ iElem ]; + + zone.ReplaceNodes( &elemData[ pos + polyOffset.empty()], nbNodes, zone._nodeIdShift ); + newElem = add_NGON( &elemData[ pos ], nbNodes, myMesh, elemID ); + pos += nbNodes + polyOffset.empty(); } } else // standard elements @@ -942,6 +984,7 @@ Driver_Mesh::Status DriverCGNS_Read::Perform() nbNotSuppElem += int( newElem && newElem->NbNodes() != cgnsNbNodes ); } elemID++; + iElem++; } // loop on elemData } // loop on cgns sections @@ -960,7 +1003,7 @@ Driver_Mesh::Status DriverCGNS_Read::Perform() // ------------------------------------------- // Read Boundary Conditions into SMESH groups // ------------------------------------------- - + MESSAGE(" read Boundary Conditions"); int nbBC = 0; if ( cg_nbocos( _fn, cgnsBase, iZone, &nbBC) == CG_OK ) @@ -1131,7 +1174,7 @@ Driver_Mesh::Status DriverCGNS_Read::Perform() case 2: addElemFun = & add_QUAD_4; break; case 3: addElemFun = & add_HEXA_8; break; } - int elemID = meshInfo.NbElements(); + smIdType elemID = meshInfo.NbElements(); const SMDS_MeshElement* elem = 0; for ( size_t i = 0; i < ids.size(); i += nbElemNodes ) {