From 61b81e9d50fa767c61fc9ac9df7bf62f7f293cfd Mon Sep 17 00:00:00 2001 From: Codex Date: Thu, 2 Jul 2026 21:10:04 +0800 Subject: [PATCH] Expose water Fortran diagnostics APIs --- include/sphlite_c_api.h | 5 +++ src/interface/sph_api.f90 | 66 +++++++++++++++++++++++++++++- tests/module/test_output.f90 | 7 +++- tests/module/test_restart.f90 | 9 +++- tests/module/test_solver_water.f90 | 42 ++++++++++++++++++- todo.md | 40 +++++++++--------- 6 files changed, 144 insertions(+), 25 deletions(-) diff --git a/include/sphlite_c_api.h b/include/sphlite_c_api.h index 6a5f977..7b5e905 100644 --- a/include/sphlite_c_api.h +++ b/include/sphlite_c_api.h @@ -63,6 +63,11 @@ SPHLITE_API int sphlite_get_particle_state(int max_particles, double *temperature, double *h, int *count); +SPHLITE_API int sphlite_get_water_summary(double *mass, + double *momentum, + double *max_pressure, + double *min_density, + double *max_density); #ifdef __cplusplus } diff --git a/src/interface/sph_api.f90 b/src/interface/sph_api.f90 index b998fe6..0b96a36 100644 --- a/src/interface/sph_api.f90 +++ b/src/interface/sph_api.f90 @@ -16,8 +16,10 @@ module sph_api use sph_restart, only: sph_restart_write, sph_restart_read use sph_coupling_interface, only: sph_coupling_reset use sph_particle, only: sph_particle_initialize, sph_particle_reset + use sph_neighbor, only: sph_neighbor_rebuild, sph_neighbor_get_stats use sph_material, only: sph_material_initialize, sph_material_reset - use sph_water, only: sph_water_initialize, sph_water_reset + use sph_water, only: sph_water_initialize, sph_water_reset, & + sph_water_get_summary, sph_water_estimate_dt_limits use sph_gas, only: sph_gas_initialize, sph_gas_reset use sph_explosive, only: sph_explosive_initialize, sph_explosive_reset use sph_solid, only: sph_solid_initialize, sph_solid_reset @@ -284,6 +286,68 @@ contains ierr = SPH_SUCCESS end subroutine sph_get_input_warning_count + subroutine sph_rebuild_neighbors(ierr) + integer, intent(out) :: ierr + + call sph_api_require_initialized(ierr) + if (ierr /= SPH_SUCCESS) return + call sph_api_require_model_built(ierr) + if (ierr /= SPH_SUCCESS) return + call sph_neighbor_rebuild(ierr) + end subroutine sph_rebuild_neighbors + + subroutine sph_get_neighbor_stats(max_neighbors, average_neighbors, ierr) + integer, intent(out) :: max_neighbors + real(rk), intent(out) :: average_neighbors + integer, intent(out) :: ierr + + max_neighbors = 0 + average_neighbors = 0.0_rk + call sph_api_require_initialized(ierr) + if (ierr /= SPH_SUCCESS) return + call sph_api_require_model_built(ierr) + if (ierr /= SPH_SUCCESS) return + call sph_neighbor_get_stats(max_neighbors, average_neighbors, ierr) + end subroutine sph_get_neighbor_stats + + subroutine sph_get_water_summary(mass, momentum, max_pressure, min_density, & + max_density, ierr) + real(rk), intent(out) :: mass + real(rk), intent(out) :: momentum(3) + real(rk), intent(out) :: max_pressure + real(rk), intent(out) :: min_density + real(rk), intent(out) :: max_density + integer, intent(out) :: ierr + + mass = 0.0_rk + momentum = 0.0_rk + max_pressure = 0.0_rk + min_density = 0.0_rk + max_density = 0.0_rk + call sph_api_require_initialized(ierr) + if (ierr /= SPH_SUCCESS) return + call sph_api_require_model_built(ierr) + if (ierr /= SPH_SUCCESS) return + call sph_water_get_summary(mass, momentum, max_pressure, min_density, & + max_density, ierr) + end subroutine sph_get_water_summary + + subroutine sph_get_water_dt_limits(dt_cfl, dt_accel, dt_viscous, ierr) + real(rk), intent(out) :: dt_cfl + real(rk), intent(out) :: dt_accel + real(rk), intent(out) :: dt_viscous + integer, intent(out) :: ierr + + dt_cfl = 0.0_rk + dt_accel = 0.0_rk + dt_viscous = 0.0_rk + call sph_api_require_initialized(ierr) + if (ierr /= SPH_SUCCESS) return + call sph_api_require_model_built(ierr) + if (ierr /= SPH_SUCCESS) return + call sph_water_estimate_dt_limits(dt_cfl, dt_accel, dt_viscous, ierr) + end subroutine sph_get_water_dt_limits + subroutine sph_api_require_initialized(ierr) integer, intent(out) :: ierr diff --git a/tests/module/test_output.f90 b/tests/module/test_output.f90 index 953853e..9cbcf10 100644 --- a/tests/module/test_output.f90 +++ b/tests/module/test_output.f90 @@ -6,10 +6,11 @@ program test_output implicit none integer :: ierr + logical :: exists call sph_initialize(ierr) call assert_ok(ierr, 'initialize failed') - call sph_read_inp('tests/data/output_control_011.inp', ierr) + call sph_read_inp('tests/data/water_minimal_020.inp', ierr) call assert_ok(ierr, 'read input failed') call sph_build_model(ierr) call assert_ok(ierr, 'build model failed') @@ -19,6 +20,10 @@ program test_output call assert_ok(ierr, 'set output interval failed') call sph_write_output(0, 0.0_rk, ierr) call assert_ok(ierr, 'write output failed') + inquire(file='build-codex-unix/sphlite_00000000.csv', exist=exists) + if (.not. exists) call fail('particle CSV output was not written') + inquire(file='build-codex-unix/sphlite_00000000_summary.csv', exist=exists) + if (.not. exists) call fail('summary CSV output was not written') call sph_finalize(ierr) call assert_ok(ierr, 'finalize failed') diff --git a/tests/module/test_restart.f90 b/tests/module/test_restart.f90 index 3429ffa..6129f7f 100644 --- a/tests/module/test_restart.f90 +++ b/tests/module/test_restart.f90 @@ -8,23 +8,28 @@ program test_restart integer :: ierr integer :: step + integer :: written_step real(rk) :: time + real(rk) :: written_time call sph_initialize(ierr) call assert_ok(ierr, 'initialize failed') - call sph_read_inp('tests/data/minimal_particles_011.inp', ierr) + call sph_read_inp('tests/data/water_minimal_020.inp', ierr) call assert_ok(ierr, 'read input failed') call sph_build_model(ierr) call assert_ok(ierr, 'build model failed') call sph_run_explicit(ierr) call assert_ok(ierr, 'run explicit failed') + call sph_get_current_time(written_time, written_step, ierr) + call assert_ok(ierr, 'time before restart failed') call sph_write_restart('build-codex-unix/restart_test.tmp', ierr) call assert_ok(ierr, 'write restart failed') call sph_read_restart('build-codex-unix/restart_test.tmp', ierr) call assert_ok(ierr, 'read restart failed') call sph_get_current_time(time, step, ierr) call assert_ok(ierr, 'time after restart failed') - if (step /= 1) call fail('restart did not restore step') + if (step /= written_step) call fail('restart did not restore step') + if (abs(time - written_time) > 1.0e-12_rk) call fail('restart did not restore time') call sph_advance_explicit(1.0e-6_rk, ierr) call assert_ok(ierr, 'advance after restart failed') call sph_finalize(ierr) diff --git a/tests/module/test_solver_water.f90 b/tests/module/test_solver_water.f90 index 7d36740..1cf230d 100644 --- a/tests/module/test_solver_water.f90 +++ b/tests/module/test_solver_water.f90 @@ -3,7 +3,8 @@ program test_solver_water use sph_error, only: SPH_SUCCESS use sph_api, only: sph_initialize, sph_finalize, sph_read_inp, sph_build_model, & sph_advance_explicit, sph_run_explicit, sph_get_current_time, & - sph_estimate_stable_dt + sph_estimate_stable_dt, sph_rebuild_neighbors, sph_get_neighbor_stats, & + sph_get_water_summary, sph_get_water_dt_limits use sph_database, only: rho, v, h, a use sph_control, only: dt_default, safety_factor implicit none @@ -17,6 +18,7 @@ program test_solver_water call check_dt_limits() call check_no_water_dt_strategy() call check_bad_h_dt_error() + call check_fortran_api_paths() contains @@ -120,6 +122,44 @@ contains call assert_ok(ierr, 'finalize bad h failed') end subroutine check_bad_h_dt_error + subroutine check_fortran_api_paths() + integer :: max_neighbors + real(rk) :: average_neighbors + real(rk) :: total_mass + real(rk) :: momentum(3) + real(rk) :: max_pressure + real(rk) :: min_density + real(rk) :: max_density + real(rk) :: dt_cfl + real(rk) :: dt_accel + real(rk) :: dt_viscous + + call sph_rebuild_neighbors(ierr) + if (ierr == SPH_SUCCESS) call fail('uninitialized rebuild did not fail') + call sph_initialize(ierr) + call assert_ok(ierr, 'initialize API paths failed') + call sph_get_neighbor_stats(max_neighbors, average_neighbors, ierr) + if (ierr == SPH_SUCCESS) call fail('unbuilt neighbor stats did not fail') + call sph_read_inp('tests/data/water_minimal_020.inp', ierr) + call assert_ok(ierr, 'read API paths failed') + call sph_build_model(ierr) + call assert_ok(ierr, 'build API paths failed') + call sph_rebuild_neighbors(ierr) + call assert_ok(ierr, 'rebuild API failed') + call sph_get_neighbor_stats(max_neighbors, average_neighbors, ierr) + call assert_ok(ierr, 'neighbor stats API failed') + if (max_neighbors <= 0 .or. average_neighbors <= 0.0_rk) call fail('neighbor stats mismatch') + call sph_get_water_summary(total_mass, momentum, max_pressure, & + min_density, max_density, ierr) + call assert_ok(ierr, 'water summary API failed') + if (total_mass <= 0.0_rk) call fail('water summary mass mismatch') + call sph_get_water_dt_limits(dt_cfl, dt_accel, dt_viscous, ierr) + call assert_ok(ierr, 'water dt limits API failed') + if (dt_cfl <= 0.0_rk .or. dt_viscous <= 0.0_rk) call fail('water dt limits mismatch') + call sph_finalize(ierr) + call assert_ok(ierr, 'finalize API paths failed') + end subroutine check_fortran_api_paths + subroutine assert_ok(ierr_value, message) integer, intent(in) :: ierr_value character(len=*), intent(in) :: message diff --git a/todo.md b/todo.md index c2b60b5..5562de2 100644 --- a/todo.md +++ b/todo.md @@ -299,32 +299,32 @@ - [x] restart 写入邻域搜索控制参数。 - [x] restart 写入 Water 诊断状态。 - [x] restart 读入后重建邻域。 -- [ ] restart 读入后继续执行 Water 显式步。 -- [ ] 增加 0.2.0 output 测试。 -- [ ] 增加 0.2.0 restart 测试。 +- [x] restart 读入后继续执行 Water 显式步。 +- [x] 增加 0.2.0 output 测试。 +- [x] 增加 0.2.0 restart 测试。 ## 阶段 M:Fortran API -- [ ] 实现 `sph_rebuild_neighbors`。 -- [ ] 实现 `sph_get_neighbor_stats`。 -- [ ] 实现 `sph_get_water_summary`。 -- [ ] 实现 `sph_get_water_dt_limits`。 -- [ ] 确认生命周期 API 兼容 0.1.1。 -- [ ] 确认 `.inp` 读取 API 兼容 0.1.1。 -- [ ] 确认 build model API 兼容 0.1.1。 -- [ ] 确认 stable dt API 兼容 0.1.1。 -- [ ] 确认 advance/run explicit API 兼容 0.1.1。 -- [ ] 确认 current time API 兼容 0.1.1。 -- [ ] 确认 particle count/state API 兼容 0.1.1。 -- [ ] 确认 output/restart API 兼容 0.1.1。 -- [ ] 确认 error query API 兼容 0.1.1。 -- [ ] 为新增 Fortran API 增加未初始化错误路径。 -- [ ] 为新增 Fortran API 增加空模型错误路径。 -- [ ] 为新增 Fortran API 增加正常路径测试。 +- [x] 实现 `sph_rebuild_neighbors`。 +- [x] 实现 `sph_get_neighbor_stats`。 +- [x] 实现 `sph_get_water_summary`。 +- [x] 实现 `sph_get_water_dt_limits`。 +- [x] 确认生命周期 API 兼容 0.1.1。 +- [x] 确认 `.inp` 读取 API 兼容 0.1.1。 +- [x] 确认 build model API 兼容 0.1.1。 +- [x] 确认 stable dt API 兼容 0.1.1。 +- [x] 确认 advance/run explicit API 兼容 0.1.1。 +- [x] 确认 current time API 兼容 0.1.1。 +- [x] 确认 particle count/state API 兼容 0.1.1。 +- [x] 确认 output/restart API 兼容 0.1.1。 +- [x] 确认 error query API 兼容 0.1.1。 +- [x] 为新增 Fortran API 增加未初始化错误路径。 +- [x] 为新增 Fortran API 增加空模型错误路径。 +- [x] 为新增 Fortran API 增加正常路径测试。 ## 阶段 N:C ABI、C++ 和 Python -- [ ] 在 C 头文件中声明 `sphlite_get_water_summary`。 +- [x] 在 C 头文件中声明 `sphlite_get_water_summary`。 - [ ] 在 C 头文件中声明 `sphlite_get_water_dt_limits`。 - [ ] 在 C wrapper 中桥接 `sphlite_get_water_summary`。 - [ ] 在 C wrapper 中桥接 `sphlite_get_water_dt_limits`。