Skip to content

Updates in ReferenceElement_Method #310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
shishiousan wants to merge 1 commit into from
Closed

Updates in ReferenceElement_Method #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/modules/GlobalData/src/GlobalData.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ MODULE GlobalData
!! order = 2
INTEGER(I4B), PARAMETER :: Quadrangle8 = 16
!! order = 2, Serendipity
INTEGER(I4B), PARAMETER :: Quadrangle16 = 160
INTEGER(I4B), PARAMETER :: Quadrangle16 = 36
!! order = 3
!! Forder order 4, 5, and so on, we use 1601, 1602, 1603, etc.
INTEGER(I4B), PARAMETER :: Tetrahedron = 4
Expand Down
13 changes: 11 additions & 2 deletions src/submodules/Geometry/src/ReferenceElement_Method@ElementNameMethods.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@
ans = "Triangle15b"
CASE (Triangle21)
ans = "Triangle21"
CASE (Quadrangle16)
ans = "Quadrangle16"
CASE (Tetrahedron20)
ans = "Tetrahedron20"
CASE (Tetrahedron35)
Expand Down Expand Up @@ -167,6 +169,8 @@
ans = Triangle15b
CASE ("Triangle21")
ans = Triangle21
CASE ("Quadrangle16")
ans = Quadrangle16
CASE ("Line4")
ans = Line4
CASE ("Line5")
Expand Down Expand Up @@ -242,6 +246,8 @@
ans = 3
CASE (Triangle10)
ans = 3
CASE (Quadrangle16)
ans = 3
CASE (Triangle12)
ans = 4
CASE (Triangle15a)
Expand Down Expand Up @@ -310,7 +316,8 @@
Triangle21, &
Quadrangle4, &
Quadrangle8, &
Quadrangle9)
Quadrangle9, &
Quadrangle16)
ans = 2
CASE (Line2, &
Line3, &
Expand Down Expand Up @@ -348,7 +355,7 @@
& Triangle15b, Triangle21)
ans = Triangle
CASE (Quadrangle4, Quadrangle8, &
& Quadrangle9)
& Quadrangle9, Quadrangle16)
ans = Quadrangle
CASE (Tetrahedron4, Tetrahedron10, &
& Tetrahedron20, Tetrahedron35, Tetrahedron56)
Expand Down Expand Up @@ -397,6 +404,8 @@
ans = 6
CASE (Quadrangle9)
ans = 9
CASE (Quadrangle16)
ans = 16
CASE (Tetrahedron10)
ans = 10
CASE (Hexahedron27)
Expand Down
5 changes: 3 additions & 2 deletions src/submodules/Geometry/src/ReferenceElement_Method@EnquireMethods.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@
Triangle21, &
Quadrangle4, &
Quadrangle8, &
Quadrangle9)
Quadrangle9, &
Quadrangle16)
ans = .TRUE.
CASE DEFAULT
ans = .FALSE.
Expand Down Expand Up @@ -166,7 +167,7 @@

MODULE PROCEDURE isQuadrangle1
SELECT CASE (elemType)
CASE (Quadrangle4, Quadrangle8, Quadrangle9)
CASE (Quadrangle4, Quadrangle8, Quadrangle9, Quadrangle16)
ans = .TRUE.
CASE DEFAULT
ans = .FALSE.
Expand Down
9 changes: 9 additions & 0 deletions src/submodules/Geometry/src/ReferenceElement_Method@FacetElementMethods.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,15 @@
ans(1:)%xiDimension = 1
ans(1:)%name = line3

CASE (Quadrangle16)
ALLOCATE (ans(4))
ans(1)%nptrs = nptrs([1, 2, 5, 6])
ans(2)%nptrs = nptrs([2, 3, 7, 8])
ans(3)%nptrs = nptrs([3, 4, 9, 10])
ans(4)%nptrs = nptrs([4, 1, 11, 12])
ans(1:)%xiDimension = 1
ans(1:)%name = line4

CASE (Tetrahedron4)
ALLOCATE (ans(4))
ans(1)%nptrs = nptrs([1, 2, 3])
Expand Down
9 changes: 9 additions & 0 deletions src/submodules/Geometry/src/ReferenceElement_Method@GeometryMethods.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,13 @@
IF (PRESENT(edgeCon)) CALL GetEdgeConnectivity_Quadrangle(con=edgeCon, &
& opt=edgeOpt)

CASE (Quadrangle16)
IF (PRESENT(tNodes)) tNodes = 16_I4B
IF (PRESENT(tEdges)) tEdges = 4_I4B
IF (PRESENT(tFaces)) tFaces = 0_I4B
IF (PRESENT(edgeCon)) CALL GetEdgeConnectivity_Quadrangle(con=edgeCon, &
& opt=edgeOpt)

CASE (Tetrahedron)
IF (PRESENT(tNodes)) tNodes = 4_I4B
IF (PRESENT(tEdges)) tEdges = 6_I4B
Expand Down Expand Up @@ -418,6 +425,8 @@
ans = [9, 4, 1, 0]
CASE (Quadrangle8)
ans = [8, 4, 1, 0]
CASE (Quadrangle16)
ans = [16, 4, 1, 0]
CASE (Tetrahedron10)
ans = [10, 6, 4, 1]
CASE (Hexahedron20)
Expand Down
Loading