Complete V5 acceptance milestone
This commit is contained in:
+18
-52
@@ -12,8 +12,7 @@ module fem_api
|
||||
use fem_solver_implicit
|
||||
use fem_linear_solver_cg, only: linear_solver_configure, &
|
||||
linear_solver_get_settings, linear_solver_get_stats, &
|
||||
linear_solver_get_external_info, linear_solver_get_external_diag, &
|
||||
linear_solver_config_external
|
||||
linear_solver_get_diagnostics
|
||||
use fem_coupling
|
||||
use fem_boundary
|
||||
use fem_contact
|
||||
@@ -658,61 +657,28 @@ contains
|
||||
call linear_solver_get_stats(method, preconditioner, iteration, &
|
||||
residual_norm, status_code, ierr)
|
||||
end subroutine fem_get_linear_solver_stats
|
||||
subroutine fem_get_linsol_external(backend, available, capabilities, ierr)
|
||||
integer, intent(out) :: backend
|
||||
integer, intent(out) :: available
|
||||
integer, intent(out) :: capabilities
|
||||
subroutine fem_get_linsol_diagnostics(matrix_class, initial_residual, &
|
||||
final_residual, relative_residual, &
|
||||
status_code, ierr)
|
||||
integer, intent(out) :: matrix_class
|
||||
real(rk), intent(out) :: initial_residual
|
||||
real(rk), intent(out) :: final_residual
|
||||
real(rk), intent(out) :: relative_residual
|
||||
integer, intent(out) :: status_code
|
||||
integer, intent(out) :: ierr
|
||||
backend = 0
|
||||
available = 0
|
||||
capabilities = 0
|
||||
matrix_class = 1
|
||||
initial_residual = ZERO
|
||||
final_residual = ZERO
|
||||
relative_residual = ZERO
|
||||
status_code = LS_STATUS_IDLE
|
||||
if (.not. api_initialized) then
|
||||
call error_set(FEM_ERR_INTERNAL, &
|
||||
'fem_get_linsol_external called before fem_initialize', ierr)
|
||||
'fem_get_linsol_diagnostics called before fem_initialize', ierr)
|
||||
return
|
||||
end if
|
||||
call linear_solver_get_external_info(backend, available, capabilities, ierr)
|
||||
end subroutine fem_get_linsol_external
|
||||
subroutine fem_get_linsol_external_diag(valid, nrow, ncol, nnz, class_id, &
|
||||
symmetric_pattern, &
|
||||
symmetric_values, backend_status, &
|
||||
matrix_norm, rhs_norm, &
|
||||
initial_resid, initial_rel, ierr)
|
||||
integer, intent(out) :: valid
|
||||
integer, intent(out) :: nrow
|
||||
integer, intent(out) :: ncol
|
||||
integer, intent(out) :: nnz
|
||||
integer, intent(out) :: class_id
|
||||
integer, intent(out) :: symmetric_pattern
|
||||
integer, intent(out) :: symmetric_values
|
||||
integer, intent(out) :: backend_status
|
||||
real(rk), intent(out) :: matrix_norm
|
||||
real(rk), intent(out) :: rhs_norm
|
||||
real(rk), intent(out) :: initial_resid
|
||||
real(rk), intent(out) :: initial_rel
|
||||
integer, intent(out) :: ierr
|
||||
if (.not. api_initialized) then
|
||||
call error_set(FEM_ERR_INTERNAL, &
|
||||
'fem_get_linsol_external_diag called before fem_initialize', ierr)
|
||||
return
|
||||
end if
|
||||
call linear_solver_get_external_diag(valid, nrow, ncol, nnz, class_id, &
|
||||
symmetric_pattern, symmetric_values, &
|
||||
backend_status, matrix_norm, &
|
||||
rhs_norm, initial_resid, initial_rel, &
|
||||
ierr)
|
||||
end subroutine fem_get_linsol_external_diag
|
||||
subroutine fem_set_linsol_external(backend, ierr)
|
||||
integer, intent(in) :: backend
|
||||
integer, intent(out) :: ierr
|
||||
if (.not. api_initialized) then
|
||||
call error_set(FEM_ERR_INTERNAL, &
|
||||
'fem_set_linsol_external called before fem_initialize', ierr)
|
||||
return
|
||||
end if
|
||||
call linear_solver_config_external(backend, ierr)
|
||||
end subroutine fem_set_linsol_external
|
||||
|
||||
call linear_solver_get_diagnostics(matrix_class, initial_residual, &
|
||||
final_residual, relative_residual, status_code, ierr)
|
||||
end subroutine fem_get_linsol_diagnostics
|
||||
subroutine fem_set_shell_stabilization(drilling_factor, s3_shear_factor, &
|
||||
s3_shear_min_scale, ierr)
|
||||
real(rk), intent(in) :: drilling_factor
|
||||
|
||||
@@ -18,13 +18,11 @@ module fem_control
|
||||
integer, parameter :: LSOLVER_CG = 1
|
||||
integer, parameter :: LSOLVER_BICGSTAB = 2
|
||||
integer, parameter :: LSOLVER_GMRES = 3
|
||||
integer, parameter :: LSOLVER_EXTERNAL = 100
|
||||
integer, parameter :: LPRECOND_NONE = 0
|
||||
integer, parameter :: LPRECOND_JACOBI = 1
|
||||
integer, parameter :: LS_STATUS_IDLE = 0
|
||||
integer, parameter :: LS_STATUS_CONVERGED = 1
|
||||
integer, parameter :: LS_STATUS_FAILED = -1
|
||||
integer, parameter :: LS_STATUS_UNSUPPORTED = -2
|
||||
|
||||
real(rk) :: time_start = ZERO
|
||||
real(rk) :: time_end = ZERO
|
||||
@@ -62,6 +60,7 @@ module fem_control
|
||||
integer :: linear_solver_last_prec = LPRECOND_JACOBI
|
||||
integer :: linear_solver_last_iter = 0
|
||||
integer :: linear_solver_last_status = LS_STATUS_IDLE
|
||||
integer :: linear_solver_last_matrix_class = 1
|
||||
integer :: shell_stability_sample_count = 0
|
||||
integer :: shell_stability_last_elem = 0
|
||||
integer :: convergence_increment = 0
|
||||
@@ -74,7 +73,9 @@ module fem_control
|
||||
real(rk) :: convergence_correction_norm = ZERO
|
||||
real(rk) :: convergence_contact_gap_norm = ZERO
|
||||
real(rk) :: convergence_combined_norm = ZERO
|
||||
real(rk) :: linear_solver_initial_resid = ZERO
|
||||
real(rk) :: linear_solver_last_resid = ZERO
|
||||
real(rk) :: linear_solver_relative_resid = ZERO
|
||||
real(rk) :: shell_stability_last_drilling = ZERO
|
||||
real(rk) :: shell_stab_last_shear_scale = ONE
|
||||
real(rk) :: shell_stability_min_shear_scale = ONE
|
||||
@@ -127,6 +128,7 @@ contains
|
||||
linear_solver_last_prec = LPRECOND_JACOBI
|
||||
linear_solver_last_iter = 0
|
||||
linear_solver_last_status = LS_STATUS_IDLE
|
||||
linear_solver_last_matrix_class = 1
|
||||
shell_stability_sample_count = 0
|
||||
shell_stability_last_elem = 0
|
||||
convergence_increment = 0
|
||||
@@ -139,7 +141,9 @@ contains
|
||||
convergence_correction_norm = ZERO
|
||||
convergence_contact_gap_norm = ZERO
|
||||
convergence_combined_norm = ZERO
|
||||
linear_solver_initial_resid = ZERO
|
||||
linear_solver_last_resid = ZERO
|
||||
linear_solver_relative_resid = ZERO
|
||||
shell_stability_last_drilling = ZERO
|
||||
shell_stab_last_shear_scale = ONE
|
||||
shell_stability_min_shear_scale = ONE
|
||||
|
||||
Reference in New Issue
Block a user