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
Package registry
Model registry
Operate
Terraform modules
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
Romin Tomasetti
gmsh
Commits
ee7dd7af
Commit
ee7dd7af
authored
11 years ago
by
Jean-François Remacle
Browse files
Options
Downloads
Patches
Plain Diff
allow box surrounding 3D domain
parent
5a29a8b9
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
Mesh/meshGRegionDelaunayInsertion.cpp
+77
-98
77 additions, 98 deletions
Mesh/meshGRegionDelaunayInsertion.cpp
with
77 additions
and
98 deletions
Mesh/meshGRegionDelaunayInsertion.cpp
+
77
−
98
View file @
ee7dd7af
...
@@ -143,29 +143,29 @@ void connectTets_vector2(std::vector<MTet4*> &t, std::vector<faceXtet> &conn)
...
@@ -143,29 +143,29 @@ void connectTets_vector2(std::vector<MTet4*> &t, std::vector<faceXtet> &conn)
}
}
template
<
class
ITER
>
//
template <class ITER>
void
connectTets_vector
(
ITER
beg
,
ITER
end
)
//
void connectTets_vector(ITER beg, ITER end)
{
//
{
// std::set<faceXtet> conn;
//
// std::set<faceXtet> conn;
std
::
vector
<
faceXtet
>
conn
;
//
std::vector<faceXtet> conn;
while
(
beg
!=
end
){
//
while (beg != end){
if
(
!
(
*
beg
)
->
isDeleted
()){
//
if (!(*beg)->isDeleted()){
for
(
int
i
=
0
;
i
<
4
;
i
++
){
//
for (int i = 0; i < 4; i++){
faceXtet
fxt
(
*
beg
,
i
);
//
faceXtet fxt(*beg, i);
std
::
vector
<
faceXtet
>::
iterator
found
=
std
::
find
(
conn
.
begin
(),
conn
.
end
(),
fxt
);
//
std::vector<faceXtet>::iterator found = std::find(conn.begin(), conn.end(), fxt);
// std::set<faceXtet>::iterator found = conn.find(fxt);
//
// std::set<faceXtet>::iterator found = conn.find(fxt);
if
(
found
==
conn
.
end
())
//
if (found == conn.end())
conn
.
push_back
(
fxt
);
//
conn.push_back(fxt);
// conn.insert(fxt);
//
// conn.insert(fxt);
else
if
(
found
->
t1
!=
*
beg
){
//
else if (found->t1 != *beg){
found
->
t1
->
setNeigh
(
found
->
i1
,
*
beg
);
//
found->t1->setNeigh(found->i1, *beg);
(
*
beg
)
->
setNeigh
(
i
,
found
->
t1
);
//
(*beg)->setNeigh(i, found->t1);
}
//
}
}
//
}
}
//
}
++
beg
;
//
++beg;
}
//
}
}
//
}
template
<
class
ITER
>
template
<
class
ITER
>
void
connectTets
(
ITER
beg
,
ITER
end
,
std
::
set
<
MFace
,
Less_Face
>
*
allEmbeddedFaces
=
0
)
void
connectTets
(
ITER
beg
,
ITER
end
,
std
::
set
<
MFace
,
Less_Face
>
*
allEmbeddedFaces
=
0
)
...
@@ -372,38 +372,38 @@ void recurFindCavity(std::vector<faceXtet> & shell,
...
@@ -372,38 +372,38 @@ void recurFindCavity(std::vector<faceXtet> & shell,
}
}
void
nonrecurFindCavity
(
std
::
vector
<
faceXtet
>
&
shell
,
//
void nonrecurFindCavity(std::vector<faceXtet> & shell,
std
::
vector
<
MTet4
*>
&
cavity
,
//
std::vector<MTet4*> & cavity,
MVertex
*
v
,
//
MVertex *v ,
MTet4
*
t
,
//
MTet4 *t,
std
::
stack
<
MTet4
*>
&
_stack
)
//
std::stack<MTet4*> &_stack)
{
//
{
_stack
.
push
(
t
);
//
_stack.push(t);
while
(
!
_stack
.
empty
()){
//
while(!_stack.empty()){
t
=
_stack
.
top
();
//
t = _stack.top();
_stack
.
pop
();
//
_stack.pop();
if
(
!
t
->
isDeleted
()){
//
if (!t->isDeleted()){
t
->
setDeleted
(
true
);
//
t->setDeleted(true);
cavity
.
push_back
(
t
);
//
cavity.push_back(t);
for
(
int
i
=
0
;
i
<
4
;
i
++
){
//
for (int i = 0; i < 4; i++){
MTet4
*
neigh
=
t
->
getNeigh
(
i
)
;
//
MTet4 *neigh = t->getNeigh(i) ;
faceXtet
fxt
(
t
,
i
);
//
faceXtet fxt (t, i);
if
(
!
neigh
)
//
if (!neigh)
shell
.
push_back
(
fxt
);
//
shell.push_back(fxt);
else
if
(
!
neigh
->
isDeleted
()){
//
else if (!neigh->isDeleted()){
int
circ
=
neigh
->
inCircumSphere
(
v
);
//
int circ = neigh->inCircumSphere(v);
if
(
circ
&&
(
neigh
->
onWhat
()
==
t
->
onWhat
()))
//
if (circ && (neigh->onWhat() == t->onWhat()))
_stack
.
push
(
neigh
);
//
_stack.push(neigh);
else
//
else
shell
.
push_back
(
fxt
);
//
shell.push_back(fxt);
}
//
}
}
//
}
}
//
}
}
//
}
// printf("cavity size %d\n",cavity.size());
//
// printf("cavity size %d\n",cavity.size());
}
//
}
void
printTets
(
const
char
*
fn
,
std
::
list
<
MTet4
*>
&
cavity
,
bool
force
=
false
)
void
printTets
(
const
char
*
fn
,
std
::
list
<
MTet4
*>
&
cavity
,
bool
force
=
false
)
{
{
...
@@ -434,7 +434,8 @@ bool insertVertexB(std::list<faceXtet> &shell,
...
@@ -434,7 +434,8 @@ bool insertVertexB(std::list<faceXtet> &shell,
std
::
vector
<
double
>
&
vSizesBGM
,
std
::
vector
<
double
>
&
vSizesBGM
,
std
::
set
<
MTet4
*
,
compareTet4Ptr
>
*
activeTets
=
0
)
std
::
set
<
MTet4
*
,
compareTet4Ptr
>
*
activeTets
=
0
)
{
{
std
::
list
<
MTet4
*>
new_cavity
;
std
::
vector
<
faceXtet
>
conn
;
std
::
vector
<
MTet4
*>
new_cavity
;
// check that volume is conserved
// check that volume is conserved
double
newVolume
=
0
;
double
newVolume
=
0
;
double
oldVolume
=
0
;
double
oldVolume
=
0
;
...
@@ -500,11 +501,11 @@ bool insertVertexB(std::list<faceXtet> &shell,
...
@@ -500,11 +501,11 @@ bool insertVertexB(std::list<faceXtet> &shell,
// if (!onePointIsTooClose){
// if (!onePointIsTooClose){
if
(
fabs
(
oldVolume
-
newVolume
)
<
1.e-10
*
oldVolume
&&
if
(
fabs
(
oldVolume
-
newVolume
)
<
1.e-10
*
oldVolume
&&
!
onePointIsTooClose
){
!
onePointIsTooClose
){
connectTets_vector
(
new_cavity
.
begin
(),
new_cavity
.
end
()
);
connectTets_vector
2
(
new_cavity
,
conn
);
allTets
.
insert
(
newTets
,
newTets
+
shell
.
size
());
allTets
.
insert
(
newTets
,
newTets
+
shell
.
size
());
if
(
activeTets
){
if
(
activeTets
){
for
(
std
::
list
<
MTet4
*>::
iterator
i
=
new_cavity
.
begin
();
i
!=
new_cavity
.
end
();
++
i
){
for
(
std
::
vector
<
MTet4
*>::
iterator
i
=
new_cavity
.
begin
();
i
!=
new_cavity
.
end
();
++
i
){
int
active_face
;
int
active_face
;
if
(
isActive
(
*
i
,
LIMIT_
,
active_face
)
&&
(
*
i
)
->
getRadius
()
>
LIMIT_
){
if
(
isActive
(
*
i
,
LIMIT_
,
active_face
)
&&
(
*
i
)
->
getRadius
()
>
LIMIT_
){
if
((
*
activeTets
).
find
(
*
i
)
==
(
*
activeTets
).
end
())
if
((
*
activeTets
).
find
(
*
i
)
==
(
*
activeTets
).
end
())
...
@@ -696,11 +697,16 @@ void non_recursive_classify(MTet4 *t, std::list<MTet4*> &theRegion,
...
@@ -696,11 +697,16 @@ void non_recursive_classify(MTet4 *t, std::list<MTet4*> &theRegion,
std
::
stack
<
MTet4
*>
_stackounette
;
std
::
stack
<
MTet4
*>
_stackounette
;
_stackounette
.
push
(
t
);
_stackounette
.
push
(
t
);
bool
touchesOutsideBox
=
false
;
while
(
!
_stackounette
.
empty
()){
while
(
!
_stackounette
.
empty
()){
t
=
_stackounette
.
top
();
t
=
_stackounette
.
top
();
_stackounette
.
pop
();
_stackounette
.
pop
();
if
(
!
t
)
Msg
::
Fatal
(
"a tet is not connected by a boundary face"
);
if
(
!
t
)
{
if
(
!
t
->
onWhat
())
{
// Msg::Fatal("a tet is not connected by a boundary face");
touchesOutsideBox
=
true
;
}
else
if
(
!
t
->
onWhat
())
{
theRegion
.
push_back
(
t
);
theRegion
.
push_back
(
t
);
t
->
setOnWhat
(
bidon
);
t
->
setOnWhat
(
bidon
);
bool
FF
[
4
]
=
{
0
,
0
,
0
,
0
};
bool
FF
[
4
]
=
{
0
,
0
,
0
,
0
};
...
@@ -721,6 +727,7 @@ void non_recursive_classify(MTet4 *t, std::list<MTet4*> &theRegion,
...
@@ -721,6 +727,7 @@ void non_recursive_classify(MTet4 *t, std::list<MTet4*> &theRegion,
}
}
}
}
}
}
if
(
touchesOutsideBox
)
faces_bound
.
clear
();
}
}
...
@@ -1706,51 +1713,32 @@ int straddling_segment_intersects_triangle(SPoint3 &p1,SPoint3 &p2,
...
@@ -1706,51 +1713,32 @@ int straddling_segment_intersects_triangle(SPoint3 &p1,SPoint3 &p2,
return
(
s4
*
s5
>=
0
)
;
return
(
s4
*
s5
>=
0
)
;
}
}
//int intersect_line_triangle(double X[3], double Y[3], double Z[3] ,
// double P[3], double N[3], double);
static
MTet4
*
search4Tet
(
MTet4
*
t
,
MVertex
*
v
,
int
_size
,
int
&
ITER
)
{
static
MTet4
*
search4Tet
(
MTet4
*
t
,
MVertex
*
v
,
int
_size
,
int
&
ITER
)
{
if
(
t
->
inCircumSphere
(
v
))
return
t
;
if
(
t
->
inCircumSphere
(
v
))
return
t
;
SPoint3
p2
(
v
->
x
(),
v
->
y
(),
v
->
z
());
SPoint3
p2
(
v
->
x
(),
v
->
y
(),
v
->
z
());
std
::
set
<
MTet4
*>
path
;
std
::
set
<
MTet4
*>
path
;
while
(
1
){
while
(
1
){
path
.
insert
(
t
);
path
.
insert
(
t
);
// path.push_back(t);
// if (t->isDeleted()){
// printf("on tourne en rond\n");
// }
// t->setDeleted(true);
SPoint3
p1
=
t
->
tet
()
->
barycenter
();
SPoint3
p1
=
t
->
tet
()
->
barycenter
();
int
found
=
-
1
;
int
found
=
-
1
;
// int nbIntersect = 0;
MTet4
*
neighOK
=
0
;
MTet4
*
neighOK
=
0
;
for
(
int
i
=
0
;
i
<
4
;
i
++
){
for
(
int
i
=
0
;
i
<
4
;
i
++
){
MTet4
*
neigh
=
t
->
getNeigh
(
i
);
MTet4
*
neigh
=
t
->
getNeigh
(
i
);
if
(
neigh
&&
path
.
find
(
neigh
)
==
path
.
end
()){
if
(
neigh
&&
path
.
find
(
neigh
)
==
path
.
end
()){
neighOK
=
neigh
;
neighOK
=
neigh
;
faceXtet
fxt
(
t
,
i
);
faceXtet
fxt
(
t
,
i
);
// double X[3] = {fxt.v[0]->x(),fxt.v[1]->x(),fxt.v[2]->x()};
// double Y[3] = {fxt.v[0]->y(),fxt.v[1]->y(),fxt.v[2]->y()};
// double Z[3] = {fxt.v[0]->z(),fxt.v[1]->z(),fxt.v[2]->z()};
SPoint3
q1
(
fxt
.
v
[
0
]
->
x
(),
fxt
.
v
[
0
]
->
y
(),
fxt
.
v
[
0
]
->
z
());
SPoint3
q1
(
fxt
.
v
[
0
]
->
x
(),
fxt
.
v
[
0
]
->
y
(),
fxt
.
v
[
0
]
->
z
());
SPoint3
q2
(
fxt
.
v
[
1
]
->
x
(),
fxt
.
v
[
1
]
->
y
(),
fxt
.
v
[
1
]
->
z
());
SPoint3
q2
(
fxt
.
v
[
1
]
->
x
(),
fxt
.
v
[
1
]
->
y
(),
fxt
.
v
[
1
]
->
z
());
SPoint3
q3
(
fxt
.
v
[
2
]
->
x
(),
fxt
.
v
[
2
]
->
y
(),
fxt
.
v
[
2
]
->
z
());
SPoint3
q3
(
fxt
.
v
[
2
]
->
x
(),
fxt
.
v
[
2
]
->
y
(),
fxt
.
v
[
2
]
->
z
());
// printf("%d %d\n",intersect_line_triangle(X,Y,Z,p1,p2-p1,0.0) > 0,straddling_segment_intersects_triangle (p1,p2,q1,q2,q3));
if
(
straddling_segment_intersects_triangle
(
p1
,
p2
,
q1
,
q2
,
q3
)){
if
(
straddling_segment_intersects_triangle
(
p1
,
p2
,
q1
,
q2
,
q3
)){
// if (intersect_line_triangle(X,Y,Z,p1,p1-p2, 0.0) > 0) {
found
=
i
;
found
=
i
;
// nbIntersect++;
break
;
break
;
}
}
}
}
}
}
// if (nbIntersect != 1){
// printf("quite unusual %d intersections volume %12.5E\n",nbIntersect,t->getVolume());
//
// }
if
(
found
<
0
){
if
(
found
<
0
){
if
(
neighOK
)
t
=
neighOK
;
if
(
neighOK
)
t
=
neighOK
;
else
return
0
;
else
return
0
;
...
@@ -1800,7 +1788,6 @@ bool tetOnBox (MTetrahedron *t, MVertex *box[8]){
...
@@ -1800,7 +1788,6 @@ bool tetOnBox (MTetrahedron *t, MVertex *box[8]){
std
::
vector
<
faceXtet
>
conn
;
std
::
vector
<
faceXtet
>
conn
;
std
::
vector
<
faceXtet
>
shell
;
std
::
vector
<
faceXtet
>
shell
;
std
::
vector
<
MTet4
*>
cavity
;
std
::
vector
<
MTet4
*>
cavity
;
// std::stack<MTet4*> _stack;
MVertex
*
box
[
8
];
MVertex
*
box
[
8
];
initialCube
(
v
,
box
,
t
);
initialCube
(
v
,
box
,
t
);
...
@@ -1809,40 +1796,32 @@ bool tetOnBox (MTetrahedron *t, MVertex *box[8]){
...
@@ -1809,40 +1796,32 @@ bool tetOnBox (MTetrahedron *t, MVertex *box[8]){
SortHilbert
(
v
);
SortHilbert
(
v
);
double
t1
=
Cpu
();
double
t1
=
Cpu
();
double
ta
=
0
,
tb
=
0
,
tc
=
0
,
td
=
0
,
T
;
//
double ta=0,tb=0,tc=0,td=0,T;
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
];
// if (i%10000 == 0)printf("PT(%7d)\n",i);
int
NITER
=
0
;
int
NITER
=
0
;
T
=
Cpu
();
//
T = Cpu();
MTet4
*
found
=
getTetToBreak
(
pv
,
t
,
NB_GLOBAL_SEARCH
,
NITER
);
MTet4
*
found
=
getTetToBreak
(
pv
,
t
,
NB_GLOBAL_SEARCH
,
NITER
);
ta
+=
Cpu
()
-
T
;
// ta += Cpu()-T;
// printf("NITER = %d\n",NITER);
AVG_ITER
+=
NITER
;
AVG_ITER
+=
NITER
;
if
(
!
found
)
{
if
(
!
found
)
{
printf
(
"argh
\n
"
);
Msg
::
Error
(
"cannot insert a point in 3D Delaunay
"
);
continue
;
continue
;
}
}
shell
.
clear
();
shell
.
clear
();
cavity
.
clear
();
cavity
.
clear
();
T
=
Cpu
();
//
T = Cpu();
recurFindCavity
(
shell
,
cavity
,
pv
,
found
);
recurFindCavity
(
shell
,
cavity
,
pv
,
found
);
tb
+=
Cpu
()
-
T
;
// tb += Cpu()-T;
// int cs = cavity.size(),ss=shell.size();
double
V
=
0.0
;
double
V
=
0.0
;
for
(
unsigned
int
k
=
0
;
k
<
cavity
.
size
();
k
++
)
V
+=
fabs
(
cavity
[
k
]
->
tet
()
->
getVolume
());
for
(
unsigned
int
k
=
0
;
k
<
cavity
.
size
();
k
++
)
V
+=
fabs
(
cavity
[
k
]
->
tet
()
->
getVolume
());
// shell.clear();
// cavity.clear();
// recurFindCavity(shell, cavity, pv, found);
// printf("%d %d -- %d %d\n",cs,cavity.size(),ss,shell.size());
std
::
vector
<
MTet4
*>
extended_cavity
;
std
::
vector
<
MTet4
*>
extended_cavity
;
double
Vb
=
0.0
;
double
Vb
=
0.0
;
T
=
Cpu
();
//
T = Cpu();
for
(
unsigned
int
count
=
0
;
count
<
shell
.
size
();
count
++
){
for
(
unsigned
int
count
=
0
;
count
<
shell
.
size
();
count
++
){
const
faceXtet
&
fxt
=
shell
[
count
];
const
faceXtet
&
fxt
=
shell
[
count
];
MTetrahedron
*
tr
;
MTetrahedron
*
tr
;
...
@@ -1869,7 +1848,7 @@ bool tetOnBox (MTetrahedron *t, MVertex *box[8]){
...
@@ -1869,7 +1848,7 @@ bool tetOnBox (MTetrahedron *t, MVertex *box[8]){
if
(
otherSide
)
if
(
otherSide
)
extended_cavity
.
push_back
(
otherSide
);
extended_cavity
.
push_back
(
otherSide
);
}
}
tc
+=
Cpu
()
-
T
;
//
tc += Cpu()-T;
if
(
fabs
(
Vb
-
V
)
>
1.e-8
*
(
Vb
+
V
))
printf
(
"%12.5E %12.5E
\n
"
,
Vb
,
V
);
if
(
fabs
(
Vb
-
V
)
>
1.e-8
*
(
Vb
+
V
))
printf
(
"%12.5E %12.5E
\n
"
,
Vb
,
V
);
...
@@ -1880,9 +1859,9 @@ bool tetOnBox (MTetrahedron *t, MVertex *box[8]){
...
@@ -1880,9 +1859,9 @@ bool tetOnBox (MTetrahedron *t, MVertex *box[8]){
cavity
[
k
]
->
setNeigh
(
l
,
0
);
cavity
[
k
]
->
setNeigh
(
l
,
0
);
}
}
}
}
T
=
Cpu
();
//
T = Cpu();
connectTets_vector2
(
extended_cavity
,
conn
);
connectTets_vector2
(
extended_cavity
,
conn
);
td
+=
Cpu
()
-
T
;
//
td += Cpu()-T;
}
}
double
t2
=
Cpu
();
double
t2
=
Cpu
();
...
...
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