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 'assert_compute' of https://codev-tuleap.cea.fr/plugins/git/salome/smesh...
[modules/smesh.git]
/
src
/
SMESHUtils
/
SMESH_MAT2d.cxx
diff --git
a/src/SMESHUtils/SMESH_MAT2d.cxx
b/src/SMESHUtils/SMESH_MAT2d.cxx
index 601fdd84dd456f715074f6dbe8261e6dd8783e44..43a44394cf27ac0503150abf12ae8a9ccea7935b 100644
(file)
--- a/
src/SMESHUtils/SMESH_MAT2d.cxx
+++ b/
src/SMESHUtils/SMESH_MAT2d.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
@@
-46,11
+46,9
@@
#include <TopoDS_Vertex.hxx>
#include <TopoDS_Wire.hxx>
#include <TopoDS_Vertex.hxx>
#include <TopoDS_Wire.hxx>
-#ifdef _DEBUG_
-//#define _MYDEBUG_
#include "SMESH_File.hxx"
#include "SMESH_Comment.hxx"
#include "SMESH_File.hxx"
#include "SMESH_Comment.hxx"
-#
endif
+#
include "utilities.h"
using namespace std;
using boost::polygon::x;
using namespace std;
using boost::polygon::x;
@@
-155,12
+153,13
@@
namespace
// }
// -------------------------------------------------------------------------------------
// }
// -------------------------------------------------------------------------------------
-#ifdef _MYDEBUG_
+
// writes segments into a txt file readable by voronoi_visualizer
void inSegmentsToFile( vector< InSegment>& inSegments)
{
// writes segments into a txt file readable by voronoi_visualizer
void inSegmentsToFile( vector< InSegment>& inSegments)
{
- if (
inSegments.size() > 1000
)
+ if (
inSegments.size() > 1000 || !SALOME::VerbosityActivated()
)
return;
return;
+
const char* fileName = "/misc/dn25/salome/eap/salome/misc/Code/C++/MAdebug.txt";
const char* user = getenv("USER");
if ( !user || strcmp( user, "eap" )) return;
const char* fileName = "/misc/dn25/salome/eap/salome/misc/Code/C++/MAdebug.txt";
const char* user = getenv("USER");
if ( !user || strcmp( user, "eap" )) return;
@@
-219,11
+218,6
@@
namespace
} while (edge != cell->incident_edge());
}
}
} while (edge != cell->incident_edge());
}
}
-#else
- #define inSegmentsToFile(arg) {}
- //void dumpEdge( const TVDEdge* edge ) {}
- //void dumpCell( const TVDCell* cell ) {}
-#endif
}
// -------------------------------------------------------------------------------------
}
// -------------------------------------------------------------------------------------
@@
-420,7
+414,9
@@
namespace
void bndSegsToMesh( const vector< vector< BndSeg > >& bndSegsPerEdge )
{
void bndSegsToMesh( const vector< vector< BndSeg > >& bndSegsPerEdge )
{
-#ifdef _MYDEBUG_
+ if (bndSegsPerEdge.empty() || !SALOME::VerbosityActivated())
+ return;
+
if ( !getenv("bndSegsToMesh")) return;
map< const TVDVertex *, int > v2Node;
map< const TVDVertex *, int >::iterator v2n;
if ( !getenv("bndSegsToMesh")) return;
map< const TVDVertex *, int > v2Node;
map< const TVDVertex *, int >::iterator v2n;
@@
-470,7
+466,6
@@
namespace
text << "\n";
file.write( text.c_str(), text.size() );
cout << fileName << endl;
text << "\n";
file.write( text.c_str(), text.size() );
cout << fileName << endl;
-#endif
}
//================================================================================
}
//================================================================================
@@
-1077,6
+1072,11
@@
namespace
}
}
}
}
+ else // 2D_mesh_QuadranglePreference_00/A1, bos20144.brep
+ {
+ continue; // bndSegs.size() == 1
+ }
+
bndSegs[i].setBranch( branchID, bndSegsPerEdge ); // set to i-th and to the opposite bndSeg
if ( bndSegs[i].hasOppositeEdge() )
branchEdges[ bndSegs[i].branchID() ].push_back( bndSegs[i]._edge );
bndSegs[i].setBranch( branchID, bndSegsPerEdge ); // set to i-th and to the opposite bndSeg
if ( bndSegs[i].hasOppositeEdge() )
branchEdges[ bndSegs[i].branchID() ].push_back( bndSegs[i]._edge );