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
13b91296
Commit
13b91296
authored
12 years ago
by
Francois Henrotte
Browse files
Options
Downloads
Patches
Plain Diff
smoothed cross field
parent
d8f925f8
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/directions3D.cpp
+406
-111
406 additions, 111 deletions
Mesh/directions3D.cpp
Mesh/directions3D.h
+23
-6
23 additions, 6 deletions
Mesh/directions3D.h
Mesh/yamakawa.h
+3
-2
3 additions, 2 deletions
Mesh/yamakawa.h
with
432 additions
and
119 deletions
Mesh/directions3D.cpp
+
406
−
111
View file @
13b91296
...
...
@@ -113,13 +113,12 @@ double Matrix::get_m33(){
Frame_field
::
Frame_field
(){}
void
Frame_field
::
init_region
(
GRegion
*
gr
){
// Fill in the ANN tree with the bondary cross field of region gr
#if defined(HAVE_ANN)
int
index
;
MVertex
*
vertex
;
GFace
*
gf
;
std
::
list
<
GFace
*>
faces
;
std
::
list
<
GFace
*>::
iterator
it
;
std
::
map
<
MVertex
*
,
Matrix
>::
iterator
it2
;
Matrix
m
;
Nearest_point
::
init_region
(
gr
);
...
...
@@ -129,8 +128,7 @@ void Frame_field::init_region(GRegion* gr){
temp
.
clear
();
field
.
clear
();
for
(
it
=
faces
.
begin
();
it
!=
faces
.
end
();
it
++
)
{
for
(
std
::
list
<
GFace
*>::
iterator
it
=
faces
.
begin
();
it
!=
faces
.
end
();
it
++
){
gf
=
*
it
;
init_face
(
gf
);
}
...
...
@@ -138,9 +136,9 @@ void Frame_field::init_region(GRegion* gr){
duplicate
=
annAllocPts
(
temp
.
size
(),
3
);
index
=
0
;
for
(
it
2
=
temp
.
begin
();
it
2
!=
temp
.
end
();
it
2
++
){
vertex
=
it
2
->
first
;
m
=
it
2
->
second
;
for
(
std
::
map
<
MVertex
*
,
Matrix
>::
iterator
it
=
temp
.
begin
();
it
!=
temp
.
end
();
it
++
){
vertex
=
it
->
first
;
m
=
it
->
second
;
duplicate
[
index
][
0
]
=
vertex
->
x
();
duplicate
[
index
][
1
]
=
vertex
->
y
();
duplicate
[
index
][
2
]
=
vertex
->
z
();
...
...
@@ -186,10 +184,11 @@ void Frame_field::init_face(GFace* gf){
for
(
j
=
0
;
j
<
element
->
getNumVertices
();
j
++
){
vertex
=
element
->
getVertex
(
j
);
ok
=
translate
(
gf
,
octree
,
vertex
,
SPoint2
(
average_x
,
average_y
),
v1
,
v2
);
if
(
ok
){
v3
=
crossprod
(
v1
,
v2
);
v1
.
normalize
();
v2
.
normalize
();
v3
=
crossprod
(
v1
,
v2
);
v3
.
normalize
();
m
.
set_m11
(
v1
.
x
());
m
.
set_m21
(
v1
.
y
());
...
...
@@ -221,7 +220,7 @@ bool Frame_field::translate(GFace* gf,MElementOctree* octree,MVertex* vertex,SPo
GPoint
gp2
;
ok
=
true
;
k
=
0.000
0
1
;
k
=
0.0001
;
reparamMeshVertexOnFace
(
vertex
,
gf
,
point
);
x
=
point
.
x
();
y
=
point
.
y
();
...
...
@@ -259,13 +258,12 @@ bool Frame_field::translate(GFace* gf,MElementOctree* octree,MVertex* vertex,SPo
v1
=
SVector3
(
1.0
,
0.0
,
0.0
);
v2
=
SVector3
(
0.0
,
1.0
,
0.0
);
}
return
ok
;
}
Matrix
Frame_field
::
search
(
double
x
,
double
y
,
double
z
){
int
index
;
double
e
;
// Determines the frame/cross at location (x,y,z)
int
index
=
0
;
#if defined(HAVE_ANN)
ANNpoint
query
;
ANNidxArray
indices
;
...
...
@@ -279,7 +277,7 @@ Matrix Frame_field::search(double x,double y,double z){
indices
=
new
ANNidx
[
1
];
distances
=
new
ANNdist
[
1
];
e
=
0.0
;
double
e
=
0.0
;
kd_tree
->
annkSearch
(
query
,
1
,
indices
,
distances
,
e
);
index
=
indices
[
0
];
...
...
@@ -292,6 +290,8 @@ Matrix Frame_field::search(double x,double y,double z){
}
Matrix
Frame_field
::
combine
(
double
x
,
double
y
,
double
z
){
// Determines the frame/cross at location (x,y,z)
// Alternative to Frame_field::search
bool
ok
;
double
val1
,
val2
,
val3
;
SVector3
vec
,
other
;
...
...
@@ -359,7 +359,16 @@ double Frame_field::get_ratio(GFace* gf,SPoint2 point){
return
val
;
}
void
Frame_field
::
print_segment
(
SPoint3
p1
,
SPoint3
p2
,
std
::
ofstream
&
file
){
file
<<
"SL ("
<<
p1
.
x
()
<<
", "
<<
p1
.
y
()
<<
", "
<<
p1
.
z
()
<<
", "
<<
p2
.
x
()
<<
", "
<<
p2
.
y
()
<<
", "
<<
p2
.
z
()
<<
")"
<<
"{"
<<
p1
.
z
()
<<
","
<<
p1
.
z
()
<<
"};
\n
"
;
}
void
Frame_field
::
print_field1
(){
// Saves a file with the surface cross field contained in Frame_field.temp
// Frame_field.temp is constructed by Frame_field::init_region
double
k
;
SPoint3
p
;
SPoint3
p1
,
p2
,
p3
,
p4
,
p5
,
p6
;
...
...
@@ -369,20 +378,31 @@ void Frame_field::print_field1(){
k
=
0.05
;
std
::
ofstream
file
(
"frame1.pos"
);
file
<<
"View
\"
test
\"
{
\n
"
;
file
<<
"View
\"
cross field
\"
{
\n
"
;
for
(
it
=
temp
.
begin
();
it
!=
temp
.
end
();
it
++
){
vertex
=
it
->
first
;
m
=
it
->
second
;
p
=
SPoint3
(
vertex
->
x
(),
vertex
->
y
(),
vertex
->
z
());
p1
=
SPoint3
(
vertex
->
x
()
+
k
*
m
.
get_m11
(),
vertex
->
y
()
+
k
*
m
.
get_m21
(),
vertex
->
z
()
+
k
*
m
.
get_m31
());
p2
=
SPoint3
(
vertex
->
x
()
-
k
*
m
.
get_m11
(),
vertex
->
y
()
-
k
*
m
.
get_m21
(),
vertex
->
z
()
-
k
*
m
.
get_m31
());
p3
=
SPoint3
(
vertex
->
x
()
+
k
*
m
.
get_m12
(),
vertex
->
y
()
+
k
*
m
.
get_m22
(),
vertex
->
z
()
+
k
*
m
.
get_m32
());
p4
=
SPoint3
(
vertex
->
x
()
-
k
*
m
.
get_m12
(),
vertex
->
y
()
-
k
*
m
.
get_m22
(),
vertex
->
z
()
-
k
*
m
.
get_m32
());
p5
=
SPoint3
(
vertex
->
x
()
+
k
*
m
.
get_m13
(),
vertex
->
y
()
+
k
*
m
.
get_m23
(),
vertex
->
z
()
+
k
*
m
.
get_m33
());
p6
=
SPoint3
(
vertex
->
x
()
-
k
*
m
.
get_m13
(),
vertex
->
y
()
-
k
*
m
.
get_m23
(),
vertex
->
z
()
-
k
*
m
.
get_m33
());
p1
=
SPoint3
(
vertex
->
x
()
+
k
*
m
.
get_m11
(),
vertex
->
y
()
+
k
*
m
.
get_m21
(),
vertex
->
z
()
+
k
*
m
.
get_m31
());
p2
=
SPoint3
(
vertex
->
x
()
-
k
*
m
.
get_m11
(),
vertex
->
y
()
-
k
*
m
.
get_m21
(),
vertex
->
z
()
-
k
*
m
.
get_m31
());
p3
=
SPoint3
(
vertex
->
x
()
+
k
*
m
.
get_m12
(),
vertex
->
y
()
+
k
*
m
.
get_m22
(),
vertex
->
z
()
+
k
*
m
.
get_m32
());
p4
=
SPoint3
(
vertex
->
x
()
-
k
*
m
.
get_m12
(),
vertex
->
y
()
-
k
*
m
.
get_m22
(),
vertex
->
z
()
-
k
*
m
.
get_m32
());
p5
=
SPoint3
(
vertex
->
x
()
+
k
*
m
.
get_m13
(),
vertex
->
y
()
+
k
*
m
.
get_m23
(),
vertex
->
z
()
+
k
*
m
.
get_m33
());
p6
=
SPoint3
(
vertex
->
x
()
-
k
*
m
.
get_m13
(),
vertex
->
y
()
-
k
*
m
.
get_m23
(),
vertex
->
z
()
-
k
*
m
.
get_m33
());
print_segment
(
p
,
p1
,
file
);
print_segment
(
p
,
p2
,
file
);
print_segment
(
p
,
p3
,
file
);
...
...
@@ -390,11 +410,11 @@ void Frame_field::print_field1(){
print_segment
(
p
,
p5
,
file
);
print_segment
(
p
,
p6
,
file
);
}
file
<<
"};
\n
"
;
}
void
Frame_field
::
print_field2
(
GRegion
*
gr
){
// Saves a file with the cross fields inside the given GRegion, excluding the boundary.
unsigned
int
i
;
int
j
;
double
k
;
...
...
@@ -406,23 +426,35 @@ void Frame_field::print_field2(GRegion* gr){
k
=
0.05
;
std
::
ofstream
file
(
"frame2.pos"
);
file
<<
"View
\"
test
\"
{
\n
"
;
file
<<
"View
\"
cross field
\"
{
\n
"
;
for
(
i
=
0
;
i
<
gr
->
getNumMeshElements
();
i
++
){
element
=
gr
->
getMeshElement
(
i
);
for
(
j
=
0
;
j
<
element
->
getNumVertices
();
j
++
){
vertex
=
element
->
getVertex
(
j
);
if
(
vertex
->
onWhat
()
->
dim
()
>
2
){
m
=
combine
(
vertex
->
x
(),
vertex
->
y
(),
vertex
->
z
());
m
=
search
(
vertex
->
x
(),
vertex
->
y
(),
vertex
->
z
());
//m = combine(vertex->x(),vertex->y(),vertex->z());
p
=
SPoint3
(
vertex
->
x
(),
vertex
->
y
(),
vertex
->
z
());
p1
=
SPoint3
(
vertex
->
x
()
+
k
*
m
.
get_m11
(),
vertex
->
y
()
+
k
*
m
.
get_m21
(),
vertex
->
z
()
+
k
*
m
.
get_m31
());
p2
=
SPoint3
(
vertex
->
x
()
-
k
*
m
.
get_m11
(),
vertex
->
y
()
-
k
*
m
.
get_m21
(),
vertex
->
z
()
-
k
*
m
.
get_m31
());
p3
=
SPoint3
(
vertex
->
x
()
+
k
*
m
.
get_m12
(),
vertex
->
y
()
+
k
*
m
.
get_m22
(),
vertex
->
z
()
+
k
*
m
.
get_m32
());
p4
=
SPoint3
(
vertex
->
x
()
-
k
*
m
.
get_m12
(),
vertex
->
y
()
-
k
*
m
.
get_m22
(),
vertex
->
z
()
-
k
*
m
.
get_m32
());
p5
=
SPoint3
(
vertex
->
x
()
+
k
*
m
.
get_m13
(),
vertex
->
y
()
+
k
*
m
.
get_m23
(),
vertex
->
z
()
+
k
*
m
.
get_m33
());
p6
=
SPoint3
(
vertex
->
x
()
-
k
*
m
.
get_m13
(),
vertex
->
y
()
-
k
*
m
.
get_m23
(),
vertex
->
z
()
-
k
*
m
.
get_m33
());
p1
=
SPoint3
(
vertex
->
x
()
+
k
*
m
.
get_m11
(),
vertex
->
y
()
+
k
*
m
.
get_m21
(),
vertex
->
z
()
+
k
*
m
.
get_m31
());
p2
=
SPoint3
(
vertex
->
x
()
-
k
*
m
.
get_m11
(),
vertex
->
y
()
-
k
*
m
.
get_m21
(),
vertex
->
z
()
-
k
*
m
.
get_m31
());
p3
=
SPoint3
(
vertex
->
x
()
+
k
*
m
.
get_m12
(),
vertex
->
y
()
+
k
*
m
.
get_m22
(),
vertex
->
z
()
+
k
*
m
.
get_m32
());
p4
=
SPoint3
(
vertex
->
x
()
-
k
*
m
.
get_m12
(),
vertex
->
y
()
-
k
*
m
.
get_m22
(),
vertex
->
z
()
-
k
*
m
.
get_m32
());
p5
=
SPoint3
(
vertex
->
x
()
+
k
*
m
.
get_m13
(),
vertex
->
y
()
+
k
*
m
.
get_m23
(),
vertex
->
z
()
+
k
*
m
.
get_m33
());
p6
=
SPoint3
(
vertex
->
x
()
-
k
*
m
.
get_m13
(),
vertex
->
y
()
-
k
*
m
.
get_m23
(),
vertex
->
z
()
-
k
*
m
.
get_m33
());
print_segment
(
p
,
p1
,
file
);
print_segment
(
p
,
p2
,
file
);
print_segment
(
p
,
p3
,
file
);
...
...
@@ -432,17 +464,9 @@ void Frame_field::print_field2(GRegion* gr){
}
}
}
file
<<
"};
\n
"
;
}
void
Frame_field
::
print_segment
(
SPoint3
p1
,
SPoint3
p2
,
std
::
ofstream
&
file
){
file
<<
"SL ("
<<
p1
.
x
()
<<
", "
<<
p1
.
y
()
<<
", "
<<
p1
.
z
()
<<
", "
<<
p2
.
x
()
<<
", "
<<
p2
.
y
()
<<
", "
<<
p2
.
z
()
<<
")"
<<
"{10, 20};
\n
"
;
}
GRegion
*
Frame_field
::
test
(){
GRegion
*
gr
;
GModel
*
model
=
GModel
::
current
();
...
...
@@ -463,6 +487,274 @@ void Frame_field::clear(){
#endif
}
#include
"yamakawa.h"
#include
"cross3D.h"
CWTSSpaceVector
<>
convert
(
const
SVector3
v
){
return
CWTSSpaceVector
<>
(
v
.
x
(),
v
.
y
(),
v
.
z
());
}
SVector3
convert
(
const
CWTSSpaceVector
<>
x
){
return
SVector3
(
x
[
0
],
x
[
1
],
x
[
2
]);
}
ostream
&
operator
<<
(
ostream
&
os
,
SVector3
&
v
)
{
os
<<
"("
<<
v
.
x
()
<<
", "
<<
v
.
y
()
<<
", "
<<
v
.
z
()
<<
")"
;
return
os
;
}
void
Frame_field
::
init
(
GRegion
*
gr
){
//
MVertex
*
pVertex
;
Matrix
m
;
CWTSSpaceVector
<>
Ex
(
1
,
0
,
0
),
Ey
(
0
,
1
,
0
),
Ez
(
0
,
0
,
1
);
cross3D
x
(
Ez
,
Ex
);
CWTSSpaceVector
<>
v
(
1
,
2
,
0
),
w
(
0
,
1
,
1.3
);
cross3D
y
=
cross3D
(
v
,
w
);
Recombinator
crossData
;
crossData
.
build_vertex_to_vertices
(
gr
);
for
(
std
::
map
<
MVertex
*
,
std
::
set
<
MVertex
*>
>::
const_iterator
iter
=
crossData
.
vertex_to_vertices
.
begin
();
iter
!=
crossData
.
vertex_to_vertices
.
end
();
++
iter
){
pVertex
=
iter
->
first
;
m
=
search
(
pVertex
->
x
(),
pVertex
->
y
(),
pVertex
->
z
());
// if(pVertex->onWhat()->dim() <= 2)
// m = search(pVertex->x(), pVertex->y(), pVertex->z());
// else
// m = convert(y);
crossField
[
pVertex
->
getNum
()]
=
m
;
}
}
double
Frame_field
::
findBarycenter
(
std
::
map
<
MVertex
*
,
std
::
set
<
MVertex
*>
>::
const_iterator
iter
,
Matrix
&
m0
){
double
theta
,
gradient
,
energy
;
Matrix
m
;
CWTSSpaceVector
<>
axis
;
bool
debug
=
false
;
MVertex
*
pVertex0
=
iter
->
first
;
std
::
set
<
MVertex
*>
list
=
iter
->
second
;
cross3D
x
(
m0
);
if
(
debug
)
std
::
cout
<<
"# "
<<
pVertex0
->
getNum
()
<<
" with "
<<
list
.
size
()
<<
" neighbours"
<<
std
::
endl
;
SVector3
T
=
SVector3
(
0.0
),
dT
;
double
temp
=
0.
;
energy
=
0
;
for
(
std
::
set
<
MVertex
*>::
const_iterator
it
=
list
.
begin
();
it
!=
list
.
end
();
++
it
){
MVertex
*
pVertex
=
*
it
;
if
(
pVertex
->
getNum
()
==
pVertex0
->
getNum
())
std
::
cout
<<
"This should not happen!"
<<
std
::
endl
;
std
::
map
<
int
,
Matrix
>::
const_iterator
itB
=
crossField
.
find
(
pVertex
->
getNum
());
if
(
itB
==
crossField
.
end
())
m
=
search
(
pVertex
->
x
(),
pVertex
->
y
(),
pVertex
->
z
());
else
m
=
itB
->
second
;
cross3D
y
(
m
);
CWTSQuaternion
<>
Rxy
=
x
.
rotationTo
(
y
);
MEdge
edge
(
pVertex0
,
pVertex
);
theta
=
eulerAngleFromQtn
(
Rxy
);
gradient
=
theta
/
edge
.
length
();
energy
+=
gradient
*
gradient
;
crossDist
[
edge
]
=
theta
;
if
(
fabs
(
theta
)
>
1e-10
)
{
axis
=
eulerAxisFromQtn
(
Rxy
);
// undefined if theta==0
dT
=
convert
(
axis
)
*
(
theta
/
edge
.
length
()
/
edge
.
length
())
;
T
+=
dT
;
}
temp
+=
1.
/
edge
.
length
()
/
edge
.
length
();
//std::cout << " " << pVertex->getNum() << " : " << theta << dT << std::endl;
}
if
(
list
.
size
())
T
*=
1.0
/
temp
;
// average rotation vector
double
a
=
T
.
norm
();
SVector3
b
=
T
;
b
.
normalize
();
if
(
debug
)
std
::
cout
<<
"energy= "
<<
energy
<<
" T= "
<<
a
<<
b
<<
std
::
endl
;
//std::cout << "xold=> " << x << std::endl;
theta
=
T
.
norm
();
if
(
fabs
(
theta
)
>
1e-10
){
axis
=
convert
(
T
);
if
(
debug
)
std
::
cout
<<
"-> "
<<
pVertex0
->
getNum
()
<<
" : "
<<
T
<<
std
::
endl
;
CWTSQuaternion
<>
R
=
qtnFromEulerAxisAndAngle
(
axis
.
unit
(),
theta
);
x
.
rotate
(
R
);
m0
=
convert
(
x
);
}
//std::cout << "xnew=> " << x << std::endl << std::endl;
return
energy
;
}
double
Frame_field
::
smooth
(
GRegion
*
gr
){
// loops on crossData.vertex_to_vertices
//
Matrix
m
,
m0
;
double
enew
,
eold
;
Recombinator
crossData
;
crossData
.
build_vertex_to_vertices
(
gr
);
//std::cout << "NbVert= " << crossData.vertex_to_vertices.size() << std::endl ;
double
energy
=
0
;
for
(
std
::
map
<
MVertex
*
,
std
::
set
<
MVertex
*>
>::
const_iterator
iter
=
crossData
.
vertex_to_vertices
.
begin
();
iter
!=
crossData
.
vertex_to_vertices
.
end
();
++
iter
){
MVertex
*
pVertex0
=
iter
->
first
;
if
(
pVertex0
->
onWhat
()
->
dim
()
>
2
){
SVector3
T
(
0
,
0
,
0
);
std
::
map
<
int
,
Matrix
>::
iterator
itA
=
crossField
.
find
(
iter
->
first
->
getNum
());
if
(
itA
==
crossField
.
end
())
m0
=
search
(
pVertex0
->
x
(),
pVertex0
->
y
(),
pVertex0
->
z
());
else
m0
=
itA
->
second
;
m
=
m0
;
unsigned
int
NbIter
=
0
;
enew
=
findBarycenter
(
iter
,
m
);
// initial energy in cell
do
{
eold
=
enew
;
crossField
[
itA
->
first
]
=
m
;
enew
=
findBarycenter
(
iter
,
m
);
}
while
((
enew
<
eold
)
&&
(
++
NbIter
<
10
));
// if(NbIter > 2)
// std::cout << "This should not happen =" << NbIter << std::endl;
energy
+=
eold
;
}
}
return
energy
;
}
void
Frame_field
::
save
(
GRegion
*
gr
,
const
std
::
string
&
filename
){
SPoint3
p
,
p1
;
MVertex
*
pVertex
;
std
::
map
<
MVertex
*
,
Matrix
>::
iterator
it
;
Matrix
m
;
Recombinator
crossData
;
crossData
.
build_vertex_to_vertices
(
gr
);
double
k
=
0.04
;
std
::
ofstream
file
(
filename
.
c_str
());
file
<<
"View
\"
cross field
\"
{
\n
"
;
for
(
std
::
map
<
MVertex
*
,
std
::
set
<
MVertex
*>
>::
iterator
iter
=
crossData
.
vertex_to_vertices
.
begin
();
iter
!=
crossData
.
vertex_to_vertices
.
end
();
++
iter
){
pVertex
=
iter
->
first
;
std
::
map
<
int
,
Matrix
>::
iterator
itA
=
crossField
.
find
(
pVertex
->
getNum
());
if
(
itA
==
crossField
.
end
())
m
=
search
(
pVertex
->
x
(),
pVertex
->
y
(),
pVertex
->
z
());
else
m
=
itA
->
second
;
p
=
SPoint3
(
pVertex
->
x
(),
pVertex
->
y
(),
pVertex
->
z
());
p1
=
SPoint3
(
pVertex
->
x
()
+
k
*
m
.
get_m11
(),
pVertex
->
y
()
+
k
*
m
.
get_m21
(),
pVertex
->
z
()
+
k
*
m
.
get_m31
());
print_segment
(
p
,
p1
,
file
);
p1
=
SPoint3
(
pVertex
->
x
()
-
k
*
m
.
get_m11
(),
pVertex
->
y
()
-
k
*
m
.
get_m21
(),
pVertex
->
z
()
-
k
*
m
.
get_m31
());
print_segment
(
p
,
p1
,
file
);
p1
=
SPoint3
(
pVertex
->
x
()
+
k
*
m
.
get_m12
(),
pVertex
->
y
()
+
k
*
m
.
get_m22
(),
pVertex
->
z
()
+
k
*
m
.
get_m32
());
print_segment
(
p
,
p1
,
file
);
p1
=
SPoint3
(
pVertex
->
x
()
-
k
*
m
.
get_m12
(),
pVertex
->
y
()
-
k
*
m
.
get_m22
(),
pVertex
->
z
()
-
k
*
m
.
get_m32
());
print_segment
(
p
,
p1
,
file
);
p1
=
SPoint3
(
pVertex
->
x
()
+
k
*
m
.
get_m13
(),
pVertex
->
y
()
+
k
*
m
.
get_m23
(),
pVertex
->
z
()
+
k
*
m
.
get_m33
());
print_segment
(
p
,
p1
,
file
);
p1
=
SPoint3
(
pVertex
->
x
()
-
k
*
m
.
get_m13
(),
pVertex
->
y
()
-
k
*
m
.
get_m23
(),
pVertex
->
z
()
-
k
*
m
.
get_m33
());
print_segment
(
p
,
p1
,
file
);
}
file
<<
"};
\n
"
;
file
.
close
();
}
void
Frame_field
::
save_dist
(
const
std
::
string
&
filename
){
std
::
ofstream
file
(
filename
.
c_str
());
file
<<
"View
\"
Distance
\"
{
\n
"
;
for
(
std
::
map
<
MEdge
,
double
>::
iterator
it
=
crossDist
.
begin
();
it
!=
crossDist
.
end
();
it
++
){
MVertex
*
pVerta
=
it
->
first
.
getVertex
(
0
);
MVertex
*
pVertb
=
it
->
first
.
getVertex
(
1
);
double
value
=
it
->
second
;
if
(
it
->
first
.
length
())
value
/=
it
->
first
.
length
();
file
<<
"SL ("
<<
pVerta
->
x
()
<<
", "
<<
pVerta
->
y
()
<<
", "
<<
pVerta
->
z
()
<<
", "
<<
pVertb
->
x
()
<<
", "
<<
pVertb
->
y
()
<<
", "
<<
pVertb
->
z
()
<<
")"
<<
"{"
<<
value
<<
","
<<
value
<<
"};
\n
"
;
}
file
<<
"};
\n
"
;
file
.
close
();
}
#include
"PView.h"
#include
"PViewDataList.h"
void
Frame_field
::
save_energy
(
GRegion
*
gr
,
const
std
::
string
&
filename
){
MElement
*
pElem
;
const
int
order
=
1
;
const
int
NumNodes
=
4
;
PViewDataList
*
data
=
new
PViewDataList
();
for
(
unsigned
int
i
=
0
;
i
<
gr
->
getNumMeshElements
();
i
++
){
pElem
=
gr
->
getMeshElement
(
i
);
MTetrahedron
*
pTet
=
new
MTetrahedron
(
pElem
->
getVertex
(
0
),
pElem
->
getVertex
(
1
),
pElem
->
getVertex
(
2
),
pElem
->
getVertex
(
3
));
//std::vector<double> *out = data->incrementList(1, TYPE_TET, NumNodes);
std
::
vector
<
double
>
*
out
=
data
->
incrementList
(
3
,
TYPE_TET
,
NumNodes
);
for
(
int
j
=
0
;
j
<
pTet
->
getNumVertices
();
j
++
)
out
->
push_back
(
pTet
->
getVertex
(
j
)
->
x
());
for
(
int
j
=
0
;
j
<
pTet
->
getNumVertices
();
j
++
)
out
->
push_back
(
pTet
->
getVertex
(
j
)
->
y
());
for
(
int
j
=
0
;
j
<
pTet
->
getNumVertices
();
j
++
)
out
->
push_back
(
pTet
->
getVertex
(
j
)
->
z
());
for
(
int
j
=
0
;
j
<
pTet
->
getNumVertices
();
j
++
){
double
u
,
v
,
w
;
pTet
->
getNode
(
j
,
u
,
v
,
w
);
double
sf
[
4
],
gsf
[
4
][
3
];
pTet
->
getShapeFunctions
(
u
,
v
,
w
,
sf
,
order
);
pTet
->
getGradShapeFunctions
(
u
,
v
,
w
,
gsf
,
order
);
double
jac
[
3
][
3
],
inv
[
3
][
3
];
pTet
->
getJacobian
(
u
,
v
,
w
,
jac
);
inv3x3
(
jac
,
inv
);
SVector3
sum
(
0
,
0
,
0
);
for
(
int
k
=
0
;
k
<
pTet
->
getNumEdges
();
k
++
){
int
nod1
=
pTet
->
edges_tetra
(
k
,
0
);
int
nod2
=
pTet
->
edges_tetra
(
k
,
1
);
double
grd1
[
3
],
grd2
[
3
];
matvec
(
inv
,
gsf
[
nod1
],
grd1
);
matvec
(
inv
,
gsf
[
nod2
],
grd2
);
SVector3
esf
=
sf
[
nod1
]
*
SVector3
(
grd2
)
-
sf
[
nod2
]
*
SVector3
(
grd1
);
std
::
map
<
MEdge
,
double
>::
iterator
it
=
crossDist
.
find
(
pTet
->
getEdge
(
k
));
sum
+=
it
->
second
*
esf
;
//sum += (pTet->getVertex(nod2)->z() - pTet->getVertex(nod1)->z()) * esf;
}
out
->
push_back
(
sum
[
0
]);
out
->
push_back
(
sum
[
1
]);
out
->
push_back
(
sum
[
2
]);
//out->push_back(sum.norm());
}
delete
pTet
;
}
data
->
setName
(
"energy"
);
//data->setFileName("energ.pos");
data
->
writePOS
(
filename
+
".pos"
);
data
->
writeMSH
(
filename
+
".msh"
);
data
->
finalize
();
}
/****************class Size_field****************/
Size_field
::
Size_field
(){}
...
...
@@ -1037,6 +1329,9 @@ void Nearest_point::clear(){
std
::
map
<
MVertex
*
,
Matrix
>
Frame_field
::
temp
;
std
::
vector
<
std
::
pair
<
MVertex
*
,
Matrix
>
>
Frame_field
::
field
;
std
::
map
<
int
,
Matrix
>
Frame_field
::
crossField
;
std
::
map
<
MEdge
,
double
,
Less_Edge
>
Frame_field
::
crossDist
;
#if defined(HAVE_ANN)
ANNpointArray
Frame_field
::
duplicate
;
ANNkd_tree
*
Frame_field
::
kd_tree
;
...
...
This diff is collapsed.
Click to expand it.
Mesh/directions3D.h
+
23
−
6
View file @
13b91296
...
...
@@ -7,6 +7,7 @@
// Tristan Carrier
#include
"GFace.h"
#include
"MEdge.h"
#include
"MElementOctree.h"
#if defined(HAVE_ANN)
#include
<ANN/ANN.h>
...
...
@@ -38,10 +39,19 @@ class Matrix{
double
get_m33
();
};
struct
lowerThan
{
bool
operator
()
(
const
std
::
pair
<
int
,
Matrix
>&
lhs
,
const
std
::
pair
<
int
,
Matrix
>&
rhs
)
const
{
return
lhs
.
first
<
rhs
.
first
;}
};
class
Frame_field
{
private:
static
std
::
map
<
MVertex
*
,
Matrix
>
temp
;
static
std
::
vector
<
std
::
pair
<
MVertex
*
,
Matrix
>
>
field
;
//static std::set<std::pair<int, Matrix>, lowerThan> crossField;
static
std
::
map
<
int
,
Matrix
>
crossField
;
static
std
::
map
<
MEdge
,
double
,
Less_Edge
>
crossDist
;
#if defined(HAVE_ANN)
static
ANNpointArray
duplicate
;
static
ANNkd_tree
*
kd_tree
;
...
...
@@ -58,6 +68,12 @@ class Frame_field{
static
void
print_field1
();
static
void
print_field2
(
GRegion
*
);
static
void
print_segment
(
SPoint3
,
SPoint3
,
std
::
ofstream
&
);
static
void
init
(
GRegion
*
gr
);
static
double
smooth
(
GRegion
*
gr
);
static
double
findBarycenter
(
std
::
map
<
MVertex
*
,
std
::
set
<
MVertex
*>
>::
const_iterator
iter
,
Matrix
&
m0
);
static
void
save
(
GRegion
*
gr
,
const
std
::
string
&
filename
);
static
void
save_energy
(
GRegion
*
gr
,
const
std
::
string
&
filename
);
static
void
save_dist
(
const
std
::
string
&
filename
);
static
GRegion
*
test
();
static
void
clear
();
};
...
...
@@ -97,3 +113,4 @@ class Nearest_point{
static
GRegion
*
test
();
static
void
clear
();
};
This diff is collapsed.
Click to expand it.
Mesh/yamakawa.h
+
3
−
2
View file @
13b91296
...
...
@@ -91,8 +91,6 @@ class Recombinator{
private:
std
::
vector
<
Hex
>
potential
;
std
::
map
<
MElement
*
,
bool
>
markings
;
std
::
map
<
MVertex
*
,
std
::
set
<
MVertex
*>
>
vertex_to_vertices
;
std
::
map
<
MVertex
*
,
std
::
set
<
MElement
*>
>
vertex_to_elements
;
std
::
multiset
<
Facet
>
hash_tableA
;
std
::
multiset
<
Diagonal
>
hash_tableB
;
std
::
multiset
<
Diagonal
>
hash_tableC
;
...
...
@@ -102,6 +100,9 @@ class Recombinator{
Recombinator
();
~
Recombinator
();
std
::
map
<
MVertex
*
,
std
::
set
<
MVertex
*>
>
vertex_to_vertices
;
std
::
map
<
MVertex
*
,
std
::
set
<
MElement
*>
>
vertex_to_elements
;
void
execute
();
void
execute
(
GRegion
*
);
...
...
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