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
bos #20256: [CEA 18523] Porting SMESH to int 64 bits
[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 62f0b9a14e83de74ec678e8d7f6e6ea08dcbb159..9e288f5aad0c518c17ccfd96bc524f9471c81de1 100644
(file)
--- a/
src/StdMeshers/StdMeshers_Prism_3D.hxx
+++ b/
src/StdMeshers/StdMeshers_Prism_3D.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
21
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
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-20,7
+20,7
@@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-// SMESH SMESH : implementaion of SMESH idl descriptions
+// SMESH SMESH : implementa
t
ion of SMESH idl descriptions
// File : StdMeshers_Prism_3D.hxx
// Module : SMESH
//
// File : StdMeshers_Prism_3D.hxx
// Module : SMESH
//
@@
-106,6
+106,7
@@
namespace Prism_3D
std::list< int > myNbEdgesInWires;
bool myNotQuadOnTop;
std::list< int > myNbEdgesInWires;
bool myNotQuadOnTop;
+ mutable SMESH_subMesh* myAlgoSM; // sub-mesh with algo which computed myBottom
size_t NbWires() const { return myNbEdgesInWires.size(); }
size_t NbWires() const { return myNbEdgesInWires.size(); }
@@
-153,7
+154,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; }
@@
-245,12
+246,12
@@
class STDMESHERS_EXPORT StdMeshers_PrismAsBlock: public SMESH_Block
{ return myShapeIDMap.FindIndex( shape ); }
/*!
{ return myShapeIDMap.FindIndex( shape ); }
/*!
- * \brief Check curve orientation of a bo
o
tom edge
+ * \brief Check curve orientation of a bo
t
tom edge
* \param meshDS - mesh DS
* \param columnsMap - node columns map of side face
* \param meshDS - mesh DS
* \param columnsMap - node columns map of side face
- * \param bottomEdge - the bo
o
tom edge
+ * \param bottomEdge - the bo
t
tom edge
* \param sideFaceID - side face in-block ID
* \param sideFaceID - side face in-block ID
- * \retval bool - true if orien
ation coinside with in-block froward orien
ation
+ * \retval bool - true if orien
tation coincide with in-block forward orient
ation
*/
static bool IsForwardEdge(SMESHDS_Mesh* meshDS,
const TParam2ColumnMap& columnsMap,
*/
static bool IsForwardEdge(SMESHDS_Mesh* meshDS,
const TParam2ColumnMap& columnsMap,
@@
-278,7
+279,7
@@
private:
PSurface mySurface;
TopoDS_Edge myBaseEdge;
std::map< int, PSurface > myShapeID2Surf;
PSurface mySurface;
TopoDS_Edge myBaseEdge;
std::map< int, PSurface > myShapeID2Surf;
- // first and last normalized params and orientaion for each component or it-self
+ // first and last normalized params and orienta
t
ion for each component or it-self
std::vector< std::pair< double, double> > myParams; // select my columns in myParamToColumnMap
bool myIsForward;
std::vector< TSideFace* > myComponents;
std::vector< std::pair< double, double> > myParams; // select my columns in myParamToColumnMap
bool myIsForward;
std::vector< TSideFace* > myComponents;
@@
-479,7
+480,7
@@
private:
class STDMESHERS_EXPORT StdMeshers_Prism_3D: public SMESH_3D_Algo
{
public:
class STDMESHERS_EXPORT StdMeshers_Prism_3D: public SMESH_3D_Algo
{
public:
- StdMeshers_Prism_3D(int hypId,
int studyId,
SMESH_Gen* gen);
+ StdMeshers_Prism_3D(int hypId, SMESH_Gen* gen);
virtual ~StdMeshers_Prism_3D();
virtual bool CheckHypothesis(SMESH_Mesh& aMesh,
virtual ~StdMeshers_Prism_3D();
virtual bool CheckHypothesis(SMESH_Mesh& aMesh,