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
29ca02f8
Commit
29ca02f8
authored
11 years ago
by
Amaury Johnen
Browse files
Options
Downloads
Patches
Plain Diff
fix high order interior vertex of p2 hex's bad position.
add fixme for bad position of high order face vertices.
parent
c3b12d2b
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Mesh/HighOrder.cpp
+13
-8
13 additions, 8 deletions
Mesh/HighOrder.cpp
with
13 additions
and
8 deletions
Mesh/HighOrder.cpp
+
13
−
8
View file @
29ca02f8
...
...
@@ -500,6 +500,8 @@ static void getFaceVertices(GRegion *gr, MElement *ele, std::vector<MVertex*> &v
faceContainer
&
faceVertices
,
edgeContainer
&
edgeVertices
,
bool
linear
,
int
nPts
=
1
)
{
// FIXME: MFace returned by getFace are of order 1
// Thus new face vertices are not positioned according to new edge vertices
for
(
int
i
=
0
;
i
<
ele
->
getNumFaces
();
i
++
){
MFace
face
=
ele
->
getFace
(
i
);
faceContainer
::
iterator
fIter
=
faceVertices
.
find
(
face
);
...
...
@@ -824,23 +826,26 @@ static MHexahedron *setHighOrder(MHexahedron *h, GRegion *gr,
}
}
else
{
// create serendipity element to place internal vertices (we used to
// saturate face vertices also, but the corresponding function spaces do
// not exist anymore, and there is no theoretical justification for doing
// it either way)
if
(
nPts
==
1
){
MHexahedron20
incpl
(
h
->
getVertex
(
0
),
h
->
getVertex
(
1
),
h
->
getVertex
(
2
),
h
->
getVertex
(
3
),
h
->
getVertex
(
4
),
h
->
getVertex
(
5
),
h
->
getVertex
(
6
),
h
->
getVertex
(
7
),
ve
[
0
],
ve
[
1
],
ve
[
2
],
ve
[
3
],
ve
[
4
],
ve
[
5
],
ve
[
6
],
ve
[
7
],
ve
[
8
],
ve
[
9
],
ve
[
10
],
ve
[
11
],
0
,
h
->
getPartition
());
getFaceVertices
(
gr
,
h
,
vf
,
faceVertices
,
edgeVertices
,
linear
,
nPts
);
SPoint3
pc
=
h
->
barycenter
();
MVertex
*
v
=
new
MVertex
(
pc
.
x
(),
pc
.
y
(),
pc
.
z
(),
gr
);
gr
->
mesh_vertices
.
push_back
(
v
);
getRegionVertices
(
gr
,
&
incpl
,
h
,
vr
,
linear
,
nPts
);
return
new
MHexahedron27
(
h
->
getVertex
(
0
),
h
->
getVertex
(
1
),
h
->
getVertex
(
2
),
h
->
getVertex
(
3
),
h
->
getVertex
(
4
),
h
->
getVertex
(
5
),
h
->
getVertex
(
6
),
h
->
getVertex
(
7
),
ve
[
0
],
ve
[
1
],
ve
[
2
],
ve
[
3
],
ve
[
4
],
ve
[
5
],
ve
[
6
],
ve
[
7
],
ve
[
8
],
ve
[
9
],
ve
[
10
],
ve
[
11
],
vf
[
0
],
vf
[
1
],
vf
[
2
],
vf
[
3
],
vf
[
4
],
vf
[
5
],
v
,
ve
[
11
],
vf
[
0
],
vf
[
1
],
vf
[
2
],
vf
[
3
],
vf
[
4
],
vf
[
5
],
v
r
[
0
]
,
0
,
h
->
getPartition
());
}
else
{
// create serendipity element to place internal vertices (we used to
// saturate face vertices also, but the corresponding function spaces do
// not exist anymore, and there is no theoretical justification for doing
// it either way)
MHexahedronN
incpl
(
h
->
getVertex
(
0
),
h
->
getVertex
(
1
),
h
->
getVertex
(
2
),
h
->
getVertex
(
3
),
h
->
getVertex
(
4
),
h
->
getVertex
(
5
),
h
->
getVertex
(
6
),
h
->
getVertex
(
7
),
ve
,
nPts
+
1
,
0
,
...
...
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