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
8f74391a
Commit
8f74391a
authored
6 years ago
by
Amaury Johnen
Browse files
Options
Downloads
Patches
Plain Diff
refactor
parent
c746707a
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
Numeric/nodalBasis.cpp
+24
-2
24 additions, 2 deletions
Numeric/nodalBasis.cpp
Numeric/nodalBasis.h
+0
-14
0 additions, 14 deletions
Numeric/nodalBasis.h
with
24 additions
and
16 deletions
Numeric/nodalBasis.cpp
+
24
−
2
View file @
8f74391a
...
@@ -699,7 +699,7 @@ namespace ClosureGen {
...
@@ -699,7 +699,7 @@ namespace ClosureGen {
}
}
}
}
else
{
else
{
Msg
::
Error
(
"FaceClosureFull not implemented for prisms of order %d"
,
Msg
::
Warning
(
"FaceClosureFull not implemented for prisms of order %d"
,
order
);
order
);
}
}
}
}
...
@@ -746,6 +746,13 @@ namespace ClosureGen {
...
@@ -746,6 +746,13 @@ namespace ClosureGen {
}
}
}
}
void
generateFaceClosurePyrFull
(
nodalBasis
::
clCont
&
closureFull
,
std
::
vector
<
int
>
&
closureRef
,
int
order
)
{
Msg
::
Warning
(
"FaceClosureFull not implemented for pyramids of order %d"
,
order
);
}
void
generate2dEdgeClosure
(
nodalBasis
::
clCont
&
closure
,
int
order
,
void
generate2dEdgeClosure
(
nodalBasis
::
clCont
&
closure
,
int
order
,
int
nNod
=
3
)
int
nNod
=
3
)
{
{
...
@@ -859,6 +866,7 @@ nodalBasis::nodalBasis(int tag)
...
@@ -859,6 +866,7 @@ nodalBasis::nodalBasis(int tag)
numFaces
=
5
;
numFaces
=
5
;
points
=
gmshGeneratePointsPyramid
(
order
,
serendip
);
points
=
gmshGeneratePointsPyramid
(
order
,
serendip
);
generateFaceClosurePyr
(
closures
,
order
,
serendip
,
points
);
generateFaceClosurePyr
(
closures
,
order
,
serendip
,
points
);
generateFaceClosurePyrFull
(
fullClosures
,
closureRef
,
order
);
break
;
break
;
}
}
}
}
...
@@ -942,3 +950,17 @@ bool nodalBasis::forwardRenumbering(const fullMatrix<double> &nodes, int *renum,
...
@@ -942,3 +950,17 @@ bool nodalBasis::forwardRenumbering(const fullMatrix<double> &nodes, int *renum,
return
renum
;
return
renum
;
}
}
inline
int
nodalBasis
::
getClosureId
(
int
iFace
,
int
iSign
,
int
iRot
)
const
{
return
iFace
+
numFaces
*
(
iSign
==
1
?
0
:
1
)
+
2
*
numFaces
*
iRot
;
}
inline
void
nodalBasis
::
breakClosureId
(
int
i
,
int
&
iFace
,
int
&
iSign
,
int
&
iRot
)
const
{
iFace
=
i
%
numFaces
;
i
=
(
i
-
iFace
)
/
numFaces
;
iSign
=
i
%
2
;
iRot
=
(
i
-
iSign
)
/
2
;
}
This diff is collapsed.
Click to expand it.
Numeric/nodalBasis.h
+
0
−
14
View file @
8f74391a
...
@@ -81,18 +81,4 @@ public:
...
@@ -81,18 +81,4 @@ public:
inline
void
breakClosureId
(
int
i
,
int
&
iFace
,
int
&
iSign
,
int
&
iRot
)
const
;
inline
void
breakClosureId
(
int
i
,
int
&
iFace
,
int
&
iSign
,
int
&
iRot
)
const
;
};
};
inline
int
nodalBasis
::
getClosureId
(
int
iFace
,
int
iSign
,
int
iRot
)
const
{
return
iFace
+
numFaces
*
(
iSign
==
1
?
0
:
1
)
+
2
*
numFaces
*
iRot
;
}
inline
void
nodalBasis
::
breakClosureId
(
int
i
,
int
&
iFace
,
int
&
iSign
,
int
&
iRot
)
const
{
iFace
=
i
%
numFaces
;
i
=
(
i
-
iFace
)
/
numFaces
;
iSign
=
i
%
2
;
iRot
=
(
i
-
iSign
)
/
2
;
}
#endif
#endif
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