diff --git a/CMakeLists.txt b/CMakeLists.txt index 7fbab32..515a143 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -271,6 +271,12 @@ set_target_properties(test_solid_energy_diagnostics PROPERTIES Fortran_MODULE_DI add_test(NAME solid_energy_diagnostics COMMAND test_solid_energy_diagnostics) set_tests_properties(solid_energy_diagnostics PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") +add_executable(test_solid_dt_acceleration tests/module/test_solid_dt_acceleration.f90) +target_link_libraries(test_solid_dt_acceleration PRIVATE sphlite_core) +set_target_properties(test_solid_dt_acceleration PROPERTIES Fortran_MODULE_DIRECTORY "${SPHLITE_MODULE_DIR}") +add_test(NAME solid_dt_acceleration COMMAND test_solid_dt_acceleration) +set_tests_properties(solid_dt_acceleration PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") + add_executable(test_solid_stable_dt tests/module/test_solid_stable_dt.f90) target_link_libraries(test_solid_stable_dt PRIVATE sphlite_core) set_target_properties(test_solid_stable_dt PROPERTIES Fortran_MODULE_DIRECTORY "${SPHLITE_MODULE_DIR}") diff --git a/src/solid/sph_solid_dynamics.f90 b/src/solid/sph_solid_dynamics.f90 index bb2511f..9a59ba9 100644 --- a/src/solid/sph_solid_dynamics.f90 +++ b/src/solid/sph_solid_dynamics.f90 @@ -577,6 +577,8 @@ contains call sph_solid_store_dt(0.0_rk, 0.0_rk, 0.0_rk) return end if + call sph_solid_compute_acceleration(ierr) + if (ierr /= SPH_SUCCESS) return do i = 1, npart if (.not. sph_solid_is_active(i)) cycle solid_index = sph_solid_table_index(material_id(i)) diff --git a/tests/module/test_solid_dt_acceleration.f90 b/tests/module/test_solid_dt_acceleration.f90 new file mode 100644 index 0000000..b208c75 --- /dev/null +++ b/tests/module/test_solid_dt_acceleration.f90 @@ -0,0 +1,141 @@ +program test_solid_dt_acceleration + use sph_precision, only: rk + use sph_error, only: SPH_SUCCESS + use sph_api, only: sph_initialize, sph_finalize, sph_read_inp, sph_build_model, & + sph_estimate_stable_dt, sph_write_restart, sph_read_restart + use sph_control, only: dt_default, safety_factor + use sph_database, only: solid_dt_accel, solid_dtcrit + use sph_solid_state, only: solid_body_force, solid_stress + implicit none + + integer :: ierr + + call check_body_force_contracts_acceleration_dt() + call check_internal_force_contracts_acceleration_dt() + call check_no_solid_keeps_solid_dt_empty() + call check_restart_keeps_solid_dt_diagnostics() + +contains + + subroutine check_body_force_contracts_acceleration_dt() + real(rk) :: dtcrit + real(rk) :: baseline + real(rk) :: tightened + + call sph_initialize(ierr) + call assert_ok(ierr, 'initialize failed for body-force Solid dt') + call sph_read_inp('tests/data/solid_body_force_050.inp', ierr) + call assert_ok(ierr, 'read failed for body-force Solid dt') + call sph_build_model(ierr) + call assert_ok(ierr, 'build failed for body-force Solid dt') + dt_default = 1.0_rk + safety_factor = 1.0_rk + call sph_estimate_stable_dt(dtcrit, ierr) + call assert_ok(ierr, 'baseline body-force Solid dt failed') + baseline = solid_dt_accel + solid_body_force = (/ 0.0_rk, 0.0_rk, -98100.0_rk /) + call sph_estimate_stable_dt(dtcrit, ierr) + call assert_ok(ierr, 'tight body-force Solid dt failed') + tightened = solid_dt_accel + if (baseline <= 0.0_rk .or. tightened <= 0.0_rk) then + call fail('body-force Solid acceleration dt missing') + end if + if (tightened >= baseline) call fail('body-force Solid acceleration dt did not contract') + call sph_finalize(ierr) + call assert_ok(ierr, 'finalize failed for body-force Solid dt') + end subroutine check_body_force_contracts_acceleration_dt + + subroutine check_internal_force_contracts_acceleration_dt() + real(rk) :: dtcrit + real(rk) :: baseline + real(rk) :: tightened + + call sph_initialize(ierr) + call assert_ok(ierr, 'initialize failed for internal-force Solid dt') + call sph_read_inp('tests/data/solid_force_pair_051.inp', ierr) + call assert_ok(ierr, 'read failed for internal-force Solid dt') + call sph_build_model(ierr) + call assert_ok(ierr, 'build failed for internal-force Solid dt') + dt_default = 1.0_rk + safety_factor = 1.0_rk + solid_stress = 0.0_rk + solid_stress(1,:) = 1.0e4_rk + call sph_estimate_stable_dt(dtcrit, ierr) + call assert_ok(ierr, 'baseline internal-force Solid dt failed') + baseline = solid_dt_accel + solid_stress(1,:) = 1.0e8_rk + call sph_estimate_stable_dt(dtcrit, ierr) + call assert_ok(ierr, 'tight internal-force Solid dt failed') + tightened = solid_dt_accel + if (baseline <= 0.0_rk .or. tightened <= 0.0_rk) then + call fail('internal-force Solid acceleration dt missing') + end if + if (tightened >= baseline) call fail('internal-force Solid acceleration dt did not contract') + call sph_finalize(ierr) + call assert_ok(ierr, 'finalize failed for internal-force Solid dt') + end subroutine check_internal_force_contracts_acceleration_dt + + subroutine check_no_solid_keeps_solid_dt_empty() + real(rk) :: dtcrit + + call sph_initialize(ierr) + call assert_ok(ierr, 'initialize failed for Water dt isolation') + call sph_read_inp('tests/data/water_minimal_021.inp', ierr) + call assert_ok(ierr, 'read failed for Water dt isolation') + call sph_build_model(ierr) + call assert_ok(ierr, 'build failed for Water dt isolation') + call sph_estimate_stable_dt(dtcrit, ierr) + call assert_ok(ierr, 'Water dt isolation estimate failed') + if (solid_dtcrit /= 0.0_rk) call fail('Water-only input produced Solid dt') + call sph_finalize(ierr) + call assert_ok(ierr, 'finalize failed for Water dt isolation') + end subroutine check_no_solid_keeps_solid_dt_empty + + subroutine check_restart_keeps_solid_dt_diagnostics() + real(rk) :: dtcrit + real(rk) :: expected_dtcrit + real(rk) :: expected_dt_accel + + call sph_initialize(ierr) + call assert_ok(ierr, 'initialize failed for restart Solid dt') + call sph_read_inp('tests/data/solid_body_force_050.inp', ierr) + call assert_ok(ierr, 'read failed for restart Solid dt') + call sph_build_model(ierr) + call assert_ok(ierr, 'build failed for restart Solid dt') + call sph_estimate_stable_dt(dtcrit, ierr) + call assert_ok(ierr, 'restart Solid dt estimate failed') + expected_dtcrit = solid_dtcrit + expected_dt_accel = solid_dt_accel + call sph_write_restart('build-codex-unix/restart_solid_dt_acc.tmp', ierr) + call assert_ok(ierr, 'restart Solid dt write failed') + call sph_finalize(ierr) + call assert_ok(ierr, 'finalize failed before restart Solid dt read') + call sph_initialize(ierr) + call assert_ok(ierr, 'reinitialize failed for restart Solid dt read') + call sph_read_restart('build-codex-unix/restart_solid_dt_acc.tmp', ierr) + call assert_ok(ierr, 'restart Solid dt read failed') + if (abs(solid_dtcrit - expected_dtcrit) > 1.0e-12_rk) then + call fail('restart Solid dtcrit mismatch') + end if + if (abs(solid_dt_accel - expected_dt_accel) > 1.0e-12_rk) then + call fail('restart Solid acceleration dt mismatch') + end if + call sph_finalize(ierr) + call assert_ok(ierr, 'finalize failed after restart Solid dt read') + end subroutine check_restart_keeps_solid_dt_diagnostics + + subroutine assert_ok(ierr_value, message) + integer, intent(in) :: ierr_value + character(len=*), intent(in) :: message + + if (ierr_value /= SPH_SUCCESS) call fail(message) + end subroutine assert_ok + + subroutine fail(message) + character(len=*), intent(in) :: message + + write(*, '(A)') trim(message) + stop 1 + end subroutine fail + +end program test_solid_dt_acceleration diff --git a/tests/module/test_solid_explicit_smoke.f90 b/tests/module/test_solid_explicit_smoke.f90 index a08f694..47c5c05 100644 --- a/tests/module/test_solid_explicit_smoke.f90 +++ b/tests/module/test_solid_explicit_smoke.f90 @@ -2,10 +2,12 @@ program test_solid_explicit_smoke use sph_precision, only: rk use sph_error, only: SPH_SUCCESS use sph_api, only: sph_initialize, sph_finalize, sph_read_inp, sph_build_model, & - sph_advance_explicit, sph_get_current_time + sph_advance_explicit, sph_run_explicit, sph_get_current_time use sph_database, only: x, v, a, solid_particle_count, solid_mass, & solid_momentum, solid_kinetic_energy, solid_internal_energy_total, & - solid_max_von_mises, solid_min_damage, solid_max_damage, water_mass, gas_mass + solid_max_von_mises, solid_min_damage, solid_max_damage, & + solid_max_strain_rate, solid_max_acceleration, & + solid_internal_force_residual, water_mass, gas_mass implicit none integer :: ierr @@ -13,6 +15,7 @@ program test_solid_explicit_smoke real(rk) :: time call check_solid_explicit_body_force() + call check_solid_051_multi_step() contains @@ -41,6 +44,9 @@ contains if (solid_kinetic_energy <= 0.0_rk) call fail('Solid kinetic energy missing') if (solid_internal_energy_total < 0.0_rk) call fail('Solid internal energy invalid') if (solid_max_von_mises < 0.0_rk) call fail('Solid von Mises diagnostic invalid') + if (solid_max_strain_rate < 0.0_rk) call fail('Solid strain-rate diagnostic invalid') + if (solid_max_acceleration <= 0.0_rk) call fail('Solid acceleration diagnostic missing') + if (solid_internal_force_residual < 0.0_rk) call fail('Solid residual diagnostic invalid') if (solid_min_damage < 0.0_rk .or. solid_max_damage > 1.0_rk) then call fail('Solid damage diagnostics out of range') end if @@ -49,6 +55,25 @@ contains call assert_ok(ierr, 'finalize failed for Solid explicit smoke') end subroutine check_solid_explicit_body_force + subroutine check_solid_051_multi_step() + call sph_initialize(ierr) + call assert_ok(ierr, 'initialize failed for Solid 0.5.1 explicit smoke') + call sph_read_inp('tests/data/solid_explicit_smoke_051.inp', ierr) + call assert_ok(ierr, 'read failed for Solid 0.5.1 explicit smoke') + call sph_build_model(ierr) + call assert_ok(ierr, 'build failed for Solid 0.5.1 explicit smoke') + call sph_run_explicit(ierr) + call assert_ok(ierr, 'Solid 0.5.1 explicit run failed') + call sph_get_current_time(time, step, ierr) + call assert_ok(ierr, 'Solid 0.5.1 current time failed') + if (step /= 2) call fail('Solid 0.5.1 explicit step mismatch') + if (solid_particle_count /= 4) call fail('Solid 0.5.1 particle count mismatch') + if (solid_max_acceleration <= 0.0_rk) call fail('Solid 0.5.1 acceleration missing') + if (solid_internal_force_residual < 0.0_rk) call fail('Solid 0.5.1 residual invalid') + call sph_finalize(ierr) + call assert_ok(ierr, 'finalize failed for Solid 0.5.1 explicit smoke') + end subroutine check_solid_051_multi_step + 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 d076d3f..dc438f0 100644 --- a/todo.md +++ b/todo.md @@ -157,26 +157,26 @@ ## 阶段 F:Solid 稳定时间步、显式推进和 0.5.0 回归隔离 -- [ ] 复核 0.5.0 Solid 结构波速 dt 估计。 -- [ ] 新增或补齐 Solid 加速度 dt 约束诊断。 -- [ ] 实现 `dt_solid_acc` 的有限正值保护。 -- [ ] 将 Solid wave dt 和 acceleration dt 合并为 Solid dt。 -- [ ] 将 Solid dt 继续纳入全局 dt 估计。 -- [ ] 确认无 active Solid 粒子时全局 dt 与 0.5.0 路径一致。 -- [ ] 确认 active Solid 粒子存在时 Solid dt 有限且为正。 -- [ ] 确认体力增大时加速度 dt 约束可收紧。 -- [ ] 确认内力增大时加速度 dt 约束可收紧。 -- [ ] 确认 restart 后 Solid dt 诊断一致。 -- [ ] 将 Solid 速度梯度、本构、内力和诊断挂接到 Velocity-Verlet 步。 -- [ ] 确认 Solid-only 小模型可连续推进多步。 -- [ ] 确认 Water-only smoke 仍通过。 -- [ ] 确认 Gas-only smoke 仍通过。 -- [ ] 确认 Explosive-Gas-Water smoke 仍通过。 -- [ ] 新增 `solid_dt_acceleration` 测试。 -- [ ] 更新 `solid_explicit_smoke` 覆盖 0.5.1 诊断。 -- [ ] 将 `solid_dt_acceleration` 接入 CTest。 -- [ ] 确认 0.5.0 `solid_stable_dt` 仍通过。 -- [ ] 确认 0.5.0 `solid_explicit_smoke` 仍通过。 +- [x] 复核 0.5.0 Solid 结构波速 dt 估计。 +- [x] 新增或补齐 Solid 加速度 dt 约束诊断。 +- [x] 实现 `dt_solid_acc` 的有限正值保护。 +- [x] 将 Solid wave dt 和 acceleration dt 合并为 Solid dt。 +- [x] 将 Solid dt 继续纳入全局 dt 估计。 +- [x] 确认无 active Solid 粒子时全局 dt 与 0.5.0 路径一致。 +- [x] 确认 active Solid 粒子存在时 Solid dt 有限且为正。 +- [x] 确认体力增大时加速度 dt 约束可收紧。 +- [x] 确认内力增大时加速度 dt 约束可收紧。 +- [x] 确认 restart 后 Solid dt 诊断一致。 +- [x] 将 Solid 速度梯度、本构、内力和诊断挂接到 Velocity-Verlet 步。 +- [x] 确认 Solid-only 小模型可连续推进多步。 +- [x] 确认 Water-only smoke 仍通过。 +- [x] 确认 Gas-only smoke 仍通过。 +- [x] 确认 Explosive-Gas-Water smoke 仍通过。 +- [x] 新增 `solid_dt_acceleration` 测试。 +- [x] 更新 `solid_explicit_smoke` 覆盖 0.5.1 诊断。 +- [x] 将 `solid_dt_acceleration` 接入 CTest。 +- [x] 确认 0.5.0 `solid_stable_dt` 仍通过。 +- [x] 确认 0.5.0 `solid_explicit_smoke` 仍通过。 ## 阶段 G:CSV 输出、`STATE_0_5_1` restart 与兼容读入