Skip to content
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.

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

March release of easifem base #302

Merged
merged 78 commits into from
Apr 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
7fe60a9
EASIFEM-17
vickysharma0812 Mar 22, 2024
18cd0d9
EASIFEM-5
vickysharma0812 Mar 22, 2024
48b9064
EASIFEM-21
vickysharma0812 Mar 22, 2024
5d27271
EASIFEM-28
vickysharma0812 Mar 23, 2024
146376e
EASIFEM-22
vickysharma0812 Mar 23, 2024
0564c38
EASIFEM-19
vickysharma0812 Mar 23, 2024
b855361
EASIFEM-15
vickysharma0812 Mar 23, 2024
c368950
EASIFEM-18
vickysharma0812 Mar 23, 2024
f2e46a6
EASIFEM-13
vickysharma0812 Mar 23, 2024
8bb92fc
EASIFEM-20
vickysharma0812 Mar 23, 2024
c951815
EASIFEM-30
vickysharma0812 Mar 23, 2024
1713569
EASIFEM-32
vickysharma0812 Mar 23, 2024
7c954f8
EASIFEM-33
vickysharma0812 Mar 23, 2024
c024494
EASIFEM-34
vickysharma0812 Mar 23, 2024
8d92b15
EASIFEM-35
vickysharma0812 Mar 23, 2024
3217c28
EASIFEM-36
vickysharma0812 Mar 24, 2024
8d24161
EASIFEM-31
vickysharma0812 Mar 24, 2024
e47d2d5
EASIFEM-39
vickysharma0812 Mar 24, 2024
a4c194d
EASIFEM-31
vickysharma0812 Mar 24, 2024
c911fd3
EASIFEM-31
vickysharma0812 Mar 24, 2024
d89c640
EASIFEM-21
vickysharma0812 Mar 24, 2024
f6555e9
EASIFEM-26
vickysharma0812 Mar 24, 2024
55cf273
EASIFEM-37
vickysharma0812 Mar 24, 2024
7d84ba3
EASIFEM-37
vickysharma0812 Mar 24, 2024
fa70cfc
EASIFEM-40
vickysharma0812 Mar 24, 2024
013bf6d
EASIFEM-8
vickysharma0812 Mar 24, 2024
3380907
EASIFEM-42
vickysharma0812 Mar 24, 2024
6005629
EASIFEM-42
vickysharma0812 Mar 24, 2024
09f96de
EASIFEM-51
vickysharma0812 Mar 24, 2024
8b3b5fe
EASIFEM-4
vickysharma0812 Mar 24, 2024
4fd6192
EASIFEM-59
vickysharma0812 Mar 24, 2024
382e4ec
EASIFEM-59
vickysharma0812 Mar 24, 2024
f8177dc
EASIFEM-59
vickysharma0812 Mar 24, 2024
da02161
EASIFEM-61
vickysharma0812 Mar 24, 2024
57da4d3
EASIFEM-63
vickysharma0812 Mar 25, 2024
70126e5
EASIFEM-64
vickysharma0812 Mar 25, 2024
e5f1060
EASIFEM-65
vickysharma0812 Mar 25, 2024
788a114
EASIFEM-66
vickysharma0812 Mar 25, 2024
c6483ab
EASIFEM-67
vickysharma0812 Mar 25, 2024
3dd5fe3
EASIFEM-68
vickysharma0812 Mar 25, 2024
98d0f1e
EASIFEM-69
vickysharma0812 Mar 25, 2024
659ebe8
EASIFEM-62
vickysharma0812 Mar 25, 2024
5ae6412
EASIFEM-71
vickysharma0812 Mar 25, 2024
9955b8f
EASIFEM-72
vickysharma0812 Mar 25, 2024
8983d19
EASIFEM-70
vickysharma0812 Mar 25, 2024
97b8308
EASIFEM-73
vickysharma0812 Mar 25, 2024
bc300ac
EASIFEM-74
vickysharma0812 Mar 25, 2024
b4d66df
EASIFEM-75
vickysharma0812 Mar 25, 2024
b3a4e78
EASIFEM-77
vickysharma0812 Mar 25, 2024
089287b
EASIFEM-78
vickysharma0812 Mar 25, 2024
a372ba2
EASIFEM-76
vickysharma0812 Mar 25, 2024
0e7a7ff
EASIFEM-59
vickysharma0812 Mar 25, 2024
28bd6e5
EASIFEM-79
vickysharma0812 Mar 25, 2024
509d140
EASIFEM-80
vickysharma0812 Mar 25, 2024
0c74ca8
EASIFEM-81
vickysharma0812 Mar 25, 2024
ba5bea1
EASIFEM-82
vickysharma0812 Mar 25, 2024
9c9de55
EASIFEM-84
vickysharma0812 Mar 25, 2024
1149046
EASIFEM-53
vickysharma0812 Mar 25, 2024
2b404f1
EASIFEM-83
vickysharma0812 Mar 25, 2024
a324acf
EASIFEM-86
vickysharma0812 Mar 25, 2024
8328c5c
EASIFEM-88
vickysharma0812 Mar 25, 2024
08f7c35
EASIFEM-42
vickysharma0812 Mar 26, 2024
2d26aa6
EASIFEM-51
vickysharma0812 Mar 26, 2024
093a190
EASIFEM-4
vickysharma0812 Mar 26, 2024
c5ddc77
EASIFEM-5
vickysharma0812 Mar 26, 2024
2fc54e7
EASIFEM-6
vickysharma0812 Mar 26, 2024
084b037
EASIFEM-8
vickysharma0812 Mar 26, 2024
b22db8a
EASIFEM-29
vickysharma0812 Mar 26, 2024
61da504
EASIFEM-42
vickysharma0812 Mar 26, 2024
5cad5bd
EASIFEM-51
vickysharma0812 Mar 26, 2024
b6c2ebb
EASIFEM-105
vickysharma0812 Mar 27, 2024
12fe649
EASIFEM-105
vickysharma0812 Mar 27, 2024
f8a6941
EASIFEM-104
vickysharma0812 Mar 27, 2024
6a7774c
Updatesin HeapSort
vickysharma0812 Mar 29, 2024
1657720
Minor updates in CSRMatrix_SetcolMethods.F90
vickysharma0812 Apr 3, 2024
2f9a331
Minor updates in csrmatrix set col and set row
vickysharma0812 Apr 3, 2024
c41d482
Minor update in CSRMatrix_Method
vickysharma0812 Apr 3, 2024
bcd5c80
Minor formatting in csrmatrix_linsolvemethods
vickysharma0812 Apr 3, 2024
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
27 changes: 11 additions & 16 deletions src/modules/CSRMatrix/src/CSRMatrix_LinSolveMethods.F90
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ MODULE CSRMatrix_LinSolveMethods
IMPLICIT NONE
PRIVATE

