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_Projection_1D2D.cxx
diff --git
a/src/StdMeshers/StdMeshers_Projection_1D2D.cxx
b/src/StdMeshers/StdMeshers_Projection_1D2D.cxx
index 6654ac0820d4bdac93d12b15899bcd70b16a6fdb..a2d40bf3c43a64cc0f93f7566a2d83a878853cc1 100644
(file)
--- a/
src/StdMeshers/StdMeshers_Projection_1D2D.cxx
+++ b/
src/StdMeshers/StdMeshers_Projection_1D2D.cxx
@@
-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
@@
-25,7
+25,9
@@
//
#include "StdMeshers_Projection_1D2D.hxx"
//
#include "StdMeshers_Projection_1D2D.hxx"
+#include "SMESHDS_Mesh.hxx"
#include "SMESH_Gen.hxx"
#include "SMESH_Gen.hxx"
+#include "SMESH_Mesh.hxx"
#include "SMESH_MesherHelper.hxx"
#include "SMESH_subMesh.hxx"
#include "SMESH_subMeshEventListener.hxx"
#include "SMESH_MesherHelper.hxx"
#include "SMESH_subMesh.hxx"
#include "SMESH_subMeshEventListener.hxx"
@@
-69,7
+71,7
@@
namespace
/*!
* \brief Structure used to temporary remove EventProparatorToEdges from faceSubMesh
* in order to prevent propagation of CLEAN event from FACE to EDGEs during
/*!
* \brief Structure used to temporary remove EventProparatorToEdges from faceSubMesh
* in order to prevent propagation of CLEAN event from FACE to EDGEs during
- * StdMeshers_Projection_1D2D::Compute(). The CLEAN event is em
mi
ted by Pattern mapper
+ * StdMeshers_Projection_1D2D::Compute(). The CLEAN event is em
it
ted by Pattern mapper
* and causes removal of faces generated on adjacent FACEs.
*/
struct UnsetterOfEventProparatorToEdges
* and causes removal of faces generated on adjacent FACEs.
*/
struct UnsetterOfEventProparatorToEdges
@@
-91,8
+93,8
@@
namespace
//purpose :
//=======================================================================
//purpose :
//=======================================================================
-StdMeshers_Projection_1D2D::StdMeshers_Projection_1D2D(int hypId,
int studyId,
SMESH_Gen* gen)
- :StdMeshers_Projection_2D(hypId,
studyId,
gen)
+StdMeshers_Projection_1D2D::StdMeshers_Projection_1D2D(int hypId, SMESH_Gen* gen)
+ :StdMeshers_Projection_2D(hypId, gen)
{
_name = "Projection_1D2D";
_requireDiscreteBoundary = false;
{
_name = "Projection_1D2D";
_requireDiscreteBoundary = false;
@@
-138,7
+140,7
@@
bool StdMeshers_Projection_1D2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape
{
const SMDS_MeshElement* f = fIt->next();
//if ( !f->IsQuadratic() ) continue;
{
const SMDS_MeshElement* f = fIt->next();
//if ( !f->IsQuadratic() ) continue;
- nodes.assign( SMDS_MeshElement::iterator( f->interlacedNodes
Elem
Iterator() ),
+ nodes.assign( SMDS_MeshElement::iterator( f->interlacedNodesIterator() ),
SMDS_MeshElement::iterator() );
nodes.push_back( nodes[0] );
for ( size_t i = 2; i < nodes.size(); i += 2 )
SMDS_MeshElement::iterator() );
nodes.push_back( nodes[0] );
for ( size_t i = 2; i < nodes.size(); i += 2 )
@@
-147,8
+149,8
@@
bool StdMeshers_Projection_1D2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape
if ( idType.second == TopAbs_EDGE &&
idType.first != nodes[i-1]->getshapeId() )
{
if ( idType.second == TopAbs_EDGE &&
idType.first != nodes[i-1]->getshapeId() )
{
- faceSubMesh->RemoveNode( nodes[i-1]
, /*isDeleted=*/false
);
- meshDS->SetNodeOnEdge(
(SMDS_MeshNode*)
nodes[i-1], idType.first );
+ faceSubMesh->RemoveNode( nodes[i-1] );
+ meshDS->SetNodeOnEdge( nodes[i-1], idType.first );
posFixer.SetSubShape( idType.first );
posFixer.CheckNodeU( TopoDS::Edge( posFixer.GetSubShape() ),
nodes[i-1], dummyU=0., tol, /*force=*/true );
posFixer.SetSubShape( idType.first );
posFixer.CheckNodeU( TopoDS::Edge( posFixer.GetSubShape() ),
nodes[i-1], dummyU=0., tol, /*force=*/true );
@@
-158,8
+160,8
@@
bool StdMeshers_Projection_1D2D::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape
}
TopoDS_Face F = TopoDS::Face( theShape );
TError err;
}
TopoDS_Face F = TopoDS::Face( theShape );
TError err;
- TSideVector wires = StdMeshers_FaceSide::GetFaceWires( F, theMesh,
-
/*ignoreMediumNodes=*/false, er
r);
+ TSideVector wires = StdMeshers_FaceSide::GetFaceWires( F, theMesh,
/*ignoreMediumNodes=*/false,
+
err, &helpe
r);
if ( err && !err->IsOK() )
return error( err );
if ( err && !err->IsOK() )
return error( err );
@@
-249,7
+251,7
@@
bool StdMeshers_Projection_1D2D::Evaluate(SMESH_Mesh& theMesh,
TopAbs_ShapeEnum shapeType = srcSM->GetSubShape().ShapeType();
if ( shapeType == TopAbs_EDGE )
{
TopAbs_ShapeEnum shapeType = srcSM->GetSubShape().ShapeType();
if ( shapeType == TopAbs_EDGE )
{
- std::vector<
int
> aVec;
+ std::vector<
smIdType
> aVec;
SMESHDS_SubMesh* srcSubMeshDS = srcSM->GetSubMeshDS();
if ( srcSubMeshDS && srcSubMeshDS->NbElements() )
{
SMESHDS_SubMesh* srcSubMeshDS = srcSM->GetSubMeshDS();
if ( srcSubMeshDS && srcSubMeshDS->NbElements() )
{