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
59424969
Commit
59424969
authored
Jan 19, 2012
by
Emilie Marchandise
Browse files
Options
Downloads
Patches
Plain Diff
splitMesh almost done for centerlines
parent
34fc875c
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
Mesh/CenterlineField.cpp
+84
-17
84 additions, 17 deletions
Mesh/CenterlineField.cpp
Mesh/CenterlineField.h
+4
-0
4 additions, 0 deletions
Mesh/CenterlineField.h
benchmarks/levelset/square.geo
+1
-1
1 addition, 1 deletion
benchmarks/levelset/square.geo
with
89 additions
and
18 deletions
Mesh/CenterlineField.cpp
+
84
−
17
View file @
59424969
...
@@ -23,6 +23,8 @@
...
@@ -23,6 +23,8 @@
#include
"MLine.h"
#include
"MLine.h"
#include
"GEntity.h"
#include
"GEntity.h"
#include
"Field.h"
#include
"Field.h"
#include
"GFace.h"
#include
"Integration3D.h"
#if defined(HAVE_ANN)
#if defined(HAVE_ANN)
#include
<ANN/ANN.h>
#include
<ANN/ANN.h>
...
@@ -181,11 +183,16 @@ Centerline::~Centerline(){
...
@@ -181,11 +183,16 @@ Centerline::~Centerline(){
void
Centerline
::
importFile
(
std
::
string
fileName
){
void
Centerline
::
importFile
(
std
::
string
fileName
){
GModel
*
current
=
GModel
::
current
();
GModel
*
current
=
GModel
::
current
();
std
::
vector
<
GEntity
*>
entities
;
current
->
getEntities
(
entities
)
;
for
(
unsigned
int
i
=
0
;
i
<
entities
.
size
();
i
++
){
if
(
entities
[
i
]
->
dim
()
==
2
)
surfaces
.
push_back
((
GFace
*
)
entities
[
i
]);
}
entities
.
clear
();
mod
=
new
GModel
();
mod
=
new
GModel
();
mod
->
readVTK
(
fileName
.
c_str
());
mod
->
readVTK
(
fileName
.
c_str
());
mod
->
removeDuplicateMeshVertices
(
1.e-8
);
mod
->
removeDuplicateMeshVertices
(
1.e-8
);
std
::
vector
<
GEntity
*>
entities
;
mod
->
getEntities
(
entities
);
mod
->
getEntities
(
entities
);
current
->
setAsCurrent
();
current
->
setAsCurrent
();
...
@@ -344,13 +351,9 @@ void Centerline::distanceToLines(){
...
@@ -344,13 +351,9 @@ void Centerline::distanceToLines(){
std
::
vector
<
double
>
distancesE
;
std
::
vector
<
double
>
distancesE
;
std
::
vector
<
SPoint3
>
closePts
;
std
::
vector
<
SPoint3
>
closePts
;
GModel
*
current
=
GModel
::
current
();
for
(
unsigned
int
i
=
0
;
i
<
surfaces
.
size
();
i
++
){
std
::
vector
<
GEntity
*>
_entities
;
for
(
int
j
=
0
;
j
<
surfaces
[
i
]
->
getNumMeshElements
();
j
++
){
current
->
getEntities
(
_entities
)
;
MElement
*
e
=
surfaces
[
i
]
->
getMeshElement
(
j
);
for
(
unsigned
int
i
=
0
;
i
<
_entities
.
size
();
i
++
){
if
(
_entities
[
i
]
->
dim
()
!=
2
)
continue
;
for
(
unsigned
int
j
=
0
;
j
<
_entities
[
i
]
->
getNumMeshElements
();
j
++
){
MElement
*
e
=
_entities
[
i
]
->
getMeshElement
(
j
);
for
(
int
k
=
0
;
k
<
e
->
getNumVertices
();
k
++
){
for
(
int
k
=
0
;
k
<
e
->
getNumVertices
();
k
++
){
MVertex
*
v
=
e
->
getVertex
(
k
);
MVertex
*
v
=
e
->
getVertex
(
k
);
pts_set
.
insert
(
SPoint3
(
v
->
x
(),
v
->
y
(),
v
->
z
()));
pts_set
.
insert
(
SPoint3
(
v
->
x
(),
v
->
y
(),
v
->
z
()));
...
@@ -392,7 +395,7 @@ void Centerline::computeRadii(){
...
@@ -392,7 +395,7 @@ void Centerline::computeRadii(){
std
::
map
<
MLine
*
,
double
>::
iterator
itr
=
radiusl
.
find
(
l
);
std
::
map
<
MLine
*
,
double
>::
iterator
itr
=
radiusl
.
find
(
l
);
if
(
itr
!=
radiusl
.
end
()){
if
(
itr
!=
radiusl
.
end
()){
edges
[
i
].
minRad
=
std
::
min
(
itr
->
second
,
edges
[
i
].
minRad
);
edges
[
i
].
minRad
=
std
::
min
(
itr
->
second
,
edges
[
i
].
minRad
);
edges
[
i
].
maxRad
=
std
::
m
in
(
itr
->
second
,
edges
[
i
].
maxRad
);
edges
[
i
].
maxRad
=
std
::
m
ax
(
itr
->
second
,
edges
[
i
].
maxRad
);
}
}
else
printf
(
"ARGG line not found
\n
"
);
else
printf
(
"ARGG line not found
\n
"
);
}
}
...
@@ -445,6 +448,8 @@ void Centerline::buildKdTree(){
...
@@ -445,6 +448,8 @@ void Centerline::buildKdTree(){
void
Centerline
::
splitMesh
(){
void
Centerline
::
splitMesh
(){
Msg
::
Info
(
"Splitting surface mesh with centerline field "
);
for
(
unsigned
int
i
=
0
;
i
<
edges
.
size
();
++
i
){
for
(
unsigned
int
i
=
0
;
i
<
edges
.
size
();
++
i
){
std
::
vector
<
MLine
*>
lines
=
edges
[
i
].
lines
;
std
::
vector
<
MLine
*>
lines
=
edges
[
i
].
lines
;
MVertex
*
v1
=
edges
[
i
].
vE
;
MVertex
*
v1
=
edges
[
i
].
vE
;
...
@@ -456,7 +461,7 @@ void Centerline::splitMesh(){
...
@@ -456,7 +461,7 @@ void Centerline::splitMesh(){
else
if
(
lines
.
back
()
->
getVertex
(
1
)
==
v1
)
v2
=
lines
.
back
()
->
getVertex
(
0
);
else
if
(
lines
.
back
()
->
getVertex
(
1
)
==
v1
)
v2
=
lines
.
back
()
->
getVertex
(
0
);
SVector3
dir
(
v2
->
x
()
-
v1
->
x
(),
v2
->
y
()
-
v1
->
y
(),
v2
->
z
()
-
v1
->
z
());
SVector3
dir
(
v2
->
x
()
-
v1
->
x
(),
v2
->
y
()
-
v1
->
y
(),
v2
->
z
()
-
v1
->
z
());
if
(
edges
[
i
].
children
.
size
()
>
0.0
){
if
(
edges
[
i
].
children
.
size
()
>
0.0
){
cutByDisk
(
pt
,
dir
,
edges
[
i
].
maxRad
);
cutByDisk
(
pt
,
dir
,
1.2
*
edges
[
i
].
maxRad
);
}
}
}
}
...
@@ -469,8 +474,70 @@ void Centerline::cutByDisk(SPoint3 pt, SVector3 norm, double rad){
...
@@ -469,8 +474,70 @@ void Centerline::cutByDisk(SPoint3 pt, SVector3 norm, double rad){
double
b
=
norm
.
y
();
double
b
=
norm
.
y
();
double
c
=
norm
.
z
();
double
c
=
norm
.
z
();
double
d
=
-
a
*
pt
[
0
]
-
b
*
pt
[
1
]
-
c
*
pt
[
2
];
double
d
=
-
a
*
pt
[
0
]
-
b
*
pt
[
1
]
-
c
*
pt
[
2
];
printf
(
"PLane = %g %g %g %g
\n
"
,
a
,
b
,
c
,
d
);
printf
(
"Plane = %g %g %g %g
\n
"
,
a
,
b
,
c
,
d
);
//ls = a * x + b * y + c * z + d;
//variables for using the cutting tools
std
::
vector
<
DI_Line
*>
lines
;
std
::
vector
<
DI_Triangle
*>
triangles
;
std
::
vector
<
DI_Quad
*>
quads
;
DI_Point
::
Container
cp
;
//cut points
std
::
vector
<
DI_IntegrationPoint
*>
ipV
;
//integration points vol
std
::
vector
<
DI_IntegrationPoint
*>
ipS
;
//integration points surf
bool
isCut
=
false
;
int
integOrder
=
1
;
int
recur
=
0
;
gLevelset
*
GLS
=
new
gLevelsetPlane
(
0.
,
0.
,
0.
,
0.
);
std
::
vector
<
gLevelset
*>
RPN
;
RPN
.
push_back
(
GLS
);
//loop over all surface mesh elements
for
(
unsigned
int
i
=
0
;
i
<
surfaces
.
size
();
i
++
){
for
(
int
j
=
0
;
j
<
surfaces
[
i
]
->
getNumMeshElements
();
j
++
){
MElement
*
e
=
surfaces
[
i
]
->
getMeshElement
(
j
);
if
(
e
->
getNumVertices
()
!=
3
){
Msg
::
Error
(
"Centerline split only implemented for tri meshes so far ..."
);
exit
(
1
);
exit
(
1
);
}
int
nbV
=
e
->
getNumVertices
();
double
**
nodeLs
=
new
double
*
[
nbV
];
DI_Triangle
T
(
e
->
getVertex
(
0
)
->
x
(),
e
->
getVertex
(
0
)
->
y
(),
e
->
getVertex
(
0
)
->
z
(),
e
->
getVertex
(
1
)
->
x
(),
e
->
getVertex
(
1
)
->
y
(),
e
->
getVertex
(
1
)
->
z
(),
e
->
getVertex
(
2
)
->
x
(),
e
->
getVertex
(
2
)
->
y
(),
e
->
getVertex
(
2
)
->
z
());
SPoint3
cg
(
0.333
*
(
e
->
getVertex
(
0
)
->
x
()
+
e
->
getVertex
(
1
)
->
x
()
+
e
->
getVertex
(
2
)
->
x
()),
0.333
*
(
e
->
getVertex
(
0
)
->
y
()
+
e
->
getVertex
(
1
)
->
y
()
+
e
->
getVertex
(
2
)
->
y
()),
0.333
*
(
e
->
getVertex
(
0
)
->
z
()
+
e
->
getVertex
(
1
)
->
z
()
+
e
->
getVertex
(
2
)
->
z
()));
T
.
setPolynomialOrder
(
1
);
double
x0
=
e
->
getVertex
(
0
)
->
x
(),
y0
=
e
->
getVertex
(
0
)
->
y
(),
z0
=
e
->
getVertex
(
0
)
->
z
();
double
val0
=
a
*
x0
+
b
*
y0
+
c
*
z0
+
d
;
double
sign0
=
val0
;
bool
zeroElem
=
false
;
nodeLs
[
0
]
=
new
double
[
1
];
//one ls value
nodeLs
[
0
][
0
]
=
val0
;
for
(
int
i
=
1
;
i
<
nbV
;
i
++
){
double
x
=
e
->
getVertex
(
i
)
->
x
(),
y
=
e
->
getVertex
(
i
)
->
y
(),
z
=
e
->
getVertex
(
i
)
->
z
();
double
val
=
a
*
x
+
b
*
y
+
c
*
z
+
d
;
double
sign
=
sign0
*
val
;
if
(
sign
<
0.0
&&
!
zeroElem
)
zeroElem
=
true
;
nodeLs
[
i
]
=
new
double
[
1
];
//one ls value
nodeLs
[
i
][
0
]
=
val
;
}
if
(
zeroElem
){
double
radius
=
sqrt
((
cg
.
x
()
-
pt
.
x
())
*
(
cg
.
x
()
-
pt
.
x
())
+
(
cg
.
y
()
-
pt
.
y
())
*
(
cg
.
y
()
-
pt
.
y
())
+
(
cg
.
z
()
-
pt
.
z
())
*
(
cg
.
z
()
-
pt
.
z
()));
if
(
radius
<
rad
){
isCut
=
T
.
cut
(
RPN
,
ipV
,
ipS
,
cp
,
integOrder
,
integOrder
,
integOrder
,
quads
,
triangles
,
lines
,
recur
,
nodeLs
);
}
}
else
triangles
.
push_back
(
&
T
);
for
(
int
i
=
0
;
i
<
nbV
;
i
++
)
delete
nodeLs
[
i
];
delete
[]
nodeLs
;
}
}
printf
(
"split mesh done
\n
"
);
return
;
return
;
}
}
...
...
...
...
This diff is collapsed.
Click to expand it.
Mesh/CenterlineField.h
+
4
−
0
View file @
59424969
...
@@ -15,6 +15,7 @@
...
@@ -15,6 +15,7 @@
#include
<string>
#include
<string>
#include
"Field.h"
#include
"Field.h"
class
GModel
;
class
GModel
;
class
GFace
;
class
MLine
;
class
MLine
;
class
MVertex
;
class
MVertex
;
class
GEntity
;
class
GEntity
;
...
@@ -64,6 +65,9 @@ class Centerline : public Field{
...
@@ -64,6 +65,9 @@ class Centerline : public Field{
std
::
map
<
MVertex
*
,
int
>
colorp
;
std
::
map
<
MVertex
*
,
int
>
colorp
;
std
::
map
<
MLine
*
,
int
>
colorl
;
std
::
map
<
MLine
*
,
int
>
colorl
;
//the tubular surface mesh
std
::
vector
<
GFace
*>
surfaces
;
public:
public:
Centerline
(
std
::
string
fileName
);
Centerline
(
std
::
string
fileName
);
Centerline
();
Centerline
();
...
...
...
...
This diff is collapsed.
Click to expand it.
benchmarks/levelset/square.geo
+
1
−
1
View file @
59424969
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
Mesh
.
Algorithm
=
1
;
Mesh
.
Algorithm
=
1
;
Mesh
.
CharacteristicLengthFactor
=
1.5
;
Mesh
.
CharacteristicLengthFactor
=
1.5
;
Mesh
.
ElementOrder
=
2
;
Mesh
.
ElementOrder
=
1
;
lc
=
0.1
;
lc
=
0.1
;
Point
(
1
)
=
{
0.1
,
0.1
,
0.1
};
//,lc};
Point
(
1
)
=
{
0.1
,
0.1
,
0.1
};
//,lc};
...
...
...
...
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