Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
gmsh
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Larry Price
gmsh
Commits
3f3c45fc
Commit
3f3c45fc
authored
12 years ago
by
Christophe Geuzaine
Browse files
Options
Downloads
Patches
Plain Diff
temp fix for major performance regression
parent
b91d9c42
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
Fltk/graphicWindow.cpp
+4
-0
4 additions, 0 deletions
Fltk/graphicWindow.cpp
Mesh/meshGFaceDelaunayInsertion.cpp
+17
-21
17 additions, 21 deletions
Mesh/meshGFaceDelaunayInsertion.cpp
with
21 additions
and
21 deletions
Fltk/graphicWindow.cpp
+
4
−
0
View file @
3f3c45fc
...
...
@@ -2934,6 +2934,10 @@ graphicWindow::~graphicWindow()
_tile
->
clear
();
_win
->
clear
();
Fl
::
delete_widget
(
_win
);
if
(
_menuwin
){
_menuwin
->
clear
();
Fl
::
delete_widget
(
_menuwin
);
}
}
void
graphicWindow
::
setTitle
(
std
::
string
str
)
...
...
This diff is collapsed.
Click to expand it.
Mesh/meshGFaceDelaunayInsertion.cpp
+
17
−
21
View file @
3f3c45fc
...
...
@@ -700,7 +700,9 @@ static MTri3* search4Triangle (MTri3 *t, double pt[2],
if
(
inside
)
return
t
;
if
(
ITER
++
>
(
int
)
AllTris
.
size
())
break
;
}
// return 0;
return
0
;
// FIXME: removing this leads to horrible performance
for
(
std
::
set
<
MTri3
*
,
compareTri3Ptr
>::
iterator
itx
=
AllTris
.
begin
();
itx
!=
AllTris
.
end
();
++
itx
){
if
(
!
(
*
itx
)
->
isDeleted
()){
...
...
@@ -768,12 +770,10 @@ static bool insertAPoint(GFace *gf, std::set<MTri3*,compareTri3Ptr>::iterator it
if
(
!
p
.
succeeded
()
||
!
insertVertex
(
false
,
gf
,
v
,
center
,
ptin
,
AllTris
,
ActiveTris
,
vSizes
,
vSizesBGM
,
vMetricsBGM
,
Us
,
Vs
,
metric
)
)
{
// Msg::Debug("Point %g %g cannot be inserted because %d",
// center[0], center[1], p.succeeded() );
// printf("Point %g %g cannot be inserted because %d",
// center[0], center[1], p.succeeded() );
AllTris
.
erase
(
it
);
worst
->
forceRadius
(
-
1
);
AllTris
.
insert
(
worst
);
...
...
@@ -782,16 +782,13 @@ static bool insertAPoint(GFace *gf, std::set<MTri3*,compareTri3Ptr>::iterator it
}
else
{
// printf("done ! %d\n",AllTris.size());
gf
->
mesh_vertices
.
push_back
(
v
);
return
true
;
}
}
else
{
printf
(
"NOT INSIDE
\n
"
);
/*
MTriangle
*
base
=
worst
->
tri
();
Msg::
Info
("Point %g %g is outside (%g %g , %g %g , %g %g)",
Msg
::
Debug
(
"Point %g %g is outside (%g %g , %g %g , %g %g)"
,
center
[
0
],
center
[
1
],
Us
[
base
->
getVertex
(
0
)
->
getIndex
()],
Vs
[
base
->
getVertex
(
0
)
->
getIndex
()],
...
...
@@ -799,7 +796,6 @@ static bool insertAPoint(GFace *gf, std::set<MTri3*,compareTri3Ptr>::iterator it
Vs
[
base
->
getVertex
(
1
)
->
getIndex
()],
Us
[
base
->
getVertex
(
2
)
->
getIndex
()],
Vs
[
base
->
getVertex
(
2
)
->
getIndex
()]);
*/
AllTris
.
erase
(
it
);
worst
->
forceRadius
(
0
);
AllTris
.
insert
(
worst
);
...
...
@@ -1613,7 +1609,7 @@ void bowyerWatsonParallelograms(GFace *gf)
buildMetric
(
gf
,
newPoint
,
metric
);
bool
success
=
insertAPoint
(
gf
,
AllTris
.
begin
(),
newPoint
,
metric
,
Us
,
Vs
,
vSizes
,
vSizesBGM
,
vMetricsBGM
,
AllTris
,
0
,
worst
);
if
(
!
success
)
printf
(
"success %d %d
\n
"
,
success
,
AllTris
.
size
());
if
(
!
success
)
printf
(
"success %d %d
\n
"
,
success
,
(
int
)
AllTris
.
size
());
i
++
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment