X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMDS%2FSMDS_MeshInfo.hxx;h=a30ec9a7e3eed2e3e8a2a65163a1da63349e4d8e;hp=66e96c169a41022501abe2547cb96038c7421640;hb=refs%2Ftags%2FV9_7_0a1;hpb=010ee1ec7117bb420679a7babf0955b517a05015;ds=sidebyside diff --git a/src/SMDS/SMDS_MeshInfo.hxx b/src/SMDS/SMDS_MeshInfo.hxx index 66e96c169..a30ec9a7e 100644 --- a/src/SMDS/SMDS_MeshInfo.hxx +++ b/src/SMDS/SMDS_MeshInfo.hxx @@ -1,9 +1,9 @@ -// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2021 CEA/DEN, EDF R&D, OPEN CASCADE // // 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 @@ -25,11 +25,12 @@ #define SMDS_MeshInfo_HeaderFile #include -using namespace std; #include "SMESH_SMDS.hxx" #include "SMDS_MeshElement.hxx" +#include +#include class SMDS_EXPORT SMDS_MeshInfo { @@ -39,37 +40,39 @@ public: inline SMDS_MeshInfo& operator=(const SMDS_MeshInfo& other); inline void Clear(); - inline int NbElements(SMDSAbs_ElementType type=SMDSAbs_All) const; - inline int NbElements(SMDSAbs_EntityType type) const { return NbEntities(type); } - inline int NbElements(SMDSAbs_GeometryType type) const { return NbElementsOfGeom(type); } - - inline int NbEntities(SMDSAbs_EntityType type) const; - inline int NbElementsOfGeom(SMDSAbs_GeometryType geom) const; - - int NbNodes() const { return myNbNodes; } - int Nb0DElements() const { return myNb0DElements; } - int NbBalls() const { return myNbBalls; } - inline int NbEdges (SMDSAbs_ElementOrder order = ORDER_ANY) const; - - inline int NbFaces (SMDSAbs_ElementOrder order = ORDER_ANY) const; - inline int NbTriangles (SMDSAbs_ElementOrder order = ORDER_ANY) const; - inline int NbQuadrangles(SMDSAbs_ElementOrder order = ORDER_ANY) const; - int NbBiQuadTriangles() const { return myNbBiQuadTriangles; } - int NbBiQuadQuadrangles() const { return myNbBiQuadQuadrangles; } - int NbPolygons() const { return myNbPolygons; } - - inline int NbVolumes (SMDSAbs_ElementOrder order = ORDER_ANY) const; - inline int NbTetras (SMDSAbs_ElementOrder order = ORDER_ANY) const; - inline int NbHexas (SMDSAbs_ElementOrder order = ORDER_ANY) const; - inline int NbPyramids(SMDSAbs_ElementOrder order = ORDER_ANY) const; - inline int NbPrisms (SMDSAbs_ElementOrder order = ORDER_ANY) const; - inline int NbHexPrisms(SMDSAbs_ElementOrder order = ORDER_ANY) const; - int NbTriQuadHexas() const { return myNbTriQuadHexas; } - int NbPolyhedrons() const { return myNbPolyhedrons; } + inline smIdType NbElements(SMDSAbs_ElementType type=SMDSAbs_All) const; + inline smIdType NbElements(SMDSAbs_EntityType type) const { return NbEntities(type); } + inline smIdType NbElements(SMDSAbs_GeometryType type) const { return NbElementsOfGeom(type); } + + inline smIdType NbEntities(SMDSAbs_EntityType type) const; + inline smIdType NbElementsOfGeom(SMDSAbs_GeometryType geom) const; + + smIdType NbNodes() const { return myNbNodes; } + smIdType Nb0DElements() const { return myNb0DElements; } + smIdType NbBalls() const { return myNbBalls; } + inline smIdType NbEdges (SMDSAbs_ElementOrder order = ORDER_ANY) const; + + inline smIdType NbFaces (SMDSAbs_ElementOrder order = ORDER_ANY) const; + inline smIdType NbTriangles (SMDSAbs_ElementOrder order = ORDER_ANY) const; + inline smIdType NbQuadrangles(SMDSAbs_ElementOrder order = ORDER_ANY) const; + smIdType NbBiQuadTriangles() const { return myNbBiQuadTriangles; } + smIdType NbBiQuadQuadrangles() const { return myNbBiQuadQuadrangles; } + inline smIdType NbPolygons(SMDSAbs_ElementOrder order = ORDER_ANY) const; + + inline smIdType NbVolumes (SMDSAbs_ElementOrder order = ORDER_ANY) const; + inline smIdType NbTetras (SMDSAbs_ElementOrder order = ORDER_ANY) const; + inline smIdType NbHexas (SMDSAbs_ElementOrder order = ORDER_ANY) const; + inline smIdType NbPyramids(SMDSAbs_ElementOrder order = ORDER_ANY) const; + inline smIdType NbPrisms (SMDSAbs_ElementOrder order = ORDER_ANY) const; + inline smIdType NbHexPrisms(SMDSAbs_ElementOrder order = ORDER_ANY) const; + smIdType NbTriQuadHexas() const { return myNbTriQuadHexas; } + smIdType NbQuadPrisms() const { return myNbQuadPrisms; } + smIdType NbBiQuadPrisms() const { return myNbBiQuadPrisms; } + smIdType NbPolyhedrons() const { return myNbPolyhedrons; } protected: inline void addWithPoly(const SMDS_MeshElement* el); - inline void setNb(const SMDSAbs_EntityType geomType, const int nb); + inline void setNb(const SMDSAbs_EntityType geomType, const smIdType nb); private: friend class SMDS_Mesh; @@ -77,29 +80,29 @@ private: // methods to count NOT POLY elements inline void remove(const SMDS_MeshElement* el); inline void add (const SMDS_MeshElement* el); - inline int index(SMDSAbs_ElementType type, int nbNodes) const; + inline smIdType index(SMDSAbs_ElementType type, int nbNodes) const; // methods to remove elements of ANY kind inline void RemoveEdge(const SMDS_MeshElement* el); inline void RemoveFace(const SMDS_MeshElement* el); inline void RemoveVolume(const SMDS_MeshElement* el); - int myNbNodes; + smIdType myNbNodes; - int myNb0DElements; - int myNbBalls; - int myNbEdges , myNbQuadEdges ; - int myNbTriangles , myNbQuadTriangles, myNbBiQuadTriangles ; - int myNbQuadrangles, myNbQuadQuadrangles, myNbBiQuadQuadrangles; - int myNbPolygons; + smIdType myNb0DElements; + smIdType myNbBalls; + smIdType myNbEdges , myNbQuadEdges ; + smIdType myNbTriangles , myNbQuadTriangles, myNbBiQuadTriangles ; + smIdType myNbQuadrangles, myNbQuadQuadrangles, myNbBiQuadQuadrangles; + smIdType myNbPolygons , myNbQuadPolygons; - int myNbTetras , myNbQuadTetras ; - int myNbHexas , myNbQuadHexas, myNbTriQuadHexas; - int myNbPyramids, myNbQuadPyramids; - int myNbPrisms , myNbQuadPrisms ; - int myNbHexPrism; - int myNbPolyhedrons; + smIdType myNbTetras , myNbQuadTetras ; + smIdType myNbHexas , myNbQuadHexas, myNbTriQuadHexas; + smIdType myNbPyramids, myNbQuadPyramids; + smIdType myNbPrisms , myNbQuadPrisms, myNbBiQuadPrisms; + smIdType myNbHexPrism; + smIdType myNbPolyhedrons; - std::vector myNb; // pointers to myNb... fields + std::vector myNb; // pointers to myNb... fields std::vector myShift; // shift to get an index in myNb by elem->NbNodes() }; @@ -110,11 +113,11 @@ inline SMDS_MeshInfo::SMDS_MeshInfo(): myNbEdges (0), myNbQuadEdges (0), myNbTriangles (0), myNbQuadTriangles (0), myNbBiQuadTriangles(0), myNbQuadrangles(0), myNbQuadQuadrangles(0), myNbBiQuadQuadrangles(0), - myNbPolygons (0), + myNbPolygons (0), myNbQuadPolygons (0), myNbTetras (0), myNbQuadTetras (0), myNbHexas (0), myNbQuadHexas (0), myNbTriQuadHexas(0), myNbPyramids (0), myNbQuadPyramids(0), - myNbPrisms (0), myNbQuadPrisms (0), + myNbPrisms (0), myNbQuadPrisms (0), myNbBiQuadPrisms(0), myNbHexPrism (0), myNbPolyhedrons(0) { @@ -128,48 +131,52 @@ inline SMDS_MeshInfo::SMDS_MeshInfo(): // 0 ------------------ - DON't USE 0!!! // 1 . * . // 2 . * - // 3 . * - // 4 * . . + // 3 . . * + // 4 * . // 5 * // 6 * . - // 7 . * + // 7 . // 8 * . - // 9 . * + // 9 . // 10 * // 11 // 12 * // 13 * // 14 // 15 * - // 16 - // 17 - // 18 * - // 19 * + // 16 * + // 17 * + // 18 * + // 19 // 20 * - // 21 * - // 22 * - // 23 * - // 24 * - // 25 - // 26 + // 21 + // 22 + // 23 + // 24 + // 25 * + // 26 * // 27 * + // 28 * + // 29 * + // 30 * + // 31 * // // So to have a unique index for each type basing on nb of nodes, we use a shift: myShift.resize(SMDSAbs_NbElementTypes, 0); - myShift[ SMDSAbs_Face ] = +15;// 3->18, 4->19, etc. - myShift[ SMDSAbs_Edge ] = +5; // 2->7, 4->9 + myShift[ SMDSAbs_Face ] = +22;// 3->25, 4->26, etc. + myShift[ SMDSAbs_Edge ] = +14;// 2->16, 3->17 myShift[ SMDSAbs_0DElement ] = +2; // 1->3 myShift[ SMDSAbs_Ball ] = +1; // 1->2 - myNb.resize( index( SMDSAbs_Volume,27 ) + 1, NULL); + myNb.resize( index( SMDSAbs_Face,9 ) + 1, NULL); myNb[ index( SMDSAbs_Node,1 )] = & myNbNodes; myNb[ index( SMDSAbs_0DElement,1 )] = & myNb0DElements; myNb[ index( SMDSAbs_Ball,1 )] = & myNbBalls; myNb[ index( SMDSAbs_Edge,2 )] = & myNbEdges; - myNb[ index( SMDSAbs_Edge,4 )] = & myNbQuadEdges; + myNb[ index( SMDSAbs_Edge,3 )] = & myNbQuadEdges; myNb[ index( SMDSAbs_Face,3 )] = & myNbTriangles; myNb[ index( SMDSAbs_Face,4 )] = & myNbQuadrangles; @@ -186,25 +193,27 @@ inline SMDS_MeshInfo::SMDS_MeshInfo(): myNb[ index( SMDSAbs_Volume, 12)] = & myNbHexPrism; myNb[ index( SMDSAbs_Volume, 13)] = & myNbQuadPyramids; myNb[ index( SMDSAbs_Volume, 15)] = & myNbQuadPrisms; + myNb[ index( SMDSAbs_Volume, 18)] = & myNbBiQuadPrisms; myNb[ index( SMDSAbs_Volume, 20)] = & myNbQuadHexas; myNb[ index( SMDSAbs_Volume, 27)] = & myNbTriQuadHexas; } inline SMDS_MeshInfo& // operator= SMDS_MeshInfo::operator=(const SMDS_MeshInfo& other) -{ for ( int i=0; iGetType(), el->NbNodes()) ]); } inline void // addWithPoly -SMDS_MeshInfo::addWithPoly(const SMDS_MeshElement* el) -{ - if ( el->IsPoly() ) - ++( el->GetType()==SMDSAbs_Face ? myNbPolygons : myNbPolyhedrons ); - else - add(el); +SMDS_MeshInfo::addWithPoly(const SMDS_MeshElement* el) { + switch ( el->GetEntityType() ) { + case SMDSEntity_Polygon: ++myNbPolygons; break; + case SMDSEntity_Quad_Polygon: ++myNbQuadPolygons; break; + case SMDSEntity_Polyhedra: ++myNbPolyhedrons; break; + default: add(el); + } } inline void // RemoveEdge SMDS_MeshInfo::RemoveEdge(const SMDS_MeshElement* el) { if ( el->IsQuadratic() ) --myNbQuadEdges; else --myNbEdges; } inline void // RemoveFace -SMDS_MeshInfo::RemoveFace(const SMDS_MeshElement* el) -{ if ( el->IsPoly() ) --myNbPolygons; else remove( el ); } +SMDS_MeshInfo::RemoveFace(const SMDS_MeshElement* el) { + switch ( el->GetEntityType() ) { + case SMDSEntity_Polygon: --myNbPolygons; break; + case SMDSEntity_Quad_Polygon: --myNbQuadPolygons; break; + default: remove(el); + } +} inline void // RemoveVolume SMDS_MeshInfo::RemoveVolume(const SMDS_MeshElement* el) { if ( el->IsPoly() ) --myNbPolyhedrons; else remove( el ); } -inline int // NbEdges +inline smIdType // NbEdges SMDS_MeshInfo::NbEdges (SMDSAbs_ElementOrder order) const { return order == ORDER_ANY ? myNbEdges+myNbQuadEdges : order == ORDER_LINEAR ? myNbEdges : myNbQuadEdges; } -inline int // NbFaces +inline smIdType // NbFaces SMDS_MeshInfo::NbFaces (SMDSAbs_ElementOrder order) const -{ return NbTriangles(order)+NbQuadrangles(order)+(order == ORDER_QUADRATIC ? 0 : myNbPolygons); } +{ return NbTriangles(order)+NbQuadrangles(order)+(order == ORDER_ANY ? myNbPolygons+myNbQuadPolygons : order == ORDER_LINEAR ? myNbPolygons : myNbQuadPolygons ); } -inline int // NbTriangles +inline smIdType // NbTriangles SMDS_MeshInfo::NbTriangles (SMDSAbs_ElementOrder order) const { return order == ORDER_ANY ? myNbTriangles+myNbQuadTriangles+myNbBiQuadTriangles : order == ORDER_LINEAR ? myNbTriangles : myNbQuadTriangles+myNbBiQuadTriangles; } -inline int // NbQuadrangles +inline smIdType // NbQuadrangles SMDS_MeshInfo::NbQuadrangles(SMDSAbs_ElementOrder order) const { return order == ORDER_ANY ? myNbQuadrangles+myNbQuadQuadrangles+myNbBiQuadQuadrangles : order == ORDER_LINEAR ? myNbQuadrangles : myNbQuadQuadrangles+myNbBiQuadQuadrangles; } -inline int // NbVolumes +inline smIdType // NbPolygons +SMDS_MeshInfo::NbPolygons(SMDSAbs_ElementOrder order) const +{ return order == ORDER_ANY ? myNbPolygons+myNbQuadPolygons : order == ORDER_LINEAR ? myNbPolygons : myNbQuadPolygons; } + +inline smIdType // NbVolumes SMDS_MeshInfo::NbVolumes (SMDSAbs_ElementOrder order) const { return NbTetras(order) + NbHexas(order) + NbPyramids(order) + NbPrisms(order) + NbHexPrisms(order) + (order == ORDER_QUADRATIC ? 0 : myNbPolyhedrons); } -inline int // NbTetras +inline smIdType // NbTetras SMDS_MeshInfo::NbTetras (SMDSAbs_ElementOrder order) const { return order == ORDER_ANY ? myNbTetras+myNbQuadTetras : order == ORDER_LINEAR ? myNbTetras : myNbQuadTetras; } -inline int // NbHexas +inline smIdType // NbHexas SMDS_MeshInfo::NbHexas (SMDSAbs_ElementOrder order) const { return order == ORDER_ANY ? myNbHexas+myNbQuadHexas+myNbTriQuadHexas : order == ORDER_LINEAR ? myNbHexas : myNbQuadHexas+myNbTriQuadHexas; } -inline int // NbPyramids +inline smIdType // NbPyramids SMDS_MeshInfo::NbPyramids(SMDSAbs_ElementOrder order) const { return order == ORDER_ANY ? myNbPyramids+myNbQuadPyramids : order == ORDER_LINEAR ? myNbPyramids : myNbQuadPyramids; } -inline int // NbPrisms +inline smIdType // NbPrisms SMDS_MeshInfo::NbPrisms (SMDSAbs_ElementOrder order) const -{ return order == ORDER_ANY ? myNbPrisms+myNbQuadPrisms : order == ORDER_LINEAR ? myNbPrisms : myNbQuadPrisms; } +{ return order == ORDER_ANY ? myNbPrisms+myNbQuadPrisms+myNbBiQuadPrisms: order == ORDER_LINEAR ? myNbPrisms : myNbQuadPrisms+myNbBiQuadPrisms; } -inline int // NbHexPrisms +inline smIdType // NbHexPrisms SMDS_MeshInfo::NbHexPrisms (SMDSAbs_ElementOrder order) const { return order == ORDER_ANY ? myNbHexPrism : order == ORDER_LINEAR ? myNbHexPrism : 0; } -inline int // NbElements +inline smIdType // NbElements SMDS_MeshInfo::NbElements(SMDSAbs_ElementType type) const { - int nb = 0; + smIdType nb = 0; switch (type) { case SMDSAbs_All: - for ( int i=1+index( SMDSAbs_Node,1 ); i