X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FDriverCGNS%2FDriverCGNS_Read.cxx;h=7786b09d4a62cd858a5c69cef8b4bac91f53bfb2;hp=cf4709edbdbc27d9adbe8c1656e5a1c2412a5f38;hb=a274ade365bd0f0e19d56c577acc4a13aa1972a7;hpb=251f8c052dd12dd29922210dc901b295fe999a0e diff --git a/src/DriverCGNS/DriverCGNS_Read.cxx b/src/DriverCGNS/DriverCGNS_Read.cxx index cf4709edb..7786b09d4 100644 --- a/src/DriverCGNS/DriverCGNS_Read.cxx +++ b/src/DriverCGNS/DriverCGNS_Read.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2021 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 @@ -22,6 +22,8 @@ // File : DriverCGNS_Read.cxx // Created : Thu Jun 30 10:33:31 2011 // Author : Edward AGAPOV (eap) +//#define _DEBUG_ +#include #include "DriverCGNS_Read.hxx" @@ -37,6 +39,7 @@ #include + #if CGNS_VERSION < 3100 # define cgsize_t int #endif @@ -131,12 +134,12 @@ namespace 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; @@ -162,9 +165,9 @@ namespace 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]; @@ -175,8 +178,6 @@ namespace 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 { @@ -234,7 +235,7 @@ namespace dist2 = ( nn1[1] - nn2[1] ).Modulus(); tol = 1e-5 * ( nn1[0] - nn1[1] ).Modulus(); } - return ( dist1 < tol & dist2 < tol ); + return ( dist1 < tol && dist2 < tol ); } return false; } @@ -451,7 +452,7 @@ namespace if ( !_nodeReplacementMap.empty() ) { map< int, int >::const_iterator it, end = _nodeReplacementMap.end(); - for ( size_t i = 0; i < nbIds; ++i ) + for ( int i = 0; i < nbIds; ++i ) if (( it = _nodeReplacementMap.find( ids[i] + idShift)) != end ) ids[i] = it->second; else @@ -459,7 +460,7 @@ namespace } else if ( idShift ) { - for ( size_t i = 0; i < nbIds; ++i ) + for ( int i = 0; i < nbIds; ++i ) ids[i] += idShift; } } @@ -633,6 +634,7 @@ namespace Driver_Mesh::Status DriverCGNS_Read::Perform() { + MESSAGE("DriverCGNS_Read::Perform"); myErrorMessages.clear(); Status aResult; @@ -642,6 +644,7 @@ Driver_Mesh::Status DriverCGNS_Read::Perform() // read nb of meshes (CGNSBase_t) if ( myMeshId < 0 || myMeshId >= GetNbMeshes(aResult)) return addMessage( SMESH_Comment("Invalid mesh index :") << myMeshId ); + MESSAGE("NbMeshes: " << GetNbMeshes(aResult)); // read a name and a dimension of the mesh const int cgnsBase = myMeshId + 1; @@ -655,6 +658,8 @@ Driver_Mesh::Status DriverCGNS_Read::Perform() << " in mesh '" << meshName << "'"); myMeshName = meshName; + MESSAGE("myMeshName: " << myMeshName); + // read nb of domains (Zone_t) in the mesh int nbZones = 0; @@ -663,6 +668,7 @@ Driver_Mesh::Status DriverCGNS_Read::Perform() if ( nbZones < 1 ) return addMessage( SMESH_Comment("Empty mesh: '") << meshName << "'"); + MESSAGE("nbZones: " << nbZones); // read the domains (zones) // ------------------------ @@ -686,6 +692,7 @@ Driver_Mesh::Status DriverCGNS_Read::Perform() zone._nodeIdShift = meshInfo.NbNodes(); zone._elemIdShift = meshInfo.NbElements(); zone.SetSizeAndDim( sizes, meshDim ); + MESSAGE(" zone name: " << name); // mesh type of the zone if ( cg_zone_type ( _fn, cgnsBase, iZone, &zone._type) != CG_OK) { @@ -696,7 +703,10 @@ Driver_Mesh::Status DriverCGNS_Read::Perform() switch ( zone._type ) { case CGNS_ENUMV( Unstructured ): + MESSAGE(" zone type: unstructured"); + break; case CGNS_ENUMV( Structured ): + MESSAGE(" zone type: structured"); break; case CGNS_ENUMV( ZoneTypeNull ): addMessage( "Meshes with ZoneTypeNull are not supported"); @@ -712,7 +722,7 @@ Driver_Mesh::Status DriverCGNS_Read::Perform() // ----------- // Read nodes // ----------- - + MESSAGE(" Read nodes"); if ( cg_ncoords( _fn, cgnsBase, iZone, &spaceDim) != CG_OK ) { addMessage( cg_get_error() ); continue; @@ -724,6 +734,7 @@ Driver_Mesh::Status DriverCGNS_Read::Perform() } // read coordinates + MESSAGE(" Read coordinates"); cgsize_t rmin[3] = {1,1,1}; // range of nodes to read cgsize_t rmax[3] = {1,1,1}; int nbNodes = rmax[0] = zone._sizes[0]; @@ -755,6 +766,7 @@ Driver_Mesh::Status DriverCGNS_Read::Perform() coords[ c-1 ].resize( nbNodes, 0.0 ); // create nodes + MESSAGE(" create nodes"); try { for ( int i = 0; i < nbNodes; ++i ) myMesh->AddNodeWithID( coords[0][i], coords[1][i], coords[2][i], i+1+zone._nodeIdShift ); @@ -766,7 +778,7 @@ Driver_Mesh::Status DriverCGNS_Read::Perform() } // Read connectivity between zones. Nodes of the zone interface will be - // replaced withing the zones read later + // replaced within the zones read later string err = zone.ReadZonesConnection( _fn, cgnsBase, zonesByName, myMesh ); if ( !err.empty() ) addMessage( err ); @@ -774,6 +786,7 @@ Driver_Mesh::Status DriverCGNS_Read::Perform() // -------------- // Read elements // -------------- + MESSAGE(" read elements"); if ( zone.IsStructured()) { int nbI = zone._sizeX - 1, nbJ = zone._sizeY - 1, nbK = zone._sizeZ - 1; @@ -826,12 +839,14 @@ Driver_Mesh::Status DriverCGNS_Read::Perform() // read element data + MESSAGE(" read element data"); CGNS_ENUMT( ElementType_t ) elemType; cgsize_t start, end; // range of ids of elements of a zone cgsize_t eDataSize = 0; int nbBnd, parent_flag; for ( int iSec = 1; iSec <= nbSections; ++iSec ) { + MESSAGE(" section " << iSec << " of " << nbSections); if ( cg_section_read( _fn, cgnsBase, iZone, iSec, name, &elemType, &start, &end, &nbBnd, &parent_flag) != CG_OK || cg_ElementDataSize( _fn, cgnsBase, iZone, iSec, &eDataSize ) != CG_OK ) @@ -847,6 +862,7 @@ Driver_Mesh::Status DriverCGNS_Read::Perform() } // store elements + MESSAGE(" store elements"); int pos = 0, cgnsNbNodes = 0, elemID = start + zone._elemIdShift; cg_npe( elemType, &cgnsNbNodes ); // get nb nodes by element type curAddElemFun = addElemFuns[ elemType ]; @@ -884,7 +900,7 @@ Driver_Mesh::Status DriverCGNS_Read::Perform() { const bool reverse = ( elemData[ pos-1 ] < 0 ); const int iQuad = face->IsQuadratic() ? 1 : 0; - SMDS_ElemIteratorPtr nIter = face->interlacedNodesElemIterator(); + SMDS_NodeIteratorPtr nIter = face->interlacedNodesIterator(); faceNodes.assign( SMDS_MeshElement::iterator( nIter ), SMDS_MeshElement::iterator()); if ( iQuad && reverse ) @@ -944,6 +960,8 @@ 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 ) { @@ -952,14 +970,17 @@ Driver_Mesh::Status DriverCGNS_Read::Perform() CGNS_ENUMT( DataType_t ) normDataType; cgsize_t nbPnt, normFlag; int normIndex[3], nbDS; + MESSAGE(" nbBC: " << nbBC); for ( int iBC = 1; iBC <= nbBC; ++iBC ) { + MESSAGE(" iBC: " << iBC); if ( cg_boco_info( _fn, cgnsBase, iZone, iBC, name, &bcType, &psType, &nbPnt, normIndex, &normFlag, &normDataType, &nbDS ) != CG_OK ) { addMessage( cg_get_error() ); continue; } + MESSAGE(" iBC info OK: " << iBC); vector< cgsize_t > ids( nbPnt * zone.IndexSize() ); CGNS_ENUMT( GridLocation_t ) location; if ( cg_boco_read( _fn, cgnsBase, iZone, iBC, &ids[0], NULL ) != CG_OK || @@ -1022,7 +1043,7 @@ Driver_Mesh::Status DriverCGNS_Read::Perform() if ( zone.IsStructured() ) { int axis = 0; // axis perpendiculaire to which boundary elements are oriented - if ( ids.size() >= meshDim * 2 ) + if ( (int) ids.size() >= meshDim * 2 ) { for ( ; axis < meshDim; ++axis ) if ( ids[axis] - ids[axis+meshDim] == 0 ) @@ -1050,14 +1071,14 @@ Driver_Mesh::Status DriverCGNS_Read::Perform() PGetNodesFun getNodesFun = 0; if ( elemType == SMDSAbs_Face && meshDim == 3 ) switch ( axis ) { - case 0: getNodesFun = & TZoneData::IFaceNodes; - case 1: getNodesFun = & TZoneData::JFaceNodes; - case 2: getNodesFun = & TZoneData::KFaceNodes; + case 0: getNodesFun = & TZoneData::IFaceNodes; break; + case 1: getNodesFun = & TZoneData::JFaceNodes; break; + case 2: getNodesFun = & TZoneData::KFaceNodes; break; } else if ( elemType == SMDSAbs_Edge && meshDim == 2 ) switch ( axis ) { - case 0: getNodesFun = & TZoneData::IEdgeNodes; - case 1: getNodesFun = & TZoneData::JEdgeNodes; + case 0: getNodesFun = & TZoneData::IEdgeNodes; break; + case 1: getNodesFun = & TZoneData::JEdgeNodes; break; } if ( !getNodesFun ) { @@ -1080,14 +1101,14 @@ Driver_Mesh::Status DriverCGNS_Read::Perform() PGetNodesFun getNodesFun = 0; if ( elemType == SMDSAbs_Face ) switch ( axis ) { - case 0: getNodesFun = & TZoneData::IFaceNodes; - case 1: getNodesFun = & TZoneData::JFaceNodes; - case 2: getNodesFun = & TZoneData::KFaceNodes; + case 0: getNodesFun = & TZoneData::IFaceNodes; break; + case 1: getNodesFun = & TZoneData::JFaceNodes; break; + case 2: getNodesFun = & TZoneData::KFaceNodes; break; } else if ( elemType == SMDSAbs_Edge && meshDim == 2 ) switch ( axis ) { - case 0: getNodesFun = & TZoneData::IEdgeNodes; - case 1: getNodesFun = & TZoneData::JEdgeNodes; + case 0: getNodesFun = & TZoneData::IEdgeNodes; break; + case 1: getNodesFun = & TZoneData::JEdgeNodes; break; } if ( !getNodesFun ) { @@ -1106,9 +1127,9 @@ Driver_Mesh::Status DriverCGNS_Read::Perform() PAddElemFun addElemFun = 0; switch ( meshDim ) { - case 1: addElemFun = & add_BAR_2; - case 2: addElemFun = & add_QUAD_4; - case 3: addElemFun = & add_HEXA_8; + case 1: addElemFun = & add_BAR_2; break; + case 2: addElemFun = & add_QUAD_4; break; + case 3: addElemFun = & add_HEXA_8; break; } int elemID = meshInfo.NbElements(); const SMDS_MeshElement* elem = 0; @@ -1127,7 +1148,7 @@ Driver_Mesh::Status DriverCGNS_Read::Perform() if ( psType == CGNS_ENUMV( PointRange ) && ids.size() == 2 ) { - for ( size_t i = ids[0]; i <= ids[1]; ++i ) + for ( cgsize_t i = ids[0]; i <= ids[1]; ++i ) if ( const SMDS_MeshElement* e = myMesh->FindElement( i )) groupDS.Add( e ); } @@ -1145,12 +1166,62 @@ Driver_Mesh::Status DriverCGNS_Read::Perform() } // loop on BCs of the zone } - else + else addMessage( cg_get_error() ); + + + MESSAGE(" read flow solutions"); + int nsols = 0; + if ( cg_nsols( _fn, cgnsBase, iZone, &nsols) == CG_OK ) { - addMessage( cg_get_error() ); + MESSAGE(" nb flow solutions: " << nsols); } + else addMessage( cg_get_error() ); + + MESSAGE(" read discrete data"); + int nbdiscrete = 0; + if ( cg_ndiscrete( _fn, cgnsBase, iZone, &nbdiscrete) == CG_OK ) + { + MESSAGE(" nb discrete data: " << nbdiscrete); + char nameDiscrete[CGNS_NAME_SIZE]; + for (int idisc = 1; idisc <= nbdiscrete; idisc++) + { + if ( cg_discrete_read( _fn, cgnsBase, iZone, idisc, nameDiscrete) == CG_OK ) + { + MESSAGE(" discrete data #"<< idisc << " name: " << nameDiscrete); + PointSetType_t ptset_type; + cgsize_t npnts; + if ( cg_discrete_ptset_info( _fn, cgnsBase, iZone, idisc, &ptset_type, &npnts) == CG_OK ) + { + MESSAGE(" discrete data #"<< idisc << " npnts: " << npnts); + } + else addMessage( cg_get_error() ); + } + else addMessage( cg_get_error() ); + } + } + else addMessage( cg_get_error() ); + + + MESSAGE(" read subregions"); + int nbSubrg = 0; + if ( cg_nsubregs( _fn, cgnsBase, iZone, &nbSubrg) == CG_OK ) + { + MESSAGE(" nb subregions: " << nbSubrg); + } + else addMessage( cg_get_error() ); + + MESSAGE(" end zone"); } // loop on the zones of a mesh + MESSAGE("read families"); + int nbFam = 0; + if ( cg_nfamilies( _fn, cgnsBase, &nbFam) == CG_OK ) + { + MESSAGE("nb families: " << nbFam); + } + else addMessage( cg_get_error() ); + + // ------------------------------------------------------------------------ // Make groups for multiple zones and remove free nodes at zone interfaces @@ -1158,6 +1229,7 @@ Driver_Mesh::Status DriverCGNS_Read::Perform() map< string, TZoneData >::iterator nameZoneIt = zonesByName.begin(); for ( ; nameZoneIt != zonesByName.end(); ++nameZoneIt ) { + MESSAGE("nameZone: " << nameZoneIt->first); TZoneData& zone = nameZoneIt->second; if ( zone._nbElems == 0 ) continue; if ( zone._nbElems == meshInfo.NbElements() ) break; // there is only one non-empty zone @@ -1184,6 +1256,9 @@ Driver_Mesh::Status DriverCGNS_Read::Perform() aResult = myErrorMessages.empty() ? DRS_OK : DRS_WARN_SKIP_ELEM; + myMesh->Modified(); + myMesh->CompactMesh(); + MESSAGE("end perform"); return aResult; }