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
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Larry Price
gmsh
Commits
9d6e3f39
Commit
9d6e3f39
authored
11 years ago
by
Christophe Geuzaine
Browse files
Options
Downloads
Patches
Plain Diff
fix
parent
04ad4deb
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Mesh/meshGRegion.cpp
+2
-3
2 additions, 3 deletions
Mesh/meshGRegion.cpp
Mesh/meshGRegionDelaunayInsertion.cpp
+12
-11
12 additions, 11 deletions
Mesh/meshGRegionDelaunayInsertion.cpp
with
14 additions
and
14 deletions
Mesh/meshGRegion.cpp
+
2
−
3
View file @
9d6e3f39
...
@@ -1397,11 +1397,10 @@ void deMeshGRegion::operator() (GRegion *gr)
...
@@ -1397,11 +1397,10 @@ void deMeshGRegion::operator() (GRegion *gr)
}
}
int
intersect_line_triangle
(
double
X
[
3
],
double
Y
[
3
],
double
Z
[
3
]
,
int
intersect_line_triangle
(
double
X
[
3
],
double
Y
[
3
],
double
Z
[
3
]
,
double
P
[
3
],
double
N
[
3
])
double
P
[
3
],
double
N
[
3
]
,
double
eps_prec
)
{
{
double
mat
[
3
][
3
],
det
;
double
mat
[
3
][
3
],
det
;
double
b
[
3
],
res
[
3
];
double
b
[
3
],
res
[
3
];
const
double
eps_prec
=
1.e-9
;
mat
[
0
][
0
]
=
X
[
1
]
-
X
[
0
];
mat
[
0
][
0
]
=
X
[
1
]
-
X
[
0
];
mat
[
0
][
1
]
=
X
[
2
]
-
X
[
0
];
mat
[
0
][
1
]
=
X
[
2
]
-
X
[
0
];
...
@@ -1491,7 +1490,7 @@ void meshNormalsPointOutOfTheRegion(GRegion *gr)
...
@@ -1491,7 +1490,7 @@ void meshNormalsPointOutOfTheRegion(GRegion *gr)
t_b
->
getVertex
(
2
)
->
y
()};
t_b
->
getVertex
(
2
)
->
y
()};
double
Z_b
[
3
]
=
{
t_b
->
getVertex
(
0
)
->
z
(),
t_b
->
getVertex
(
1
)
->
z
(),
double
Z_b
[
3
]
=
{
t_b
->
getVertex
(
0
)
->
z
(),
t_b
->
getVertex
(
1
)
->
z
(),
t_b
->
getVertex
(
2
)
->
z
()};
t_b
->
getVertex
(
2
)
->
z
()};
int
inters
=
intersect_line_triangle
(
X_b
,
Y_b
,
Z_b
,
P
,
N
);
int
inters
=
intersect_line_triangle
(
X_b
,
Y_b
,
Z_b
,
P
,
N
,
1.e-9
);
nb_intersect
+=
inters
;
nb_intersect
+=
inters
;
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
Mesh/meshGRegionDelaunayInsertion.cpp
+
12
−
11
View file @
9d6e3f39
...
@@ -1144,7 +1144,7 @@ void insertVerticesInRegion (GRegion *gr, int maxVert, bool _classify)
...
@@ -1144,7 +1144,7 @@ void insertVerticesInRegion (GRegion *gr, int maxVert, bool _classify)
MTet4Factory
myFactory
(
1600000
);
MTet4Factory
myFactory
(
1600000
);
std
::
set
<
MTet4
*
,
compareTet4Ptr
>
&
allTets
=
myFactory
.
getAllTets
();
std
::
set
<
MTet4
*
,
compareTet4Ptr
>
&
allTets
=
myFactory
.
getAllTets
();
int
NUM
=
0
;
int
NUM
=
0
;
{
// leave this in a block so the map gets deallocated directly
{
// leave this in a block so the map gets deallocated directly
std
::
map
<
MVertex
*
,
double
>
vSizesMap
;
std
::
map
<
MVertex
*
,
double
>
vSizesMap
;
...
@@ -1177,7 +1177,7 @@ void insertVerticesInRegion (GRegion *gr, int maxVert, bool _classify)
...
@@ -1177,7 +1177,7 @@ void insertVerticesInRegion (GRegion *gr, int maxVert, bool _classify)
// Msg::Info("reclassifying %d tets", allTets.size());
// Msg::Info("reclassifying %d tets", allTets.size());
if
(
_classify
)
{
if
(
_classify
)
{
fs_cont
search
;
fs_cont
search
;
buildFaceSearchStructure
(
gr
->
model
(),
search
);
buildFaceSearchStructure
(
gr
->
model
(),
search
);
for
(
MTet4Factory
::
iterator
it
=
allTets
.
begin
();
it
!=
allTets
.
end
();
++
it
){
for
(
MTet4Factory
::
iterator
it
=
allTets
.
begin
();
it
!=
allTets
.
end
();
++
it
){
...
@@ -1205,7 +1205,7 @@ void insertVerticesInRegion (GRegion *gr, int maxVert, bool _classify)
...
@@ -1205,7 +1205,7 @@ void insertVerticesInRegion (GRegion *gr, int maxVert, bool _classify)
}
}
search
.
clear
();
search
.
clear
();
}
}
else
{
else
{
// FIXME ... too simple
// FIXME ... too simple
for
(
MTet4Factory
::
iterator
it
=
allTets
.
begin
();
it
!=
allTets
.
end
();
++
it
)
for
(
MTet4Factory
::
iterator
it
=
allTets
.
begin
();
it
!=
allTets
.
end
();
++
it
)
(
*
it
)
->
setOnWhat
(
gr
);
(
*
it
)
->
setOnWhat
(
gr
);
...
@@ -1222,9 +1222,9 @@ void insertVerticesInRegion (GRegion *gr, int maxVert, bool _classify)
...
@@ -1222,9 +1222,9 @@ void insertVerticesInRegion (GRegion *gr, int maxVert, bool _classify)
createAllEmbeddedFaces
(
gr
,
allEmbeddedFaces
);
createAllEmbeddedFaces
(
gr
,
allEmbeddedFaces
);
connectTets
(
allTets
.
begin
(),
allTets
.
end
(),
&
allEmbeddedFaces
);
connectTets
(
allTets
.
begin
(),
allTets
.
end
(),
&
allEmbeddedFaces
);
Msg
::
Debug
(
"All %d tets were connected"
,
allTets
.
size
());
Msg
::
Debug
(
"All %d tets were connected"
,
allTets
.
size
());
// here the classification should be done
// here the classification should be done
int
ITER
=
0
,
REALCOUNT
=
0
;
int
ITER
=
0
,
REALCOUNT
=
0
;
int
NB_CORRECTION_OF_CAVITY
=
0
;
int
NB_CORRECTION_OF_CAVITY
=
0
;
int
COUNT_MISS_1
=
0
;
int
COUNT_MISS_1
=
0
;
...
@@ -1614,7 +1614,7 @@ static void initialCube (std::vector<MVertex*> &v,
...
@@ -1614,7 +1614,7 @@ static void initialCube (std::vector<MVertex*> &v,
SBoundingBox3d
bbox
;
SBoundingBox3d
bbox
;
for
(
size_t
i
=
0
;
i
<
v
.
size
();
i
++
){
for
(
size_t
i
=
0
;
i
<
v
.
size
();
i
++
){
MVertex
*
pv
=
v
[
i
];
MVertex
*
pv
=
v
[
i
];
bbox
+=
SPoint3
(
pv
->
x
(),
pv
->
y
(),
pv
->
z
());
bbox
+=
SPoint3
(
pv
->
x
(),
pv
->
y
(),
pv
->
z
());
}
}
bbox
*=
1.3
;
bbox
*=
1.3
;
box
[
0
]
=
new
MVertex
(
bbox
.
min
().
x
(),
bbox
.
min
().
y
(),
bbox
.
min
().
z
());
box
[
0
]
=
new
MVertex
(
bbox
.
min
().
x
(),
bbox
.
min
().
y
(),
bbox
.
min
().
z
());
...
@@ -1666,7 +1666,7 @@ static MTet4* search4Tet (MTet4 *t, MVertex *v, int _size) {
...
@@ -1666,7 +1666,7 @@ static MTet4* search4Tet (MTet4 *t, MVertex *v, int _size) {
}
}
}
}
if
(
found
<
0
){
if
(
found
<
0
){
return
0
;
return
0
;
}
}
t
=
t
->
getNeigh
(
found
);
t
=
t
->
getNeigh
(
found
);
if
(
t
->
inCircumSphere
(
v
))
{
if
(
t
->
inCircumSphere
(
v
))
{
...
@@ -1688,7 +1688,7 @@ MTet4 * getTetToBreak (MVertex *v, std::vector<MTet4*> &t, int &NB_GLOBAL_SEARCH
...
@@ -1688,7 +1688,7 @@ MTet4 * getTetToBreak (MVertex *v, std::vector<MTet4*> &t, int &NB_GLOBAL_SEARCH
NB_GLOBAL_SEARCH
++
;
NB_GLOBAL_SEARCH
++
;
for
(
size_t
i
=
0
;
i
<
t
.
size
();
i
++
){
for
(
size_t
i
=
0
;
i
<
t
.
size
();
i
++
){
if
(
!
t
[
i
]
->
isDeleted
()
&&
t
[
i
]
->
inCircumSphere
(
v
))
return
t
[
i
];
if
(
!
t
[
i
]
->
isDeleted
()
&&
t
[
i
]
->
inCircumSphere
(
v
))
return
t
[
i
];
}
}
return
0
;
return
0
;
}
}
...
@@ -1710,16 +1710,17 @@ void delaunayMeshIn3D(std::vector<MVertex*> &v, std::vector<MTetrahedron*> &resu
...
@@ -1710,16 +1710,17 @@ void delaunayMeshIn3D(std::vector<MVertex*> &v, std::vector<MTetrahedron*> &resu
clock_t
t1
=
clock
();
clock_t
t1
=
clock
();
for
(
size_t
i
=
0
;
i
<
v
.
size
();
i
++
){
for
(
size_t
i
=
0
;
i
<
v
.
size
();
i
++
){
MVertex
*
pv
=
v
[
i
];
MVertex
*
pv
=
v
[
i
];
MTet4
*
found
=
getTetToBreak
(
pv
,
t
,
NB_GLOBAL_SEARCH
);
MTet4
*
found
=
getTetToBreak
(
pv
,
t
,
NB_GLOBAL_SEARCH
);
if
(
!
found
)
continue
;
std
::
list
<
faceXtet
>
shell
;
std
::
list
<
faceXtet
>
shell
;
std
::
list
<
MTet4
*>
cavity
;
std
::
list
<
MTet4
*>
cavity
;
recurFindCavity
(
shell
,
cavity
,
pv
,
found
);
recurFindCavity
(
shell
,
cavity
,
pv
,
found
);
std
::
vector
<
MTet4
*>
extended_cavity
;
std
::
vector
<
MTet4
*>
extended_cavity
;
std
::
list
<
faceXtet
>::
iterator
it
=
shell
.
begin
();
std
::
list
<
faceXtet
>::
iterator
it
=
shell
.
begin
();
while
(
it
!=
shell
.
end
()){
while
(
it
!=
shell
.
end
()){
MTetrahedron
*
tr
=
new
MTetrahedron
(
it
->
getVertex
(
0
),
MTetrahedron
*
tr
=
new
MTetrahedron
(
it
->
getVertex
(
0
),
it
->
getVertex
(
1
),
it
->
getVertex
(
1
),
it
->
getVertex
(
2
),
pv
);
it
->
getVertex
(
2
),
pv
);
MTet4
*
t4
=
new
MTet4
(
tr
,
0.0
);
MTet4
*
t4
=
new
MTet4
(
tr
,
0.0
);
t
.
push_back
(
t4
);
t
.
push_back
(
t4
);
...
...
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