From c2db5f59c69d80f37ca9cc9d6fd8543d1d741464 Mon Sep 17 00:00:00 2001 From: shenw Date: Thu, 25 Jun 2026 09:49:03 +0800 Subject: [PATCH] Complete V4.6 linear solver interface --- docs/03_detailed_design.md | 8 + docs/05_interface_control_document.md | 40 +++- docs/06_test_and_verification_plan.md | 2 + docs/07_user_manual.md | 3 +- docs/08_developer_manual.md | 8 +- docs/v4_development_plan.md | 34 ++- include/femlite_c_api.h | 7 + src/base/fem_api.f90 | 56 +++++ src/base/fem_control.f90 | 23 ++ src/interface/fem_c_api.c | 44 ++++ src/interface/fem_fortran_bridge.f90 | 36 ++++ src/solver/fem_linear_solver_cg.f90 | 282 ++++++++++++++++++++++++- src/solver/fem_solver_implicit.f90 | 12 +- tests/interface/test_c_api.c | 27 +++ tests/module/test_implicit_inp.f90 | 18 ++ tests/module/test_linear_solver_cg.f90 | 160 ++++++++++++++ 16 files changed, 745 insertions(+), 15 deletions(-) diff --git a/docs/03_detailed_design.md b/docs/03_detailed_design.md index e2b7c45..985fcd6 100644 --- a/docs/03_detailed_design.md +++ b/docs/03_detailed_design.md @@ -862,6 +862,7 @@ end subroutine - Robin、MPC、刚性平面 penalty contact 和面-面 contact pair 的切线进入 Newton 有效刚度。 - 静力和非线性 Newmark 均支持线搜索;可选步长缩减在失败时恢复增量起点状态后重试。 - V4.5 起,`fem_control` 保存最近一次求解收敛快照、relative residual、contact gap residual、combined norm、cutback 诊断、最后有效时间和失败原因码,供 Fortran API、C ABI 和测试直接查询。 +- V4.6 起,隐式求解器通过线性求解器分发层求解 CSR 方程;默认 CG + Jacobi,可切换 BiCGSTAB + none/Jacobi,并记录最近一次线性求解方法、预条件器、迭代数、残差和状态。 ## 17. 稀疏矩阵模块 @@ -875,6 +876,13 @@ end subroutine - dense 仅用于单元局部矩阵和调试。 - skyline 非第一优先级。 +V4.6 线性求解器抽象仍位于 `fem_linear_solver_cg.f90`,保留 `linear_cg_solve` 兼容入口,同时新增: + +- `linear_solver_solve`:根据 `fem_control` 中的 `linear_solver_method / linear_precond_method` 分发。 +- `linear_bicgstab_solve`:用于非对称或非正定 CSR 小系统的内部备用路径。 +- `linear_solver_configure / linear_solver_get_settings / linear_solver_get_stats`:配置和查询当前/最近一次线性求解器状态。 +- `LSOLVER_EXTERNAL` 当前作为外部稀疏求解器占位,配置允许,实际求解返回 unsupported 状态。 + ## 18. 输出模块 模块:fem_output_csv.f90 diff --git a/docs/05_interface_control_document.md b/docs/05_interface_control_document.md index 98b61fd..bf7cfc1 100644 --- a/docs/05_interface_control_document.md +++ b/docs/05_interface_control_document.md @@ -43,6 +43,7 @@ - node-based surface、analytical rigid plane surface 和 contact property 查询/输入子集。 - contact pair active-set、gap residual 和 augmented penalty 诊断接口。 - contact pair 搜索统计接口,用于 V4.4 搜索/并行性能验收。 +- 线性求解器设置和最近一次线性求解统计接口,用于 V4.6 内部/外部求解路径切换验收。 ## 3. 接口设计原则 @@ -581,7 +582,43 @@ end subroutine - `failure_code` 使用 `CONV_FAIL_NONE=0`、`CONV_FAIL_NONCONVERGENCE=1`、`CONV_FAIL_CUTBACK_LIMIT=2`、`CONV_FAIL_STOPPED=3`。 - V4.5 起,非线性静力 Newton 迭代、静力 cutback 失败路径、非线性 Newmark cutback 运行和接触力评估会更新该状态;contact gap/mortar residual 当前作为 diagnostics 进入多准则统计,硬收敛判据仍以力残差为主。 -### 12.6 接触状态 +### 12.6 线性求解器控制 + +V4.6 提供内部线性求解器配置和最近一次求解统计查询: + +```fortran +subroutine fem_set_linear_solver(method, preconditioner, ierr) + integer, intent(in) :: method + integer, intent(in) :: preconditioner + integer, intent(out) :: ierr +end subroutine + +subroutine fem_get_linear_solver_settings(method, preconditioner, ierr) + integer, intent(out) :: method + integer, intent(out) :: preconditioner + integer, intent(out) :: ierr +end subroutine + +subroutine fem_get_linear_solver_stats(method, preconditioner, iteration, & + residual_norm, status_code, ierr) + integer, intent(out) :: method + integer, intent(out) :: preconditioner + integer, intent(out) :: iteration + real(rk), intent(out) :: residual_norm + integer, intent(out) :: status_code + integer, intent(out) :: ierr +end subroutine +``` + +说明: + +- `method` 使用 `LSOLVER_CG=1`、`LSOLVER_BICGSTAB=2`、`LSOLVER_EXTERNAL=100`。 +- `preconditioner` 使用 `LPRECOND_NONE=0`、`LPRECOND_JACOBI=1`。 +- `status_code` 使用 `LS_STATUS_IDLE=0`、`LS_STATUS_CONVERGED=1`、`LS_STATUS_FAILED=-1`、`LS_STATUS_UNSUPPORTED=-2`。 +- `LSOLVER_EXTERNAL` 仅作为外部稀疏求解器预留路径;当前配置可记录,但实际求解返回 unsupported。 +- 静力、隐式 Newmark 和非线性 Newton 修正方程均通过同一分发层求解。 + +### 12.7 接触状态 第三版提供接触结果查询接口: @@ -943,4 +980,5 @@ fem_finalize - C ABI 暴露 `femlite_get_convergence_status`,其中 `converged` 使用 `int` 返回 0/1。 - C ABI 暴露 `femlite_get_convergence_metrics`,返回相对力残差、contact gap residual 和 combined norm。 - C ABI 暴露 `femlite_get_convergence_diagnostics`,返回 cutback 次数、最后步长、最后有效时间、收敛状态码和失败原因码。 +- C ABI 暴露 `femlite_set_linear_solver`、`femlite_get_linear_solver_settings` 和 `femlite_get_linear_solver_stats`,返回/设置值与 Fortran API 常量一致。 - 上述函数只追加新符号,不改变 `femlite_get_contact_summary` 的签名和含义。 diff --git a/docs/06_test_and_verification_plan.md b/docs/06_test_and_verification_plan.md index 0f69496..31b28f0 100644 --- a/docs/06_test_and_verification_plan.md +++ b/docs/06_test_and_verification_plan.md @@ -60,6 +60,7 @@ Python 环境约定: - active set、gap residual 和 augmented penalty 诊断测试。 - 摩擦正则化、摩擦功和最大累计滑移输出测试。 - 接触示例 smoke 测试应覆盖刚性平面压入、两实体块面-面压缩和壳-刚性平面接触。 +- 线性求解器分发测试应覆盖 CG、BiCGSTAB、none/Jacobi 预条件、外部求解器占位和最近一次求解统计。 ## 4. 测试目录结构 @@ -299,6 +300,7 @@ SPH总力映射测试 relative tolerance 1.0e-10 to 1.0e-8 - `fem_get_contact_perf_stats` 和 C ABI `femlite_get_contact_perf_stats` 返回 contact search/force/tangent CPU 时间统计。 - `fem_get_contact_cache_stats` 和 C ABI `femlite_get_contact_cache_stats` 返回 BVH 候选缓存使用和溢出统计。 - `fem_get_convergence_status` / `fem_get_convergence_metrics` / `fem_get_convergence_diagnostics` 和 C ABI 对应包装返回最近一次求解的增量、迭代、残差、相对残差、修正范数、contact gap residual、combined norm、cutback 次数、最后步长、最后有效时间、状态码、失败原因码和收敛标志;空模型零状态、非线性静力收敛状态、contact gap 非零状态和 cutback 失败状态均需覆盖。 +- `fem_set_linear_solver` / `fem_get_linear_solver_settings` / `fem_get_linear_solver_stats` 和 C ABI 对应包装返回当前线性求解器、预条件器、最近一次迭代数、残差和状态;模块测试覆盖 BiCGSTAB 非对称小系统,`implicit_inp` 覆盖隐式路径切换到 BiCGSTAB。 - 删除单元状态可输出。 示例结果留存策略: diff --git a/docs/07_user_manual.md b/docs/07_user_manual.md index d7a8dd2..3db8216 100644 --- a/docs/07_user_manual.md +++ b/docs/07_user_manual.md @@ -17,6 +17,7 @@ FemLite 0.4.3 是船舶接触爆炸结构响应 FEM 软件的第四版接触增 - element/node/analytical surface 子集、contact property 子集、刚性平面接触和面-面 contact pair 阶段能力。 - contact pair active set、gap residual 和 augmented penalty 诊断输出。 - 静力/隐式求解的收敛状态和 cutback 诊断查询接口。 +- 内部线性求解器可在 CG 和 BiCGSTAB 间切换,并提供预条件和迭代统计查询。 - CSV、VTK、restart 和 contact CSV 输出。 - Fortran95 原生接口、C ABI 子集和 Python 调试脚本。 @@ -239,7 +240,7 @@ kind,pair_id,active_count,max_penetration,force_norm,work_estimate,cumulative_wo `search_*` 字段在 `SUMMARY` 行给出最近一次 contact pair 力评估的全局搜索统计、BVH 候选缓存使用情况和 `cpu_time` 口径秒数;逐 `PAIR` 行给出对应接触对的搜索、缓存和计时统计。`cpu_time` 是轻量趋势诊断,小算例中可能显示为 0。 -Fortran95 API 可通过 `fem_get_convergence_status` 查询最近一次求解的增量、迭代、残差、位移修正范数和收敛标志,通过 `fem_get_convergence_metrics` 查询相对残差、contact gap residual 和 combined norm,通过 `fem_get_convergence_diagnostics` 查询 cutback 次数、最后步长、最后有效时间、状态码和失败原因码。C ABI 提供同名 `femlite_get_*` 包装,`converged` 使用 0/1 整数返回。 +Fortran95 API 可通过 `fem_get_convergence_status` 查询最近一次求解的增量、迭代、残差、位移修正范数和收敛标志,通过 `fem_get_convergence_metrics` 查询相对残差、contact gap residual 和 combined norm,通过 `fem_get_convergence_diagnostics` 查询 cutback 次数、最后步长、最后有效时间、状态码和失败原因码。`fem_set_linear_solver` 可选择 `CG` 或 `BiCGSTAB` 与 `none/Jacobi` 预条件,`fem_get_linear_solver_stats` 查询最近一次线性求解迭代数、残差和状态。C ABI 提供同名 `femlite_get_*`/`femlite_set_*` 包装,`converged` 使用 0/1 整数返回。 建议把大型结果输出到 `examples/.../results/...` 或独立 `output/` 目录。仓库 `.gitignore` 默认忽略大规模结果文件。 diff --git a/docs/08_developer_manual.md b/docs/08_developer_manual.md index afef229..c15b44d 100644 --- a/docs/08_developer_manual.md +++ b/docs/08_developer_manual.md @@ -76,7 +76,7 @@ src/interface C ABI 和 Fortran-C bridge |---|---| | `fem_precision` | 全局精度、维度、版本常量 | | `fem_error` | 错误码和错误消息 | -| `fem_control` | 时间步、求解控制、输出控制和 V4.5 收敛/接触 gap 诊断快照 | +| `fem_control` | 时间步、求解控制、输出控制、V4.5 收敛诊断和 V4.6 线性求解器状态 | | `fem_api` | Fortran95 公共 API | | `fem_inp_reader` | 两遍 INP 读取主流程 | | `fem_inp_defs` | INP 模式常量 | @@ -214,9 +214,11 @@ fem_contact_output.f90 contact CSV 字段辅助 求解器核心文件: - `fem_assembly_csr.f90`:DOF 获取、CSR 图案和装配。 -- `fem_linear_solver_cg.f90`:Jacobi 预条件 CG。 +- `fem_linear_solver_cg.f90`:线性求解器分发层、Jacobi/none 预条件、CG、BiCGSTAB 和外部求解器占位。 - `fem_solver_implicit.f90`:静力、隐式 Newmark、非线性 Newton。 +V4.6 起,隐式求解器内部不再直调 CG,而是通过 `linear_solver_solve` 分发。新增线性求解器时应先在该分发层注册 method 常量、预条件支持、统计状态和模块测试,再接入 Fortran API / C ABI。 + 新增求解路径时应明确: - 是否需要质量矩阵。 @@ -281,7 +283,7 @@ C ABI: - 实现:`src/interface/fem_c_api.c`。 - Fortran-C bridge:`src/interface/fem_fortran_bridge.f90`。 -C ABI 当前暴露初始化、读取、构建、显式推进、SPH 力、facet 查询、节点运动学、contact summary、contact diagnostics、contact friction summary、contact history stats 和 restart 子集。 +C ABI 当前暴露初始化、读取、构建、显式推进、SPH 力、facet 查询、节点运动学、contact summary、contact diagnostics、contact friction summary、contact history stats、线性求解器设置/统计和 restart 子集。 Python 调试接口: diff --git a/docs/v4_development_plan.md b/docs/v4_development_plan.md index 60e2d9d..bd6c07f 100644 --- a/docs/v4_development_plan.md +++ b/docs/v4_development_plan.md @@ -592,7 +592,7 @@ FemLite 0.4.x 定位为: | S9 | 壳局部平面几何近似 | B 类。用曲壳基准矩阵约束误差,补充法向、曲率和局部坐标诊断;不承诺完整有限转动壳最终形态 | V4.7 | | S10 | 壳塑性 section tangent 基准不足 | A 类。补充弯曲/剪切塑性切线验证、卸载路径、长跑基准和 trial/rollback 回归 | V4.7 | | S11 | 集中质量和壳转动惯量对角近似 | B 类。显式继续默认集中质量;隐式路径增加一致质量或改进转动惯量选项的设计和小算例验证 | V4.5, V4.6 | -| S12 | CG + Jacobi 单一路径 | A 类。建立线性求解器抽象,增加 BiCGSTAB/GMRES 或等价内部求解器、预条件接口和外部稀疏求解器预留 | V4.6 | +| S12 | CG + Jacobi 单一路径 | DONE。已建立线性求解器分发层,支持 CG、BiCGSTAB、none/Jacobi 预条件、统计查询和外部求解器占位 | V4.6 | | S13 | MPC penalty 约束 | C 类。0.4.x 保留 penalty MPC,补充病态诊断和回归;严格 Lagrange multiplier 或 multiplier-augmented MPC 进入后续 | V4.5 | | S14 | 小应变 J2/J2_JC + Jaumann 客观率 | C 类。0.4.x 重点做接触/隐式稳定性验证和文档边界;完整 `F = Fe Fp` 大变形塑性列入 0.5.0 或后续 | V4.5, V4.7 | | S15 | restart 不保存完整模型数据库 | B 类。V4.3 已同步保存 mortar 积分点摩擦历史;0.4.x 后续继续同步新增求解状态,完整 inp 数据库级 restart 作为后续增强 | V4.3, V4.8 | @@ -810,3 +810,35 @@ FemLite 0.4.x 定位为: - 标定 contact gap residual 作为可选硬收敛准则时的量纲、容限和默认开关。 - 补充更长时间的非线性静力/非线性 Newmark 接触长跑基准。 + +## 27. 0.4.6 开发记录 + +### V4.6 稀疏线性求解器接口完善 + +完成状态:V4.6 线性求解器抽象、内部可切换求解路径、预条件选择和最近一次求解统计已形成阶段完善基线;外部稀疏求解器当前为显式 unsupported 占位。 + +已完成: + +- `fem_control` 新增线性求解器方法、预条件方法和最近一次线性求解统计状态。 +- `fem_linear_solver_cg` 保留兼容 `linear_cg_solve`,新增 `linear_solver_solve` 分发层。 +- 新增 BiCGSTAB 内部求解器,覆盖非对称 CSR 小系统。 +- 预条件器支持 `LPRECOND_NONE` 和 `LPRECOND_JACOBI`。 +- 隐式线性静力、线性 Newmark、非线性静力 Newton 修正方程和非线性 Newmark 修正方程均改为通过分发层求解。 +- `LSOLVER_EXTERNAL` 作为外部稀疏求解器预留 method;当前实际求解返回 `LS_STATUS_UNSUPPORTED`。 +- 新增 Fortran API `fem_set_linear_solver`、`fem_get_linear_solver_settings` 和 `fem_get_linear_solver_stats`。 +- C ABI 新增 `femlite_set_linear_solver`、`femlite_get_linear_solver_settings` 和 `femlite_get_linear_solver_stats`。 + +已补充测试: + +- `linear_solver_cg` 回归继续覆盖原 CG 入口、零 RHS 和非收敛路径。 +- `linear_solver_cg` 回归覆盖分发层 CG + none 预条件。 +- `linear_solver_cg` 回归覆盖 BiCGSTAB + Jacobi 求解非对称 CSR 小系统。 +- `linear_solver_cg` 回归覆盖外部求解器占位的 unsupported 状态。 +- `implicit_inp` 回归将隐式线性静力路径切换到 BiCGSTAB,并检查最后一次线性求解统计。 +- `c_api` 回归覆盖线性求解器默认设置、空模型统计、切换到 BiCGSTAB + none 和恢复默认。 +- `source_size` 定向 CTest 已通过,新增求解器接口未触发源码规模硬阈值。 + +后续: + +- 在 V4.6 后续或 V4.8 中补充更大规模非对称/病态矩阵求解器基准。 +- 预留 ILU/SSOR 或外部库后端适配,不影响当前 CG/BiCGSTAB 默认路径。 diff --git a/include/femlite_c_api.h b/include/femlite_c_api.h index a68a448..e627ad7 100644 --- a/include/femlite_c_api.h +++ b/include/femlite_c_api.h @@ -30,6 +30,13 @@ int femlite_get_convergence_diagnostics(int *cutback_count, double *last_accepted_time, int *status_code, int *failure_code); +int femlite_set_linear_solver(int method, int preconditioner); +int femlite_get_linear_solver_settings(int *method, int *preconditioner); +int femlite_get_linear_solver_stats(int *method, + int *preconditioner, + int *iteration, + double *residual_norm, + int *status_code); int femlite_get_contact_summary(int *active_count, double *work_step, double *work_total, diff --git a/src/base/fem_api.f90 b/src/base/fem_api.f90 index 1051fb0..a3e093b 100644 --- a/src/base/fem_api.f90 +++ b/src/base/fem_api.f90 @@ -10,6 +10,8 @@ module fem_api use fem_element_mass use fem_element_internal use fem_solver_implicit + use fem_linear_solver_cg, only: linear_solver_configure, & + linear_solver_get_settings, linear_solver_get_stats use fem_coupling use fem_boundary use fem_contact @@ -615,6 +617,60 @@ contains ierr = FEM_SUCCESS end subroutine fem_get_convergence_diagnostics + subroutine fem_set_linear_solver(method, preconditioner, ierr) + integer, intent(in) :: method + integer, intent(in) :: preconditioner + integer, intent(out) :: ierr + + if (.not. api_initialized) then + call error_set(FEM_ERR_INTERNAL, & + 'fem_set_linear_solver called before fem_initialize', ierr) + return + end if + + call linear_solver_configure(method, preconditioner, ierr) + end subroutine fem_set_linear_solver + + subroutine fem_get_linear_solver_settings(method, preconditioner, ierr) + integer, intent(out) :: method + integer, intent(out) :: preconditioner + integer, intent(out) :: ierr + + method = LSOLVER_CG + preconditioner = LPRECOND_JACOBI + if (.not. api_initialized) then + call error_set(FEM_ERR_INTERNAL, & + 'fem_get_linear_solver_settings called before fem_initialize', ierr) + return + end if + + call linear_solver_get_settings(method, preconditioner, ierr) + end subroutine fem_get_linear_solver_settings + + subroutine fem_get_linear_solver_stats(method, preconditioner, iteration, & + residual_norm, status_code, ierr) + integer, intent(out) :: method + integer, intent(out) :: preconditioner + integer, intent(out) :: iteration + real(rk), intent(out) :: residual_norm + integer, intent(out) :: status_code + integer, intent(out) :: ierr + + method = LSOLVER_CG + preconditioner = LPRECOND_JACOBI + iteration = 0 + residual_norm = ZERO + status_code = LS_STATUS_IDLE + if (.not. api_initialized) then + call error_set(FEM_ERR_INTERNAL, & + 'fem_get_linear_solver_stats called before fem_initialize', ierr) + return + end if + + call linear_solver_get_stats(method, preconditioner, iteration, & + residual_norm, status_code, ierr) + end subroutine fem_get_linear_solver_stats + subroutine fem_get_boundary_facet_count(num_facets, max_face_nodes, ierr) integer, intent(out) :: num_facets integer, intent(out) :: max_face_nodes diff --git a/src/base/fem_control.f90 b/src/base/fem_control.f90 index 4d506e9..c581d19 100644 --- a/src/base/fem_control.f90 +++ b/src/base/fem_control.f90 @@ -15,6 +15,15 @@ module fem_control integer, parameter :: CONV_FAIL_NONCONVERGENCE = 1 integer, parameter :: CONV_FAIL_CUTBACK_LIMIT = 2 integer, parameter :: CONV_FAIL_STOPPED = 3 + integer, parameter :: LSOLVER_CG = 1 + integer, parameter :: LSOLVER_BICGSTAB = 2 + 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 @@ -43,6 +52,12 @@ module fem_control integer :: max_newton_iter = 25 integer :: max_cutback = 8 integer :: output_interval = 1 + integer :: linear_solver_method = LSOLVER_CG + integer :: linear_precond_method = LPRECOND_JACOBI + integer :: linear_solver_last_method = LSOLVER_CG + integer :: linear_solver_last_prec = LPRECOND_JACOBI + integer :: linear_solver_last_iter = 0 + integer :: linear_solver_last_status = LS_STATUS_IDLE integer :: convergence_increment = 0 integer :: convergence_iteration = 0 integer :: convergence_cutback_count = 0 @@ -53,6 +68,7 @@ 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_last_resid = ZERO real(rk) :: convergence_last_dt = ZERO real(rk) :: convergence_last_accepted_time = ZERO logical :: convergence_converged = .false. @@ -92,6 +108,12 @@ contains max_newton_iter = 25 max_cutback = 8 output_interval = 1 + linear_solver_method = LSOLVER_CG + linear_precond_method = LPRECOND_JACOBI + linear_solver_last_method = LSOLVER_CG + linear_solver_last_prec = LPRECOND_JACOBI + linear_solver_last_iter = 0 + linear_solver_last_status = LS_STATUS_IDLE convergence_increment = 0 convergence_iteration = 0 convergence_cutback_count = 0 @@ -102,6 +124,7 @@ contains convergence_correction_norm = ZERO convergence_contact_gap_norm = ZERO convergence_combined_norm = ZERO + linear_solver_last_resid = ZERO convergence_last_dt = ZERO convergence_last_accepted_time = ZERO convergence_converged = .false. diff --git a/src/interface/fem_c_api.c b/src/interface/fem_c_api.c index fbebad1..e86a056 100644 --- a/src/interface/fem_c_api.c +++ b/src/interface/fem_c_api.c @@ -23,6 +23,9 @@ #define F_GET_CONVERGENCE FC_GLOBAL(femlite_f_get_convergence, FEMLITE_F_GET_CONVERGENCE) #define F_GET_CONV_METRICS FC_GLOBAL(femlite_f_get_conv_metrics, FEMLITE_F_GET_CONV_METRICS) #define F_GET_CONV_DIAG FC_GLOBAL(femlite_f_get_conv_diag, FEMLITE_F_GET_CONV_DIAG) +#define F_SET_LINSOL FC_GLOBAL(femlite_f_set_linsol, FEMLITE_F_SET_LINSOL) +#define F_GET_LINSOL_SETTINGS FC_GLOBAL(femlite_f_get_linsol_settings, FEMLITE_F_GET_LINSOL_SETTINGS) +#define F_GET_LINSOL_STATS FC_GLOBAL(femlite_f_get_linsol_stats, FEMLITE_F_GET_LINSOL_STATS) #define F_GET_CONTACT_SUMMARY FC_GLOBAL(femlite_f_get_contact_summary, FEMLITE_F_GET_CONTACT_SUMMARY) #define F_GET_CONTACT_DIAG FC_GLOBAL(femlite_f_get_contact_diag, FEMLITE_F_GET_CONTACT_DIAG) #define F_GET_CONTACT_FRICTION FC_GLOBAL(femlite_f_get_contact_friction, FEMLITE_F_GET_CONTACT_FRICTION) @@ -67,6 +70,14 @@ extern void F_GET_CONV_DIAG(int *cutback_count, int *status_code, int *failure_code, int *ierr); +extern void F_SET_LINSOL(int *method, int *preconditioner, int *ierr); +extern void F_GET_LINSOL_SETTINGS(int *method, int *preconditioner, int *ierr); +extern void F_GET_LINSOL_STATS(int *method, + int *preconditioner, + int *iteration, + double *residual_norm, + int *status_code, + int *ierr); extern void F_GET_CONTACT_SUMMARY(int *active_count, double *work_step, double *work_total, @@ -304,6 +315,39 @@ int femlite_get_convergence_diagnostics(int *cutback_count, return ierr; } +int femlite_set_linear_solver(int method, int preconditioner) +{ + int ierr = 0; + F_SET_LINSOL(&method, &preconditioner, &ierr); + return ierr; +} + +int femlite_get_linear_solver_settings(int *method, int *preconditioner) +{ + int ierr = 0; + if (!method || !preconditioner) { + return -1; + } + F_GET_LINSOL_SETTINGS(method, preconditioner, &ierr); + return ierr; +} + +int femlite_get_linear_solver_stats(int *method, + int *preconditioner, + int *iteration, + double *residual_norm, + int *status_code) +{ + int ierr = 0; + if (!method || !preconditioner || !iteration || + !residual_norm || !status_code) { + return -1; + } + F_GET_LINSOL_STATS(method, preconditioner, iteration, + residual_norm, status_code, &ierr); + return ierr; +} + int femlite_get_contact_summary(int *active_count, double *work_step, double *work_total, diff --git a/src/interface/fem_fortran_bridge.f90 b/src/interface/fem_fortran_bridge.f90 index 7b9126a..73a8ac2 100644 --- a/src/interface/fem_fortran_bridge.f90 +++ b/src/interface/fem_fortran_bridge.f90 @@ -212,6 +212,42 @@ subroutine femlite_f_get_conv_diag(cutback_count, last_dt, & failure_code, ierr) end subroutine femlite_f_get_conv_diag +subroutine femlite_f_set_linsol(method, preconditioner, ierr) + use fem_api + implicit none + integer, intent(in) :: method + integer, intent(in) :: preconditioner + integer, intent(out) :: ierr + + call fem_set_linear_solver(method, preconditioner, ierr) +end subroutine femlite_f_set_linsol + +subroutine femlite_f_get_linsol_settings(method, preconditioner, ierr) + use fem_api + implicit none + integer, intent(out) :: method + integer, intent(out) :: preconditioner + integer, intent(out) :: ierr + + call fem_get_linear_solver_settings(method, preconditioner, ierr) +end subroutine femlite_f_get_linsol_settings + +subroutine femlite_f_get_linsol_stats(method, preconditioner, iteration, & + residual_norm, status_code, ierr) + use fem_api + use fem_precision + implicit none + integer, intent(out) :: method + integer, intent(out) :: preconditioner + integer, intent(out) :: iteration + real(rk), intent(out) :: residual_norm + integer, intent(out) :: status_code + integer, intent(out) :: ierr + + call fem_get_linear_solver_stats(method, preconditioner, iteration, & + residual_norm, status_code, ierr) +end subroutine femlite_f_get_linsol_stats + subroutine femlite_f_clear_sph(ierr) use fem_api implicit none diff --git a/src/solver/fem_linear_solver_cg.f90 b/src/solver/fem_linear_solver_cg.f90 index 527f441..c14e19a 100644 --- a/src/solver/fem_linear_solver_cg.f90 +++ b/src/solver/fem_linear_solver_cg.f90 @@ -1,16 +1,22 @@ module fem_linear_solver_cg use fem_precision use fem_error + use fem_control use fem_sparse_csr implicit none private + public :: linear_solver_solve + public :: linear_solver_configure + public :: linear_solver_get_settings + public :: linear_solver_get_stats public :: linear_cg_solve + public :: linear_bicgstab_solve contains - subroutine linear_cg_solve(a, b, x, max_iter, tol, iter, res_norm, ierr) + subroutine linear_solver_solve(a, b, x, max_iter, tol, iter, res_norm, ierr) type(csr_matrix), intent(in) :: a real(rk), intent(in) :: b(:) real(rk), intent(inout) :: x(:) @@ -19,6 +25,110 @@ contains integer, intent(out) :: iter real(rk), intent(out) :: res_norm integer, intent(out) :: ierr + integer :: method + integer :: preconditioner + integer :: status + + method = linear_solver_method + preconditioner = linear_precond_method + status = LS_STATUS_FAILED + + select case (method) + case (LSOLVER_CG) + call linear_cg_solve(a, b, x, max_iter, tol, iter, res_norm, ierr, & + preconditioner) + case (LSOLVER_BICGSTAB) + call linear_bicgstab_solve(a, b, x, max_iter, tol, iter, res_norm, & + ierr, preconditioner) + case (LSOLVER_EXTERNAL) + iter = 0 + res_norm = ZERO + status = LS_STATUS_UNSUPPORTED + call error_set(FEM_ERR_SOLVER, 'external linear solver is not enabled', ierr) + case default + iter = 0 + res_norm = ZERO + call error_set(FEM_ERR_SOLVER, 'unknown linear solver method', ierr) + end select + + if (ierr .eq. FEM_SUCCESS) status = LS_STATUS_CONVERGED + call linear_solver_record(method, preconditioner, iter, res_norm, status) + end subroutine linear_solver_solve + + subroutine linear_solver_configure(method, preconditioner, ierr) + integer, intent(in) :: method + integer, intent(in) :: preconditioner + integer, intent(out) :: ierr + + if (method .ne. LSOLVER_CG .and. method .ne. LSOLVER_BICGSTAB .and. & + method .ne. LSOLVER_EXTERNAL) then + call error_set(FEM_ERR_SOLVER, 'invalid linear solver method', ierr) + return + end if + if (preconditioner .ne. LPRECOND_NONE .and. & + preconditioner .ne. LPRECOND_JACOBI) then + call error_set(FEM_ERR_SOLVER, 'invalid linear preconditioner', ierr) + return + end if + + linear_solver_method = method + linear_precond_method = preconditioner + ierr = FEM_SUCCESS + end subroutine linear_solver_configure + + subroutine linear_solver_get_settings(method, preconditioner, ierr) + integer, intent(out) :: method + integer, intent(out) :: preconditioner + integer, intent(out) :: ierr + + method = linear_solver_method + preconditioner = linear_precond_method + ierr = FEM_SUCCESS + end subroutine linear_solver_get_settings + + subroutine linear_solver_get_stats(method, preconditioner, iteration, & + residual_norm, status_code, ierr) + integer, intent(out) :: method + integer, intent(out) :: preconditioner + integer, intent(out) :: iteration + real(rk), intent(out) :: residual_norm + integer, intent(out) :: status_code + integer, intent(out) :: ierr + + method = linear_solver_last_method + preconditioner = linear_solver_last_prec + iteration = linear_solver_last_iter + residual_norm = linear_solver_last_resid + status_code = linear_solver_last_status + ierr = FEM_SUCCESS + end subroutine linear_solver_get_stats + + subroutine linear_solver_record(method, preconditioner, iteration, & + residual_norm, status_code) + integer, intent(in) :: method + integer, intent(in) :: preconditioner + integer, intent(in) :: iteration + real(rk), intent(in) :: residual_norm + integer, intent(in) :: status_code + + linear_solver_last_method = method + linear_solver_last_prec = preconditioner + linear_solver_last_iter = iteration + linear_solver_last_resid = residual_norm + linear_solver_last_status = status_code + end subroutine linear_solver_record + + subroutine linear_cg_solve(a, b, x, max_iter, tol, iter, res_norm, ierr, & + preconditioner) + type(csr_matrix), intent(in) :: a + real(rk), intent(in) :: b(:) + real(rk), intent(inout) :: x(:) + integer, intent(in) :: max_iter + real(rk), intent(in) :: tol + integer, intent(out) :: iter + real(rk), intent(out) :: res_norm + integer, intent(out) :: ierr + integer, intent(in), optional :: preconditioner real(rk), allocatable :: r(:) real(rk), allocatable :: z(:) real(rk), allocatable :: p(:) @@ -32,10 +142,13 @@ contains real(rk) :: rsnew real(rk) :: threshold integer :: n + integer :: prec integer :: stat iter = 0 res_norm = ZERO + prec = LPRECOND_JACOBI + if (present(preconditioner)) prec = preconditioner if (a%nrow .le. 0 .or. a%ncol .le. 0) then call error_set(FEM_ERR_SOLVER, 'CG solver received an empty matrix', ierr) @@ -65,8 +178,7 @@ contains return end if - diag_inv = ONE - call build_jacobi_inverse(a, diag_inv, ierr) + call build_preconditioner(a, prec, diag_inv, ierr) if (ierr .ne. FEM_SUCCESS) go to 900 call csr_matvec(a, x, ap, ierr) @@ -132,6 +244,170 @@ contains if (allocated(diag_inv)) deallocate(diag_inv) end subroutine linear_cg_solve + subroutine linear_bicgstab_solve(a, b, x, max_iter, tol, iter, res_norm, & + ierr, preconditioner) + type(csr_matrix), intent(in) :: a + real(rk), intent(in) :: b(:) + real(rk), intent(inout) :: x(:) + integer, intent(in) :: max_iter + real(rk), intent(in) :: tol + integer, intent(out) :: iter + real(rk), intent(out) :: res_norm + integer, intent(out) :: ierr + integer, intent(in), optional :: preconditioner + real(rk), allocatable :: r(:), rhat(:), p(:), v(:), s(:), t(:) + real(rk), allocatable :: phat(:), shat(:), diag_inv(:) + real(rk) :: alpha, beta, omega, rho_old, rho_new + real(rk) :: denom, tt, norm_b, threshold + integer :: n, stat, prec + + iter = 0 + res_norm = ZERO + prec = LPRECOND_JACOBI + if (present(preconditioner)) prec = preconditioner + call validate_linear_system(a, b, x, max_iter, tol, 'BiCGSTAB', ierr) + if (ierr .ne. FEM_SUCCESS) return + + n = a%nrow + allocate(r(n), rhat(n), p(n), v(n), s(n), t(n), phat(n), shat(n), & + diag_inv(n), stat=stat) + if (stat .ne. 0) then + call error_set(FEM_ERR_SOLVER, 'failed to allocate BiCGSTAB workspace', ierr) + return + end if + + call build_preconditioner(a, prec, diag_inv, ierr) + if (ierr .ne. FEM_SUCCESS) go to 900 + call csr_matvec(a, x, v, ierr) + if (ierr .ne. FEM_SUCCESS) go to 900 + + r = b - v + rhat = r + p = ZERO + v = ZERO + rho_old = ONE + alpha = ONE + omega = ONE + norm_b = sqrt(dot_product(b, b)) + threshold = tol * max(ONE, norm_b) + res_norm = sqrt(dot_product(r, r)) + if (res_norm .le. threshold) then + ierr = FEM_SUCCESS + go to 900 + end if + + do iter = 1, max_iter + rho_new = dot_product(rhat, r) + if (abs(rho_new) .le. tiny(ONE)) then + call error_set(FEM_ERR_SOLVER, 'BiCGSTAB rho breakdown', ierr) + go to 900 + end if + beta = (rho_new / rho_old) * (alpha / omega) + p = r + beta * (p - omega * v) + call apply_jacobi_inverse(diag_inv, p, phat) + call csr_matvec(a, phat, v, ierr) + if (ierr .ne. FEM_SUCCESS) go to 900 + denom = dot_product(rhat, v) + if (abs(denom) .le. tiny(ONE)) then + call error_set(FEM_ERR_SOLVER, 'BiCGSTAB alpha breakdown', ierr) + go to 900 + end if + alpha = rho_new / denom + s = r - alpha * v + res_norm = sqrt(dot_product(s, s)) + if (res_norm .le. threshold) then + x = x + alpha * phat + ierr = FEM_SUCCESS + go to 900 + end if + call apply_jacobi_inverse(diag_inv, s, shat) + call csr_matvec(a, shat, t, ierr) + if (ierr .ne. FEM_SUCCESS) go to 900 + tt = dot_product(t, t) + if (tt .le. tiny(ONE)) then + call error_set(FEM_ERR_SOLVER, 'BiCGSTAB omega breakdown', ierr) + go to 900 + end if + omega = dot_product(t, s) / tt + x = x + alpha * phat + omega * shat + r = s - omega * t + res_norm = sqrt(dot_product(r, r)) + if (res_norm .le. threshold) then + ierr = FEM_SUCCESS + go to 900 + end if + if (abs(omega) .le. tiny(ONE)) then + call error_set(FEM_ERR_SOLVER, 'BiCGSTAB omega stagnation', ierr) + go to 900 + end if + rho_old = rho_new + end do + + iter = max_iter + call error_set(FEM_ERR_SOLVER, 'BiCGSTAB solver did not converge', ierr) + +900 continue + if (allocated(r)) deallocate(r) + if (allocated(rhat)) deallocate(rhat) + if (allocated(p)) deallocate(p) + if (allocated(v)) deallocate(v) + if (allocated(s)) deallocate(s) + if (allocated(t)) deallocate(t) + if (allocated(phat)) deallocate(phat) + if (allocated(shat)) deallocate(shat) + if (allocated(diag_inv)) deallocate(diag_inv) + end subroutine linear_bicgstab_solve + + subroutine validate_linear_system(a, b, x, max_iter, tol, solver_name, ierr) + type(csr_matrix), intent(in) :: a + real(rk), intent(in) :: b(:) + real(rk), intent(in) :: x(:) + integer, intent(in) :: max_iter + real(rk), intent(in) :: tol + character(len=*), intent(in) :: solver_name + integer, intent(out) :: ierr + + if (a%nrow .le. 0 .or. a%ncol .le. 0) then + call error_set(FEM_ERR_SOLVER, trim(solver_name)//' solver received an empty matrix', ierr) + return + end if + if (a%nrow .ne. a%ncol) then + call error_set(FEM_ERR_SOLVER, trim(solver_name)//' solver requires a square matrix', ierr) + return + end if + if (size(b) .ne. a%nrow .or. size(x) .ne. a%ncol) then + call error_set(FEM_ERR_SOLVER, trim(solver_name)//' solver vector size mismatch', ierr) + return + end if + if (max_iter .le. 0) then + call error_set(FEM_ERR_SOLVER, trim(solver_name)//' solver max_iter must be positive', ierr) + return + end if + if (tol .le. ZERO) then + call error_set(FEM_ERR_SOLVER, trim(solver_name)//' solver tolerance must be positive', ierr) + return + end if + + ierr = FEM_SUCCESS + end subroutine validate_linear_system + + subroutine build_preconditioner(a, preconditioner, diag_inv, ierr) + type(csr_matrix), intent(in) :: a + integer, intent(in) :: preconditioner + real(rk), intent(inout) :: diag_inv(:) + integer, intent(out) :: ierr + + select case (preconditioner) + case (LPRECOND_NONE) + diag_inv = ONE + ierr = FEM_SUCCESS + case (LPRECOND_JACOBI) + call build_jacobi_inverse(a, diag_inv, ierr) + case default + call error_set(FEM_ERR_SOLVER, 'unsupported linear preconditioner', ierr) + end select + end subroutine build_preconditioner + subroutine build_jacobi_inverse(a, diag_inv, ierr) type(csr_matrix), intent(in) :: a real(rk), intent(inout) :: diag_inv(:) diff --git a/src/solver/fem_solver_implicit.f90 b/src/solver/fem_solver_implicit.f90 index 4a4c82a..27cf605 100644 --- a/src/solver/fem_solver_implicit.f90 +++ b/src/solver/fem_solver_implicit.f90 @@ -91,7 +91,7 @@ contains if (ierr .ne. FEM_SUCCESS) go to 900 u = ZERO - call linear_cg_solve(kmat, rhs, u, max_iter, tol, iter, res_norm, ierr) + call linear_solver_solve(kmat, rhs, u, max_iter, tol, iter, res_norm, ierr) if (ierr .ne. FEM_SUCCESS) go to 900 if (allocated(v)) v = ZERO @@ -316,7 +316,7 @@ contains if (ierr .ne. FEM_SUCCESS) go to 900 u = u_pred - call linear_cg_solve(kmat, rhs, u, max_iter, tol, iter, res_norm, ierr) + call linear_solver_solve(kmat, rhs, u, max_iter, tol, iter, res_norm, ierr) if (ierr .ne. FEM_SUCCESS) go to 900 call newmark_linear_finish(dt, gamma, a0, target_time, kmat, & @@ -692,8 +692,8 @@ contains call apply_implicit_dirichlet_zero(kmat, rhs_corr, ierr) if (ierr .ne. FEM_SUCCESS) go to 900 - call linear_cg_solve(kmat, rhs_corr, du, max_iter * 20, tol, & - cg_iter, cg_res, ierr) + call linear_solver_solve(kmat, rhs_corr, du, max_iter * 20, tol, & + cg_iter, cg_res, ierr) 900 continue call csr_free(kmat, stat) @@ -1137,8 +1137,8 @@ contains call apply_implicit_dirichlet_zero(kmat, rhs_corr, ierr) if (ierr .ne. FEM_SUCCESS) go to 900 - call linear_cg_solve(kmat, rhs_corr, du, max_iter * 20, tol, & - cg_iter, cg_res, ierr) + call linear_solver_solve(kmat, rhs_corr, du, max_iter * 20, tol, & + cg_iter, cg_res, ierr) 900 continue call csr_free(kmat, stat) diff --git a/tests/interface/test_c_api.c b/tests/interface/test_c_api.c index f2798e4..134242b 100644 --- a/tests/interface/test_c_api.c +++ b/tests/interface/test_c_api.c @@ -47,6 +47,10 @@ int main(void) int conv_cutback_count = -1; int conv_status_code = -999; int conv_failure_code = -999; + int linsol_method = -1; + int linsol_preconditioner = -1; + int linsol_iteration = -1; + int linsol_status = -999; int node_ids[1] = {2}; int facet_id[8]; int elem_id[8]; @@ -86,6 +90,7 @@ int main(void) double conv_relative_residual = -1.0; double conv_contact_gap = -1.0; double conv_combined_norm = -1.0; + double linsol_residual = -1.0; ierr = femlite_initialize(); if (ierr != 0) return check_ierr(ierr, 1); @@ -103,6 +108,28 @@ int main(void) if (ierr != 0) return check_ierr(ierr, 6); if (nnode != 4 || nelem != 1 || ndof != 12) return 7; + ierr = femlite_get_linear_solver_settings(&linsol_method, + &linsol_preconditioner); + if (ierr != 0) return check_ierr(ierr, 44); + if (linsol_method != 1 || linsol_preconditioner != 1) return 45; + ierr = femlite_get_linear_solver_stats(&linsol_method, + &linsol_preconditioner, + &linsol_iteration, + &linsol_residual, + &linsol_status); + if (ierr != 0) return check_ierr(ierr, 46); + if (linsol_method != 1 || linsol_preconditioner != 1 || + linsol_iteration != 0 || linsol_residual != 0.0 || + linsol_status != 0) return 47; + ierr = femlite_set_linear_solver(2, 0); + if (ierr != 0) return check_ierr(ierr, 48); + ierr = femlite_get_linear_solver_settings(&linsol_method, + &linsol_preconditioner); + if (ierr != 0) return check_ierr(ierr, 49); + if (linsol_method != 2 || linsol_preconditioner != 0) return 50; + ierr = femlite_set_linear_solver(1, 1); + if (ierr != 0) return check_ierr(ierr, 51); + ierr = femlite_get_convergence_status(&conv_increment, &conv_iteration, &conv_residual_norm, &conv_correction_norm, diff --git a/tests/module/test_implicit_inp.f90 b/tests/module/test_implicit_inp.f90 index 934ecc0..8d06ede 100644 --- a/tests/module/test_implicit_inp.f90 +++ b/tests/module/test_implicit_inp.f90 @@ -45,9 +45,14 @@ contains integer :: step integer :: conv_increment integer :: conv_iteration + integer :: linsol_method + integer :: linsol_preconditioner + integer :: linsol_iteration + integer :: linsol_status real(rk) :: res_norm real(rk) :: conv_residual_norm real(rk) :: conv_correction_norm + real(rk) :: linsol_residual real(rk) :: time real(rk) :: displacement(NDIM) real(rk) :: velocity(NDIM) @@ -63,6 +68,9 @@ contains call fem_build_model(ierr) if (ierr .ne. 0) call fail(3) + call fem_set_linear_solver(LSOLVER_BICGSTAB, LPRECOND_JACOBI, ierr) + if (ierr .ne. 0) call fail(1004) + call fem_solve_implicit_linear(50, 1.0e-12_rk, iter, res_norm, ierr) if (ierr .ne. 0) call fail(4) if (iter .le. 0 .or. iter .gt. 5) call fail(5) @@ -76,6 +84,16 @@ contains if (conv_iteration .ne. iter) call fail(1001) call check_close(conv_residual_norm, res_norm, 1002) call check_close(conv_correction_norm, ZERO, 1003) + call fem_get_linear_solver_stats(linsol_method, linsol_preconditioner, & + linsol_iteration, linsol_residual, linsol_status, ierr) + if (ierr .ne. 0) call fail(1005) + if (linsol_method .ne. LSOLVER_BICGSTAB) call fail(1006) + if (linsol_preconditioner .ne. LPRECOND_JACOBI) call fail(1007) + if (linsol_status .ne. LS_STATUS_CONVERGED) call fail(1008) + if (linsol_iteration .le. 0) call fail(1009) + if (linsol_residual .gt. 1.0e-10_rk) call fail(1010) + call fem_set_linear_solver(LSOLVER_CG, LPRECOND_JACOBI, ierr) + if (ierr .ne. 0) call fail(1011) call fem_get_node_kinematics(2, displacement, velocity, acceleration, ierr) if (ierr .ne. 0) call fail(7) diff --git a/tests/module/test_linear_solver_cg.f90 b/tests/module/test_linear_solver_cg.f90 index 11ab20e..0d88848 100644 --- a/tests/module/test_linear_solver_cg.f90 +++ b/tests/module/test_linear_solver_cg.f90 @@ -1,6 +1,7 @@ program test_linear_solver_cg use fem_precision use fem_error + use fem_control use fem_sparse_csr use fem_linear_solver_cg implicit none @@ -10,6 +11,10 @@ program test_linear_solver_cg call check_spd_solve() call check_zero_rhs() call check_nonconvergence() + call check_dispatch_cg_none() + call check_bicgstab_solve() + call check_external_placeholder() + call check_invalid_configuration() contains @@ -83,6 +88,134 @@ contains if (ierr .ne. FEM_SUCCESS) call fail(34) end subroutine check_nonconvergence + subroutine check_dispatch_cg_none() + type(csr_matrix) :: a + integer :: ierr + integer :: iter + integer :: method + integer :: preconditioner + integer :: status_code + real(rk) :: b(3) + real(rk) :: x(3) + real(rk) :: res_norm + + call linear_solver_configure(LSOLVER_CG, LPRECOND_NONE, ierr) + if (ierr .ne. FEM_SUCCESS) call fail(40) + call make_tridiagonal(a, ierr) + if (ierr .ne. FEM_SUCCESS) call fail(41) + + b = (/ ZERO, ZERO, 4.0_rk /) + x = ZERO + call linear_solver_solve(a, b, x, 20, 1.0e-12_rk, iter, res_norm, ierr) + if (ierr .ne. FEM_SUCCESS) call fail(42) + call check_close(x(1), ONE, 43) + call linear_solver_get_stats(method, preconditioner, iter, res_norm, & + status_code, ierr) + if (ierr .ne. FEM_SUCCESS) call fail(44) + if (method .ne. LSOLVER_CG) call fail(45) + if (preconditioner .ne. LPRECOND_NONE) call fail(46) + if (status_code .ne. LS_STATUS_CONVERGED) call fail(47) + + call csr_free(a, ierr) + if (ierr .ne. FEM_SUCCESS) call fail(48) + call linear_solver_configure(LSOLVER_CG, LPRECOND_JACOBI, ierr) + if (ierr .ne. FEM_SUCCESS) call fail(49) + end subroutine check_dispatch_cg_none + + subroutine check_bicgstab_solve() + type(csr_matrix) :: a + integer :: ierr + integer :: iter + integer :: method + integer :: preconditioner + integer :: status_code + real(rk) :: b(3) + real(rk) :: x(3) + real(rk) :: res_norm + + call linear_solver_configure(LSOLVER_BICGSTAB, LPRECOND_JACOBI, ierr) + if (ierr .ne. FEM_SUCCESS) call fail(60) + call make_nonsymmetric(a, ierr) + if (ierr .ne. FEM_SUCCESS) call fail(61) + + b = (/ 6.0_rk, 11.0_rk, 8.0_rk /) + x = ZERO + call linear_solver_solve(a, b, x, 30, 1.0e-12_rk, iter, res_norm, ierr) + if (ierr .ne. FEM_SUCCESS) call fail(62) + if (iter .le. 0) call fail(63) + if (res_norm .gt. 1.0e-10_rk) call fail(64) + call check_close(x(1), ONE, 65) + call check_close(x(2), 2.0_rk, 66) + call check_close(x(3), 3.0_rk, 67) + call linear_solver_get_stats(method, preconditioner, iter, res_norm, & + status_code, ierr) + if (ierr .ne. FEM_SUCCESS) call fail(68) + if (method .ne. LSOLVER_BICGSTAB) call fail(69) + if (preconditioner .ne. LPRECOND_JACOBI) call fail(70) + if (status_code .ne. LS_STATUS_CONVERGED) call fail(71) + + call csr_free(a, ierr) + if (ierr .ne. FEM_SUCCESS) call fail(72) + call linear_solver_configure(LSOLVER_CG, LPRECOND_JACOBI, ierr) + if (ierr .ne. FEM_SUCCESS) call fail(73) + end subroutine check_bicgstab_solve + + subroutine check_external_placeholder() + type(csr_matrix) :: a + integer :: ierr + integer :: iter + integer :: method + integer :: preconditioner + integer :: status_code + real(rk) :: b(3) + real(rk) :: x(3) + real(rk) :: res_norm + + call linear_solver_configure(LSOLVER_EXTERNAL, LPRECOND_JACOBI, ierr) + if (ierr .ne. FEM_SUCCESS) call fail(80) + call make_tridiagonal(a, ierr) + if (ierr .ne. FEM_SUCCESS) call fail(81) + + b = (/ ZERO, ZERO, 4.0_rk /) + x = ZERO + call linear_solver_solve(a, b, x, 20, 1.0e-12_rk, iter, res_norm, ierr) + if (ierr .eq. FEM_SUCCESS) call fail(82) + call linear_solver_get_stats(method, preconditioner, iter, res_norm, & + status_code, ierr) + if (ierr .ne. FEM_SUCCESS) call fail(83) + if (method .ne. LSOLVER_EXTERNAL) call fail(84) + if (preconditioner .ne. LPRECOND_JACOBI) call fail(85) + if (status_code .ne. LS_STATUS_UNSUPPORTED) call fail(86) + + call csr_free(a, ierr) + if (ierr .ne. FEM_SUCCESS) call fail(87) + call linear_solver_configure(LSOLVER_CG, LPRECOND_JACOBI, ierr) + if (ierr .ne. FEM_SUCCESS) call fail(88) + end subroutine check_external_placeholder + + subroutine check_invalid_configuration() + integer :: ierr + integer :: method + integer :: preconditioner + + call linear_solver_configure(LSOLVER_CG, LPRECOND_JACOBI, ierr) + if (ierr .ne. FEM_SUCCESS) call fail(90) + + call linear_solver_configure(-99, LPRECOND_JACOBI, ierr) + if (ierr .eq. FEM_SUCCESS) call fail(91) + call linear_solver_get_settings(method, preconditioner, ierr) + if (ierr .ne. FEM_SUCCESS) call fail(92) + if (method .ne. LSOLVER_CG) call fail(93) + if (preconditioner .ne. LPRECOND_JACOBI) call fail(94) + + call linear_solver_configure(LSOLVER_BICGSTAB, -99, ierr) + if (ierr .eq. FEM_SUCCESS) call fail(95) + call linear_solver_get_settings(method, preconditioner, ierr) + if (ierr .ne. FEM_SUCCESS) call fail(96) + if (method .ne. LSOLVER_CG) call fail(97) + if (preconditioner .ne. LPRECOND_JACOBI) call fail(98) + end subroutine check_invalid_configuration + subroutine make_tridiagonal(a, ierr) type(csr_matrix), intent(inout) :: a integer, intent(out) :: ierr @@ -110,6 +243,33 @@ contains call csr_add_value(a, 3, 3, 2.0_rk, ierr) end subroutine make_tridiagonal + subroutine make_nonsymmetric(a, ierr) + type(csr_matrix), intent(inout) :: a + integer, intent(out) :: ierr + integer :: row_ptr(4) + integer :: col_ind(7) + + call csr_init(a) + row_ptr = (/ 1, 3, 6, 8 /) + col_ind = (/ 1, 2, 1, 2, 3, 2, 3 /) + + call csr_create_pattern(a, 3, 3, row_ptr, col_ind, ierr) + if (ierr .ne. FEM_SUCCESS) return + call csr_add_value(a, 1, 1, 4.0_rk, ierr) + if (ierr .ne. FEM_SUCCESS) return + call csr_add_value(a, 1, 2, ONE, ierr) + if (ierr .ne. FEM_SUCCESS) return + call csr_add_value(a, 2, 1, 2.0_rk, ierr) + if (ierr .ne. FEM_SUCCESS) return + call csr_add_value(a, 2, 2, 3.0_rk, ierr) + if (ierr .ne. FEM_SUCCESS) return + call csr_add_value(a, 2, 3, ONE, ierr) + if (ierr .ne. FEM_SUCCESS) return + call csr_add_value(a, 3, 2, ONE, ierr) + if (ierr .ne. FEM_SUCCESS) return + call csr_add_value(a, 3, 3, 2.0_rk, ierr) + end subroutine make_nonsymmetric + subroutine check_close(actual, expected, code) real(rk), intent(in) :: actual real(rk), intent(in) :: expected