Skip to content

Updates in GmshAPI #286

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

Merged
merged 2 commits into from
Dec 8, 2023
Merged

Updates in GmshAPI #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3814cfb
Update [email protected]
vickysharma0812 Dec 7, 2023
5caea25
Update GmshStructuredMesh_Class.F90
vickysharma0812 Dec 8, 2023
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
111 changes: 107 additions & 4 deletions src/modules/GmshAPI/src/GmshStructuredMesh_Class.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@ MODULE GmshStructuredMesh_Class
CHARACTER(*), PARAMETER :: myprefix = "StructuredMesh"
CHARACTER(*), PARAMETER :: MeshTypeName(2) = ["Progression", "Bump "]

INTERFACE SetGmshStructuredMeshParam
MODULE PROCEDURE SetGmshStructuredMeshParam1
MODULE PROCEDURE SetGmshStructuredMeshParam2
END INTERFACE SetGmshStructuredMeshParam

!----------------------------------------------------------------------------
! GmshStructuredMesh_
!----------------------------------------------------------------------------
Expand Down Expand Up @@ -150,7 +155,7 @@ MODULE GmshStructuredMesh_Class
! date: 2023-11-04
! summary: Set parameter

SUBROUTINE SetGmshStructuredMeshParam( &
SUBROUTINE SetGmshStructuredMeshParam1( &
& param, &
& filename, &
& pointsOnAxis1, &
Expand Down Expand Up @@ -203,9 +208,14 @@ SUBROUTINE SetGmshStructuredMeshParam( &
INTEGER(I4B), ALLOCATABLE :: transfinitePointsOnAxis3_(:)
REAL(DFP), PARAMETER :: r2type(1, 1) = 0, r1type(1) = 0.0_DFP
INTEGER(I4B), PARAMETER :: i1type(1) = 0
CHARACTER(*), PARAMETER :: myName = "SetGmshStructuredMesh2DParam()"
CHARACTER(*), PARAMETER :: myName = "SetGmshStructuredMeshParam1()"
LOGICAL(LGT) :: recombineAll_

#ifdef DEBUG_VER
CALL e%RaiseInformation(modName//'::'//myName//' - '// &
& '[START] ')
#endif DEBUG_VER

aint = SIZE(pointsOnAxis1, 1)
IF (aint .NE. 3_I4B) THEN
CALL e%RaiseError(modName//'::'//myName//' - '// &
Expand Down Expand Up @@ -433,7 +443,100 @@ SUBROUTINE SetGmshStructuredMeshParam( &

IF (ALLOCATED(transfinitePointsOnAxis3_)) &
& DEALLOCATE (transfinitePointsOnAxis3_)
END SUBROUTINE SetGmshStructuredMeshParam

#ifdef DEBUG_VER
CALL e%RaiseInformation(modName//'::'//myName//' - '// &
& '[END] ')
#endif DEBUG_VER

END SUBROUTINE SetGmshStructuredMeshParam1

!----------------------------------------------------------------------------
! SetGmshStructuredMeshParam
!----------------------------------------------------------------------------

SUBROUTINE SetGmshStructuredMeshParam2( &
& param, filename, pointsOnAxis1, transfinitePointsOnAxis1, &
& pointsOnAxis2, transfinitePointsOnAxis2, pointsOnAxis3, &
& transfinitePointsOnAxis3, recombineAll, meshTypeOnAxis1, &
& meshTypeOnAxis2, meshTypeOnAxis3, coefOnAxis1, coefOnAxis2, &
& coefOnAxis3)
TYPE(ParameterList_), INTENT(INOUT) :: param
!! spatial dimension
CHARACTER(*), INTENT(IN) :: filename
!! name of the mesh file to be generated
REAL(DFP), INTENT(IN) :: pointsOnAxis1(:)
!! points on axis 1
INTEGER(I4B), INTENT(IN) :: transfinitePointsOnAxis1(:)
!! transfinitePoints on axis 1
REAL(DFP), INTENT(IN) :: pointsOnAxis2(:)
!! points on axis 2
INTEGER(I4B), INTENT(IN) :: transfinitePointsOnAxis2(:)
!! transfinitePoints on axis 2
REAL(DFP), OPTIONAL, INTENT(IN) :: pointsOnAxis3(:)
!! points on axis 3
INTEGER(I4B), OPTIONAL, INTENT(IN) :: transfinitePointsOnAxis3(:)
!! transfinitePoints on axis 3
LOGICAL(LGT), OPTIONAL, INTENT(IN) :: recombineAll
!! If true we combine triangle and tetrahedron into quad and hexahedron
INTEGER(I4B), OPTIONAL, INTENT(IN) :: meshTypeOnAxis1(:)
INTEGER(I4B), OPTIONAL, INTENT(IN) :: meshTypeOnAxis2(:)
INTEGER(I4B), OPTIONAL, INTENT(IN) :: meshTypeOnAxis3(:)
REAL(DFP), OPTIONAL, INTENT(IN) :: coefOnAxis1(:)
REAL(DFP), OPTIONAL, INTENT(IN) :: coefOnAxis2(:)
REAL(DFP), OPTIONAL, INTENT(IN) :: coefOnAxis3(:)

LOGICAL(LGT) :: is3present
INTEGER(I4B) :: tsize
REAL(DFP), ALLOCATABLE :: p1(:, :), p2(:, :), p3(:, :)

is3present = PRESENT(pointsOnAxis3)

tsize = SIZE(pointsOnAxis1)
CALL Reallocate(p1, 3, tsize)
p1(1, :) = pointsOnAxis1

tsize = SIZE(pointsOnAxis2)
CALL Reallocate(p2, 3, tsize)
p2(2, :) = pointsOnAxis2

IF (is3present) THEN
tsize = SIZE(pointsOnAxis3)
CALL Reallocate(p3, 3, tsize)
p3(3, :) = pointsOnAxis3
END IF

IF (is3present) THEN
CALL SetGmshStructuredMeshParam1(param=param, filename=filename, &
& pointsOnAxis1=p1, pointsOnAxis2=p2, pointsOnAxis3=p3, &
& transfinitePointsOnAxis1=transfinitePointsOnAxis1, &
& transfinitePointsOnAxis2=transfinitePointsOnAxis2, &
& transfinitePointsOnAxis3=transfinitePointsOnAxis3, &
& recombineAll=recombineAll, &
& meshTypeOnAxis1=meshTypeOnAxis1, &
& meshTypeOnAxis2=meshTypeOnAxis2, &
& meshTypeOnAxis3=meshTypeOnAxis3, &
& coefOnAxis1=coefOnAxis1, &
& coefOnAxis2=coefOnAxis2, &
& coefOnAxis3=coefOnAxis3)

ELSE
CALL SetGmshStructuredMeshParam1(param=param, filename=filename, &
& pointsOnAxis1=p1, pointsOnAxis2=p2, &
& transfinitePointsOnAxis1=transfinitePointsOnAxis1, &
& transfinitePointsOnAxis2=transfinitePointsOnAxis2, &
& recombineAll=recombineAll, &
& meshTypeOnAxis1=meshTypeOnAxis1, &
& meshTypeOnAxis2=meshTypeOnAxis2, &
& coefOnAxis1=coefOnAxis1, &
& coefOnAxis2=coefOnAxis2)
END IF

IF (ALLOCATED(p1)) DEALLOCATE (p1)
IF (ALLOCATED(p2)) DEALLOCATE (p2)
IF (ALLOCATED(p3)) DEALLOCATE (p3)

END SUBROUTINE SetGmshStructuredMeshParam2

!----------------------------------------------------------------------------
!
Expand Down Expand Up @@ -536,7 +639,7 @@ SUBROUTINE mesh_Initiate(obj, param)
pointsOnAxis3 = 0.0_DFP

pointsOnAxis1(1:3, 1:) = Get(obj%points(1))
pointsOnAxis2(1:3, 1:) = Get(obj%points(2))
pointsOnAxis2(1:3, 1:) = Get(obj%points(2))
pointsOnAxis3(1:3, 1:) = Get(obj%points(3))

ipoint = obj%tPoints(1) * obj%tPoints(2) * obj%tPoints(3)
Expand Down
10 changes: 10 additions & 0 deletions src/submodules/MeshSelection/src/[email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,10 +148,20 @@
MODULE PROCEDURE meshSelection_Set_Vec
CHARACTER(*), PARAMETER :: myName = "meshSelection_Set_Vec()"
INTEGER(I4B) :: ii, tMaterials
#ifdef DEBUG_VER
CALL e%RaiseInformation(modName//'::'//myName//' - '// &
& '[START] ')
#endif DEBUG_VER

tMaterials = SIZE(obj)
DO ii = 1, tMaterials
CALL obj(ii)%Set()
END DO

#ifdef DEBUG_VER
CALL e%RaiseInformation(modName//'::'//myName//' - '// &
& '[END] ')
#endif DEBUG_VER
END PROCEDURE meshSelection_Set_Vec

!----------------------------------------------------------------------------
Expand Down