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
Deactivating parallelism for 2D/1D + corrections for non parallel run + adding Parall...
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_QuadFromMedialAxis_1D2D.cxx
diff --git
a/src/StdMeshers/StdMeshers_QuadFromMedialAxis_1D2D.cxx
b/src/StdMeshers/StdMeshers_QuadFromMedialAxis_1D2D.cxx
index fe4fc5c35f83264a68efb7f35aced4896579778b..5cdf93f2bbef8a33d920aff261ab54975655d3ac 100644
(file)
--- a/
src/StdMeshers/StdMeshers_QuadFromMedialAxis_1D2D.cxx
+++ b/
src/StdMeshers/StdMeshers_QuadFromMedialAxis_1D2D.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-202
0
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-202
2
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
@@
-240,7
+240,7
@@
namespace
{
TmpMesh()
{
{
TmpMesh()
{
- _m
yM
eshDS = new SMESHDS_Mesh(/*id=*/0, /*isEmbeddedMode=*/true);
+ _meshDS = new SMESHDS_Mesh(/*id=*/0, /*isEmbeddedMode=*/true);
}
};
}
};
@@
-1185,6
+1185,8
@@
namespace
if ( !npCloseV._node || npCloseV._node == npVert._node )
{
npProj = npCloseN;
if ( !npCloseV._node || npCloseV._node == npVert._node )
{
npProj = npCloseN;
+ if ( i+1 < projToMerge.size() && u2NPClose == projToMerge[ i+1 ])
+ ++i;
thePointsOnE.erase( u2NPClose );
continue;
}
thePointsOnE.erase( u2NPClose );
continue;
}
@@
-1720,8
+1722,8
@@
namespace
if ( isComputed[ edgeIDs1[i]] &&
isComputed[ edgeIDs2[i]] )
{
if ( isComputed[ edgeIDs1[i]] &&
isComputed[ edgeIDs2[i]] )
{
-
int
nbNodes1 = meshDS->MeshElements(edgeIDs[ edgeIDs1[i]] )->NbNodes();
-
int
nbNodes2 = meshDS->MeshElements(edgeIDs[ edgeIDs2[i]] )->NbNodes();
+
smIdType
nbNodes1 = meshDS->MeshElements(edgeIDs[ edgeIDs1[i]] )->NbNodes();
+
smIdType
nbNodes2 = meshDS->MeshElements(edgeIDs[ edgeIDs2[i]] )->NbNodes();
if ( nbNodes1 != nbNodes2 )
return false;
if (( int(i)-1 >= 0 ) &&
if ( nbNodes1 != nbNodes2 )
return false;
if (( int(i)-1 >= 0 ) &&