Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'OCCT780'
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_Prism_3D.hxx
diff --git
a/src/StdMeshers/StdMeshers_Prism_3D.hxx
b/src/StdMeshers/StdMeshers_Prism_3D.hxx
index 183f8e3d5d9425be7a164ca0e2b4ed150e7eb429..57a23407cab97bc990e965d11c5f44a903ccfeb7 100644
(file)
--- a/
src/StdMeshers/StdMeshers_Prism_3D.hxx
+++ b/
src/StdMeshers/StdMeshers_Prism_3D.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-202
1 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-202
4 CEA, EDF
, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-33,6
+33,7
@@
#include "SMESH_Block.hxx"
#include "SMESH_Comment.hxx"
#include "SMESH_Mesh.hxx"
#include "SMESH_Block.hxx"
#include "SMESH_Comment.hxx"
#include "SMESH_Mesh.hxx"
+#include "SMESH_SequentialMesh.hxx"
#include "SMESH_MesherHelper.hxx"
#include "SMESH_TypeDefs.hxx"
#include "SMESH_subMesh.hxx"
#include "SMESH_MesherHelper.hxx"
#include "SMESH_TypeDefs.hxx"
#include "SMESH_subMesh.hxx"
@@
-117,7
+118,7
@@
namespace Prism_3D
// ===============================================================
/*!
// ===============================================================
/*!
- * \brief Tool analyzing and giving access to a prism geometry
+ * \brief Tool analyzing and giving access to a prism geometry
* treating it like a block, i.e. the four side faces are
* emulated by division/uniting of missing/excess faces.
* It also manage associations between block sub-shapes and a mesh.
* treating it like a block, i.e. the four side faces are
* emulated by division/uniting of missing/excess faces.
* It also manage associations between block sub-shapes and a mesh.
@@
-154,7
+155,7
@@
class STDMESHERS_EXPORT StdMeshers_PrismAsBlock: public SMESH_Block
* \brief Return number of nodes on every vertical edge
* \retval int - number of nodes including end nodes
*/
* \brief Return number of nodes on every vertical edge
* \retval int - number of nodes including end nodes
*/
-
in
t VerticalSize() const { return myParam2ColumnMaps[0].begin()->second.size(); }
+
size_
t VerticalSize() const { return myParam2ColumnMaps[0].begin()->second.size(); }
bool HasNotQuadElemOnTop() const { return myNotQuadOnTop; }
bool HasNotQuadElemOnTop() const { return myNotQuadOnTop; }
@@
-200,7
+201,7
@@
class STDMESHERS_EXPORT StdMeshers_PrismAsBlock: public SMESH_Block
*/
bool GetLayersTransformation(std::vector<gp_Trsf> & trsf,
const Prism_3D::TPrismTopo& prism) const;
*/
bool GetLayersTransformation(std::vector<gp_Trsf> & trsf,
const Prism_3D::TPrismTopo& prism) const;
-
+
/*!
* \brief Return pointer to mesh
* \retval SMESH_Mesh - mesh
/*!
* \brief Return pointer to mesh
* \retval SMESH_Mesh - mesh
@@
-389,7
+390,7
@@
private:
SMESH_ComputeErrorPtr myError;
// container of 4 side faces
SMESH_ComputeErrorPtr myError;
// container of 4 side faces
- TSideFace* mySide;
+ TSideFace* mySide;
// node columns for each base edge
std::vector< TParam2ColumnMap > myParam2ColumnMaps;
// to find a column for a node by edge SMESHDS Index
// node columns for each base edge
std::vector< TParam2ColumnMap > myParam2ColumnMaps;
// to find a column for a node by edge SMESHDS Index