diff --git a/src/solver/sph_solver_explicit.f90 b/src/solver/sph_solver_explicit.f90 index 15f1bd2..9fca4d4 100644 --- a/src/solver/sph_solver_explicit.f90 +++ b/src/solver/sph_solver_explicit.f90 @@ -92,6 +92,12 @@ contains real(rk) :: dt_accel real(rk) :: dt_viscous + if (safety_factor <= 0.0_rk) then + call sph_error_set(SPH_ERROR_ARGUMENT, 'time step safety factor must be positive') + ierr = SPH_ERROR_ARGUMENT + dtcrit = 0.0_rk + return + end if call sph_water_estimate_dt_limits(dt_cfl, dt_accel, dt_viscous, ierr) if (ierr /= SPH_SUCCESS) return dtcrit = min(dt_cfl, min(dt_accel, dt_viscous)) * safety_factor diff --git a/tests/module/test_solver_water.f90 b/tests/module/test_solver_water.f90 index 1cf230d..e05d9d7 100644 --- a/tests/module/test_solver_water.f90 +++ b/tests/module/test_solver_water.f90 @@ -5,31 +5,62 @@ program test_solver_water sph_advance_explicit, sph_run_explicit, sph_get_current_time, & 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 + use sph_database, only: rho, v, h, a, water_dt_cfl, water_dt_accel, & + water_dt_viscous + use sph_control, only: dt_default, end_time, max_steps, safety_factor, & + sph_control_validate_time implicit none integer :: ierr integer :: step real(rk) :: time - call check_unbuilt_error() + call check_uninitialized_errors() + call check_unbuilt_errors() + call check_bad_dt_values() call check_single_step() + call check_multi_step() call check_run_explicit() call check_dt_limits() + call check_safety_factor_paths() + call check_last_small_step() call check_no_water_dt_strategy() call check_bad_h_dt_error() call check_fortran_api_paths() contains - subroutine check_unbuilt_error() + subroutine check_uninitialized_errors() + call sph_advance_explicit(1.0e-6_rk, ierr) + if (ierr == SPH_SUCCESS) call fail('uninitialized explicit step did not fail') + call sph_run_explicit(ierr) + if (ierr == SPH_SUCCESS) call fail('uninitialized explicit run did not fail') + end subroutine check_uninitialized_errors + + subroutine check_unbuilt_errors() call sph_initialize(ierr) call assert_ok(ierr, 'initialize unbuilt failed') call sph_advance_explicit(1.0e-6_rk, ierr) if (ierr == SPH_SUCCESS) call fail('unbuilt explicit step did not fail') + call sph_run_explicit(ierr) + if (ierr == SPH_SUCCESS) call fail('unbuilt explicit run did not fail') call sph_finalize(ierr) call assert_ok(ierr, 'finalize unbuilt failed') - end subroutine check_unbuilt_error + end subroutine check_unbuilt_errors + + subroutine check_bad_dt_values() + call sph_initialize(ierr) + call assert_ok(ierr, 'initialize bad dt failed') + call sph_read_inp('tests/data/water_minimal_020.inp', ierr) + call assert_ok(ierr, 'read bad dt failed') + call sph_build_model(ierr) + call assert_ok(ierr, 'build bad dt failed') + call sph_advance_explicit(-1.0e-6_rk, ierr) + if (ierr == SPH_SUCCESS) call fail('negative dt did not fail') + call sph_advance_explicit(0.0_rk, ierr) + if (ierr == SPH_SUCCESS) call fail('zero dt did not fail') + call sph_finalize(ierr) + call assert_ok(ierr, 'finalize bad dt failed') + end subroutine check_bad_dt_values subroutine check_single_step() real(rk) :: rho_before @@ -64,13 +95,39 @@ contains call assert_ok(ierr, 'run explicit failed') call sph_get_current_time(time, step, ierr) call assert_ok(ierr, 'time run failed') - if (step <= 0) call fail('run did not advance') + if (step /= 2) call fail('run step count mismatch') + if (abs(time - 2.0e-6_rk) > 1.0e-12_rk) call fail('run time mismatch') call sph_finalize(ierr) call assert_ok(ierr, 'finalize run failed') end subroutine check_run_explicit + subroutine check_multi_step() + call sph_initialize(ierr) + call assert_ok(ierr, 'initialize multi-step failed') + call sph_read_inp('tests/data/water_minimal_020.inp', ierr) + call assert_ok(ierr, 'read multi-step failed') + call sph_build_model(ierr) + call assert_ok(ierr, 'build multi-step failed') + call sph_advance_explicit(1.0e-6_rk, ierr) + call assert_ok(ierr, 'first multi-step advance failed') + call sph_advance_explicit(1.0e-6_rk, ierr) + call assert_ok(ierr, 'second multi-step advance failed') + call sph_get_current_time(time, step, ierr) + call assert_ok(ierr, 'time multi-step failed') + if (step /= 2) call fail('multi-step count mismatch') + if (abs(time - 2.0e-6_rk) > 1.0e-12_rk) call fail('multi-step time mismatch') + call sph_finalize(ierr) + call assert_ok(ierr, 'finalize multi-step failed') + end subroutine check_multi_step + subroutine check_dt_limits() real(rk) :: dtcrit + real(rk) :: dt_cfl + real(rk) :: dt_accel + real(rk) :: dt_viscous + real(rk) :: dt_cfl_fast + real(rk) :: dt_accel_high + real(rk) :: expected call sph_initialize(ierr) call assert_ok(ierr, 'initialize dt failed') @@ -78,17 +135,74 @@ contains call assert_ok(ierr, 'read dt failed') call sph_build_model(ierr) call assert_ok(ierr, 'build dt failed') + call sph_get_water_dt_limits(dt_cfl, dt_accel, dt_viscous, ierr) + call assert_ok(ierr, 'water dt diagnostics failed') + if (dt_cfl <= 0.0_rk) call fail('CFL dt diagnostic is not positive') + if (dt_accel <= 0.0_rk) call fail('acceleration dt diagnostic is not positive') + if (dt_viscous <= 0.0_rk) call fail('viscous dt diagnostic is not positive') + if (abs(water_dt_cfl - dt_cfl) > 1.0e-12_rk) call fail('CFL dt cache mismatch') + if (abs(water_dt_accel - dt_accel) > 1.0e-12_rk) call fail('accel dt cache mismatch') + if (abs(water_dt_viscous - dt_viscous) > 1.0e-12_rk) call fail('viscous dt cache mismatch') + v(:,1) = (/1000.0_rk, 0.0_rk, 0.0_rk/) + call sph_get_water_dt_limits(dt_cfl_fast, dt_accel, dt_viscous, ierr) + call assert_ok(ierr, 'fast CFL dt diagnostics failed') + if (dt_cfl_fast >= dt_cfl) call fail('CFL dt did not respond to velocity') + a(:,1) = (/1.0e12_rk, 0.0_rk, 0.0_rk/) + call sph_get_water_dt_limits(dt_cfl_fast, dt_accel_high, dt_viscous, ierr) + call assert_ok(ierr, 'high acceleration dt diagnostics failed') + if (dt_accel_high >= dt_accel) call fail('acceleration dt did not respond to acceleration') dt_default = 1.0_rk safety_factor = 0.5_rk - a(:,1) = (/100.0_rk, 0.0_rk, 0.0_rk/) call sph_estimate_stable_dt(dtcrit, ierr) call assert_ok(ierr, 'estimate dt failed') + expected = min(dt_cfl_fast, min(dt_accel_high, dt_viscous)) * safety_factor if (dtcrit <= 0.0_rk) call fail('dtcrit is not positive') if (dtcrit >= 1.0_rk) call fail('dtcrit did not use water limits') + if (abs(dtcrit - expected) > 1.0e-12_rk) call fail('dtcrit safety factor mismatch') call sph_finalize(ierr) call assert_ok(ierr, 'finalize dt failed') end subroutine check_dt_limits + subroutine check_safety_factor_paths() + real(rk) :: dtcrit + + call sph_control_validate_time(1.0e-6_rk, 1.0e-6_rk, 1, 0.0_rk, ierr) + if (ierr == SPH_SUCCESS) call fail('invalid safety validation did not fail') + call sph_initialize(ierr) + call assert_ok(ierr, 'initialize safety failed') + call sph_read_inp('tests/data/water_minimal_020.inp', ierr) + call assert_ok(ierr, 'read safety failed') + call sph_build_model(ierr) + call assert_ok(ierr, 'build safety failed') + safety_factor = 0.0_rk + call sph_estimate_stable_dt(dtcrit, ierr) + if (ierr == SPH_SUCCESS) call fail('zero safety dt estimate did not fail') + if (dtcrit /= 0.0_rk) call fail('zero safety dtcrit should be zero') + call sph_finalize(ierr) + call assert_ok(ierr, 'finalize safety failed') + end subroutine check_safety_factor_paths + + subroutine check_last_small_step() + call sph_initialize(ierr) + call assert_ok(ierr, 'initialize small step failed') + call sph_read_inp('tests/data/water_minimal_020.inp', ierr) + call assert_ok(ierr, 'read small step failed') + call sph_build_model(ierr) + call assert_ok(ierr, 'build small step failed') + dt_default = 1.0e-6_rk + end_time = 1.5e-6_rk + max_steps = 5 + safety_factor = 1.0_rk + call sph_run_explicit(ierr) + call assert_ok(ierr, 'run small step failed') + call sph_get_current_time(time, step, ierr) + call assert_ok(ierr, 'time small step failed') + if (step /= 2) call fail('small final step count mismatch') + if (abs(time - 1.5e-6_rk) > 1.0e-12_rk) call fail('small final step exceeded end time') + call sph_finalize(ierr) + call assert_ok(ierr, 'finalize small step failed') + end subroutine check_last_small_step + subroutine check_no_water_dt_strategy() real(rk) :: dtcrit diff --git a/tests/module/test_water_force.f90 b/tests/module/test_water_force.f90 index 48cce9e..a4c51f5 100644 --- a/tests/module/test_water_force.f90 +++ b/tests/module/test_water_force.f90 @@ -3,7 +3,8 @@ program test_water_force use sph_error, only: SPH_SUCCESS use sph_database, only: sph_db_allocate, sph_db_free, x, v, h, mass, rho, pressure, & acc_pressure, acc_viscosity, acc_body, a, particle_phase, particle_status, & - SPH_PHASE_WATER, SPH_STATUS_ACTIVE + SPH_PHASE_WATER, SPH_PHASE_SOLID, SPH_STATUS_ACTIVE, SPH_STATUS_INACTIVE, & + SPH_STATUS_FAILED use sph_neighbor, only: sph_neighbor_rebuild use sph_water, only: sph_water_initialize, sph_water_reset, sph_water_set_body_force, & sph_water_compute_pressure_acceleration, sph_water_compute_acceleration @@ -15,6 +16,9 @@ program test_water_force call check_pressure_pair() call check_uniform_pressure() call check_uniform_positive_pressure() + call check_nonwater_pressure_skip() + call check_inactive_pressure_skip() + call check_failed_pressure_skip() call check_acceleration_resets() call check_external_particle_force_placeholder() call check_body_force() @@ -73,6 +77,39 @@ contains call sph_db_free() end subroutine check_uniform_positive_pressure + subroutine check_nonwater_pressure_skip() + call setup_pair() + particle_phase(2) = SPH_PHASE_SOLID + pressure = 1000.0_rk + acc_pressure = 4.0_rk + call sph_water_compute_pressure_acceleration(ierr) + call assert_ok(ierr, 'non-water pressure skip failed') + if (maxval(abs(acc_pressure)) > 1.0e-12_rk) call fail('non-water pressure contribution remained') + call sph_db_free() + end subroutine check_nonwater_pressure_skip + + subroutine check_inactive_pressure_skip() + call setup_pair() + particle_status(2) = SPH_STATUS_INACTIVE + pressure = 1000.0_rk + acc_pressure = 4.0_rk + call sph_water_compute_pressure_acceleration(ierr) + call assert_ok(ierr, 'inactive pressure skip failed') + if (maxval(abs(acc_pressure)) > 1.0e-12_rk) call fail('inactive pressure contribution remained') + call sph_db_free() + end subroutine check_inactive_pressure_skip + + subroutine check_failed_pressure_skip() + call setup_pair() + particle_status(2) = SPH_STATUS_FAILED + pressure = 1000.0_rk + acc_pressure = 4.0_rk + call sph_water_compute_pressure_acceleration(ierr) + call assert_ok(ierr, 'failed pressure skip failed') + if (maxval(abs(acc_pressure)) > 1.0e-12_rk) call fail('failed pressure contribution remained') + call sph_db_free() + end subroutine check_failed_pressure_skip + subroutine check_acceleration_resets() call setup_pair() pressure = 0.0_rk diff --git a/todo.md b/todo.md index 6a4244b..236a37a 100644 --- a/todo.md +++ b/todo.md @@ -213,29 +213,29 @@ - [x] 加固 body force 对速度方向的影响。 - [x] 加固 body force 对加速度缓存的影响。 - [x] 加固外部粒子力进入显式步外载占位。 -- [ ] 加固非 Water 粒子跳过压力力。 -- [ ] 加固 inactive 粒子跳过压力力。 -- [ ] 加固 failed 粒子跳过压力力。 -- [ ] 确认总加速度合成顺序清晰。 +- [x] 加固非 Water 粒子跳过压力力。 +- [x] 加固 inactive 粒子跳过压力力。 +- [x] 加固 failed 粒子跳过压力力。 +- [x] 确认总加速度合成顺序清晰。 ## 阶段 K:Solver 和时间步加固 -- [ ] 加固未 initialize 时 `sph_advance_explicit` 错误路径。 -- [ ] 加固未 build model 时 `sph_advance_explicit` 错误路径。 -- [ ] 加固未 build model 时 `sph_run_explicit` 错误路径。 -- [ ] 加固负 `dt` 错误路径。 -- [ ] 加固零 `dt` 错误路径。 -- [ ] 加固非法 Water 状态下 stable dt 错误路径。 -- [ ] 加固 CFL 时间步约束诊断。 -- [ ] 加固加速度时间步约束诊断。 -- [ ] 加固黏性时间步约束诊断。 -- [ ] 加固 safety factor 正值生效路径。 -- [ ] 加固非法 safety factor 处理。 -- [ ] 加固 `TIME` 与 `STEPS` 双约束运行。 -- [ ] 加固最后小步不超过 `end_time`。 -- [ ] 加固单步 Water 推进。 -- [ ] 加固多步 Water 推进。 -- [ ] 加固 `sph_run_explicit` Water 闭环。 +- [x] 加固未 initialize 时 `sph_advance_explicit` 错误路径。 +- [x] 加固未 build model 时 `sph_advance_explicit` 错误路径。 +- [x] 加固未 build model 时 `sph_run_explicit` 错误路径。 +- [x] 加固负 `dt` 错误路径。 +- [x] 加固零 `dt` 错误路径。 +- [x] 加固非法 Water 状态下 stable dt 错误路径。 +- [x] 加固 CFL 时间步约束诊断。 +- [x] 加固加速度时间步约束诊断。 +- [x] 加固黏性时间步约束诊断。 +- [x] 加固 safety factor 正值生效路径。 +- [x] 加固非法 safety factor 处理。 +- [x] 加固 `TIME` 与 `STEPS` 双约束运行。 +- [x] 加固最后小步不超过 `end_time`。 +- [x] 加固单步 Water 推进。 +- [x] 加固多步 Water 推进。 +- [x] 加固 `sph_run_explicit` Water 闭环。 - [ ] 加固自动输出间隔触发。 - [ ] 加固未启用输出时不自动写文件。 - [ ] 加固 restart 后继续显式步。