PUBLIC :: CSRMatrixLinSolveInitiate
PUBLIC :: CSRMatrix_GMRES

INTEGER(I4B), PARAMETER :: IPAR_LENGTH = 14
INTEGER(I4B), PARAMETER :: FPAR_LENGTH = 14

Expand All @@ -33,10 +36,10 @@ MODULE CSRMatrix_LinSolveMethods
! summary: Return integer code of linear solver from character name

INTERFACE
MODULE PURE FUNCTION getLinSolverCodeFromName(name) RESULT(Ans)
MODULE PURE FUNCTION GetLinSolverCodeFromName(name) RESULT(Ans)
CHARACTER(*), INTENT(IN) :: name
INTEGER(I4B) :: ans
END FUNCTION getLinSolverCodeFromName
END FUNCTION GetLinSolverCodeFromName
END INTERFACE

!----------------------------------------------------------------------------
Expand All @@ -48,17 +51,17 @@ END FUNCTION getLinSolverCodeFromName
! summary: Return character name of linear solver from integer code

INTERFACE
MODULE PURE FUNCTION getLinSolverNameFromCode(name) RESULT(Ans)
MODULE PURE FUNCTION GetLinSolverNameFromCode(name) RESULT(Ans)
INTEGER(I4B), INTENT(IN) :: name
CHARACTER(15) :: ans
END FUNCTION getLinSolverNameFromCode
END FUNCTION GetLinSolverNameFromCode
END INTERFACE

!----------------------------------------------------------------------------
!
!----------------------------------------------------------------------------

INTERFACE
INTERFACE CSRMatrixLinSolveInitiate
MODULE SUBROUTINE CSRMatrix_LinSolve_Initiate(ipar, fpar, W, n, &
& solverName, preConditionOption, convergenceIn, convergenceType, &
& maxIter, KrylovSubspaceSize, rtol, atol, relativeToRHS)
Expand Down Expand Up @@ -95,23 +98,17 @@ MODULE SUBROUTINE CSRMatrix_LinSolve_Initiate(ipar, fpar, W, n, &
LOGICAL(LGT), OPTIONAL, INTENT(in) :: relativeToRHS
!! true if convergence is checked relatative to RHS
END SUBROUTINE CSRMatrix_LinSolve_Initiate
END INTERFACE

INTERFACE CSRMatrixLinSolveInitiate
MODULE PROCEDURE CSRMatrix_LinSolve_Initiate
END INTERFACE CSRMatrixLinSolveInitiate

PUBLIC :: CSRMatrixLinSolveInitiate

!----------------------------------------------------------------------------
! LinSolve
! LinSolve
!----------------------------------------------------------------------------

!> author: Vikas Sharma, Ph. D.
! date: 2023-03-14
! summary: Solver

INTERFACE
INTERFACE CSRMatrix_GMRES
MODULE SUBROUTINE CSRMatrix_GMRES(obj, sol, rhs, ipar, fpar, W)
CLASS(CSRMatrix_), INTENT(INOUT) :: obj
REAL(DFP), INTENT(INOUT) :: sol(:)
Expand All @@ -120,8 +117,6 @@ MODULE SUBROUTINE CSRMatrix_GMRES(obj, sol, rhs, ipar, fpar, W)
REAL(DFP), ALLOCATABLE, INTENT(INOUT) :: fpar(:)
REAL(DFP), ALLOCATABLE, INTENT(INOUT) :: W(:)
END SUBROUTINE CSRMatrix_GMRES
END INTERFACE

PUBLIC :: CSRMatrix_GMRES
END INTERFACE CSRMatrix_GMRES

END MODULE CSRMatrix_LinSolveMethods
1 change: 0 additions & 1 deletion src/modules/CSRMatrix/src/CSRMatrix_Method.F90
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ MODULE CSRMatrix_Method
USE CSRMatrix_SchurMethods
USE CSRMatrix_DBCMethods
USE CSRMatrix_LinSolveMethods
USE CSRMatrix_SymMatmulMethods
USE GlobalData, ONLY: I4B
IMPLICIT NONE
INTEGER(I4B), PARAMETER, PUBLIC :: SPARSE_FMT_CSR = 0
Expand Down
Loading
Loading