-// Copyright (C) 2007-2020 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2022 CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
#include "SMESH_Comment.hxx"
#include "SMESH_TypeDefs.hxx"
+#include <smIdType.hxx>
+
#include <gp_XYZ.hxx>
#include <cgnslib.h>
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];
ids[2] = ids[0] + _sizeX + 1;
ids[3] = ids[0] + ( k==_sizeZ ? _sizeX : 1);
}
- void IEdgeNodes( int i, int j, int k, cgsize_t* ids ) const // edge perpendiculaire to X (2D)
+ void IEdgeNodes( int i, int j, int /*k*/, cgsize_t* ids ) const // edge perpendiculaire to X (2D)
{
ids[0] = NodeID( i, j, 0 );
ids[1] = ids[0] + _sizeX;
}
- void JEdgeNodes( int i, int j, int k, cgsize_t* ids ) const
+ void JEdgeNodes( int i, int j, int /*k*/, cgsize_t* ids ) const
{
ids[0] = NodeID( i, j, 0 );
ids[1] = ids[0] + 1;
int _beg[3], _end[3], _cur[3], _dir[3], _dim;
bool _more;
public:
- TPointRangeIterator( const cgsize_t* range, int dim ):_dim(dim)
+ TPointRangeIterator( const cgsize_t* range, int dim ):
+ _beg{0,0,0}, _end{0,0,0}, _cur{0,0,0}, _dir{0,0,0}, _dim(dim), _more(false)
{
- _more = false;
for ( int i = 0; i < dim; ++i )
{
_beg[i] = range[i];
if ( _end[i] - _beg[i] )
_more = true;
}
-// for ( int i = dim; i < 3; ++i )
-// _cur[i] = _beg[i] = _end[i] = _dir[i] = 0;
}
bool More() const
{
*/
//================================================================================
- bool isEqualNodes( const int* nIds1, const int* nIds2, int nbNodes, SMESHDS_Mesh* mesh )
+ bool isEqualNodes( const cgsize_t* nIds1, const cgsize_t* nIds2, size_t nbNodes,
+ SMESHDS_Mesh* mesh )
{
if ( nbNodes > 0 )
{
}
// check if range and donorRange describe the same nodes
{
- int ids1[2], ids2[2], nbN = 0;
+ cgsize_t ids1[2], ids2[2], nbN = 0;
TPointRangeIterator rangeIt1bis( range, _meshDim );
index1 = rangeIt1bis.Next();
index2 = T * ( index1 - begin1 ) + begin2;
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<int> idVec( ids[0] );
- for ( int i = 0; i < ids[0]; ++i )
- idVec[ i ] = (int) ids[ i + 1];
- return mesh->AddPolygonalFaceWithID( idVec, ID );
+#if CGNS_VERSION < 4000
+ nbNodes = ids[0];
+ ++ids;
+#endif
+ vector<smIdType> idVec( nbNodes );
+ for ( int i = 0; i < nbNodes; ++i )
+ idVec[ i ] = ToSmIdType( ids[ i ]);
+ return mesh->AddPolygonalFaceWithID( idVec, ToSmIdType(ID) );
}
typedef SMDS_MeshElement* (* PAddElemFun) (cgsize_t* ids, SMESHDS_Mesh* mesh, int ID);
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];
}
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;
const SMDS_MeshElement* face;
+ vector<int> quantities;
+ vector<const SMDS_MeshNode*> nodes, faceNodes;
while ( pos < eDataSize )
{
{
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++ ];
- vector<int> quantities( nbFaces );
- vector<const SMDS_MeshNode*> nodes, faceNodes;
- nodes.reserve( nbFaces * 4 );
+ 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 ];
+
+ quantities.resize( nbFaces ); quantities.back() = 0;
+ nodes.clear(); 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 );
}
else {
polyhedError = true;
+ pos += nbFaces - iF - 1;
break;
}
}
}
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
nbNotSuppElem += int( newElem && newElem->NbNodes() != cgnsNbNodes );
}
elemID++;
+ iElem++;
} // loop on elemData
} // loop on cgns sections
// -------------------------------------------
// Read Boundary Conditions into SMESH groups
// -------------------------------------------
-
+
MESSAGE(" read Boundary Conditions");
int nbBC = 0;
if ( cg_nbocos( _fn, cgnsBase, iZone, &nbBC) == CG_OK )
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 )
{
