Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
pugs
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
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
code
pugs
Commits
2ea389cb
Commit
2ea389cb
authored
1 year ago
by
Stéphane Del Pino
Browse files
Options
Downloads
Patches
Plain Diff
Fix normal calculation in 3D
parent
1fe8f9ee
No related branches found
No related tags found
1 merge request
!174
Issue/normal calculation
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/mesh/MeshFlatNodeBoundary.cpp
+82
-31
82 additions, 31 deletions
src/mesh/MeshFlatNodeBoundary.cpp
src/mesh/MeshFlatNodeBoundary.hpp
+10
-5
10 additions, 5 deletions
src/mesh/MeshFlatNodeBoundary.hpp
with
92 additions
and
36 deletions
src/mesh/MeshFlatNodeBoundary.cpp
+
82
−
31
View file @
2ea389cb
...
@@ -87,57 +87,108 @@ MeshFlatNodeBoundary<2>::_getNormal(const Mesh<Connectivity<2>>& mesh)
...
@@ -87,57 +87,108 @@ MeshFlatNodeBoundary<2>::_getNormal(const Mesh<Connectivity<2>>& mesh)
template
<
>
template
<
>
TinyVector
<
3
,
double
>
TinyVector
<
3
,
double
>
MeshFlatNodeBoundary
<
3
>::
_get
Normal
(
const
Mesh
<
Connectivity
<
3
>>&
mesh
)
MeshFlatNodeBoundary
<
3
>::
_get
FarestNode
(
const
Mesh
<
Connectivity
<
3
>>&
mesh
,
const
Rd
&
x0
,
const
Rd
&
x1
)
{
{
using
R3
=
TinyVector
<
3
,
double
>
;
const
NodeValue
<
const
Rd
>&
xr
=
mesh
.
xr
();
const
auto
node_number
=
mesh
.
connectivity
().
nodeNumber
();
using
NodeNumberType
=
std
::
remove_const_t
<
typename
decltype
(
node_number
)
::
data_type
>
;
std
::
array
<
R3
,
6
>
bounds
=
this
->
_getBounds
(
mesh
);
Rd
t
=
x1
-
x0
;
t
*=
1.
/
l2Norm
(
t
);
const
R3
&
xmin
=
bounds
[
0
];
double
farest_distance
=
0
;
const
R3
&
ymin
=
bounds
[
1
];
Rd
farest_x
=
zero
;
const
R3
&
zmin
=
bounds
[
2
];
NodeNumberType
farest_number
=
std
::
numeric_limits
<
NodeNumberType
>::
max
();
const
R3
&
xmax
=
bounds
[
3
];
const
R3
&
ymax
=
bounds
[
4
];
const
R3
&
zmax
=
bounds
[
5
];
const
R3
u
=
xmax
-
xmin
;
auto
node_list
=
this
->
m_ref_node_list
.
list
();
const
R3
v
=
ymax
-
ymin
;
const
R3
w
=
zmax
-
zmin
;
for
(
size_t
i_node
=
0
;
i_node
<
node_list
.
size
();
++
i_node
)
{
const
NodeId
&
node_id
=
node_list
[
i_node
];
const
Rd
&
x
=
xr
[
node_id
];
const
double
distance
=
l2Norm
(
crossProduct
(
t
,
x
-
x0
));
const
R3
uv
=
crossProduct
(
u
,
v
);
if
((
distance
>
farest_distance
)
or
((
distance
==
farest_distance
)
and
(
node_number
[
node_id
]
<
farest_number
)))
{
const
double
uv_l2
=
dot
(
uv
,
uv
);
farest_distance
=
distance
;
farest_number
=
node_number
[
node_id
];
farest_x
=
x
;
}
}
R3
normal
=
uv
;
if
(
parallel
::
size
())
{
double
normal_l2
=
uv_l2
;
Array
<
double
>
farest_distance_array
=
parallel
::
allGather
(
farest_distance
);
Array
<
Rd
>
farest_x_array
=
parallel
::
allGather
(
farest_x
);
Array
<
NodeNumberType
>
farest_number_array
=
parallel
::
allGather
(
farest_number
);
const
R3
uw
=
crossProduct
(
u
,
w
);
Assert
(
farest_distance_array
.
size
()
==
farest_x_array
.
size
()
);
const
double
uw_l2
=
dot
(
uw
,
uw
);
Assert
(
farest_distance_array
.
size
()
==
farest_number_array
.
size
()
);
if
(
uw_l2
>
uv_l2
)
{
for
(
size_t
i
=
0
;
i
<
farest_distance_array
.
size
();
++
i
)
{
normal
=
uw
;
if
((
farest_distance_array
[
i
]
>
farest_distance
)
or
normal_l2
=
uw_l2
;
((
farest_distance_array
[
i
]
==
farest_distance
)
and
(
farest_number_array
[
i
]
<
farest_number
)))
{
farest_distance
=
farest_distance_array
[
i
];
farest_number
=
farest_number_array
[
i
];
farest_x
=
farest_x_array
[
i
];
}
}
}
}
const
R3
vw
=
crossProduct
(
v
,
w
)
;
return
farest_x
;
const
double
vw_l2
=
dot
(
vw
,
vw
);
}
if
(
vw_l2
>
normal_l2
)
{
template
<
>
normal
=
vw
;
TinyVector
<
3
,
double
>
normal_l2
=
vw_l2
;
MeshFlatNodeBoundary
<
3
>::
_getNormal
(
const
Mesh
<
Connectivity
<
3
>>&
mesh
)
{
using
R3
=
TinyVector
<
3
,
double
>
;
std
::
array
<
R3
,
2
>
diagonal
=
[](
const
std
::
array
<
R3
,
6
>&
bounds
)
{
size_t
max_i
=
0
;
size_t
max_j
=
0
;
double
max_length
=
0
;
for
(
size_t
i
=
0
;
i
<
bounds
.
size
();
++
i
)
{
for
(
size_t
j
=
i
+
1
;
j
<
bounds
.
size
();
++
j
)
{
double
length
=
l2Norm
(
bounds
[
i
]
-
bounds
[
j
]);
if
(
length
>
max_length
)
{
max_i
=
i
;
max_j
=
j
;
max_length
=
length
;
}
}
}
}
return
std
::
array
<
R3
,
2
>
{
bounds
[
max_i
],
bounds
[
max_j
]};
}(
this
->
_getBounds
(
mesh
));
if
(
normal_l2
==
0
)
{
const
R3
&
x0
=
diagonal
[
0
];
const
R3
&
x1
=
diagonal
[
1
];
if
(
x0
==
x1
)
{
std
::
ostringstream
ost
;
std
::
ostringstream
ost
;
ost
<<
"invalid boundary
\"
"
<<
rang
::
fgB
::
yellow
<<
m_ref_node_list
.
refId
()
<<
rang
::
style
::
reset
ost
<<
"invalid boundary
\"
"
<<
rang
::
fgB
::
yellow
<<
m_ref_node_list
.
refId
()
<<
rang
::
style
::
reset
<<
"
\"
: unable to compute normal"
;
<<
"
\"
: unable to compute normal"
;
throw
NormalError
(
ost
.
str
());
throw
NormalError
(
ost
.
str
());
}
}
const
double
length
=
sqrt
(
normal_l2
);
const
R3
x2
=
this
->
_getFarestNode
(
mesh
,
x0
,
x1
);
const
R3
u
=
x1
-
x0
;
const
R3
v
=
x2
-
x0
;
R3
normal
=
crossProduct
(
u
,
v
);
const
double
normal_norm
=
l2Norm
(
normal
);
if
(
normal_norm
==
0
)
{
std
::
ostringstream
ost
;
ost
<<
"invalid boundary
\"
"
<<
rang
::
fgB
::
yellow
<<
m_ref_node_list
.
refId
()
<<
rang
::
style
::
reset
<<
"
\"
: unable to compute normal"
;
throw
NormalError
(
ost
.
str
());
}
normal
*=
1.
/
length
;
normal
*=
(
1.
/
normal_norm
)
;
this
->
_checkBoundaryIsFlat
(
normal
,
1.
/
6
.
*
(
x
min
+
x
max
+
ymin
+
ymax
+
zmin
+
zmax
),
length
,
mesh
);
this
->
_checkBoundaryIsFlat
(
normal
,
1.
/
3
.
*
(
x
0
+
x
1
+
x2
),
normal_norm
,
mesh
);
return
normal
;
return
normal
;
}
}
...
...
This diff is collapsed.
Click to expand it.
src/mesh/MeshFlatNodeBoundary.hpp
+
10
−
5
View file @
2ea389cb
...
@@ -13,15 +13,20 @@ class [[nodiscard]] MeshFlatNodeBoundary final
...
@@ -13,15 +13,20 @@ class [[nodiscard]] MeshFlatNodeBoundary final
private:
private:
const
Rd
m_outgoing_normal
;
const
Rd
m_outgoing_normal
;
Rd
_getFarestNode
(
const
Mesh
<
Connectivity
<
Dimension
>>&
mesh
,
const
Rd
&
x0
,
const
Rd
&
x1
);
Rd
_getNormal
(
const
Mesh
<
Connectivity
<
Dimension
>>&
mesh
);
Rd
_getNormal
(
const
Mesh
<
Connectivity
<
Dimension
>>&
mesh
);
void
_checkBoundaryIsFlat
(
const
TinyVector
<
Dimension
,
double
>&
normal
,
const
TinyVector
<
Dimension
,
double
>&
origin
,
void
_checkBoundaryIsFlat
(
const
TinyVector
<
Dimension
,
double
>&
normal
,
const
double
length
,
const
Mesh
<
Connectivity
<
Dimension
>>&
mesh
)
const
;
const
TinyVector
<
Dimension
,
double
>&
origin
,
const
double
length
,
const
Mesh
<
Connectivity
<
Dimension
>>&
mesh
)
const
;
Rd
_getOutgoingNormal
(
const
Mesh
<
Connectivity
<
Dimension
>>&
mesh
);
Rd
_getOutgoingNormal
(
const
Mesh
<
Connectivity
<
Dimension
>>&
mesh
);
public:
public:
const
Rd
&
outgoingNormal
()
const
const
Rd
&
outgoingNormal
()
const
{
{
return
m_outgoing_normal
;
return
m_outgoing_normal
;
}
}
...
...
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