diff --git a/tests/unit/test_kernel.f90 b/tests/unit/test_kernel.f90 index 80eca38..00849f3 100644 --- a/tests/unit/test_kernel.f90 +++ b/tests/unit/test_kernel.f90 @@ -21,22 +21,43 @@ program test_kernel call sph_kernel_value(SPH_KERNEL_WENDLAND_C2, 0.0_rk, 1.0_rk, value, ierr) call assert_ok(ierr, 'Wendland C2 r=0 failed') if (value <= 0.0_rk) call fail('Wendland C2 r=0 is not positive') + if (.not. is_finite_scalar(value)) call fail('Wendland C2 r=0 is not finite') call sph_kernel_value(SPH_KERNEL_WENDLAND_C4, 0.0_rk, 1.0_rk, value, ierr) call assert_ok(ierr, 'Wendland C4 r=0 failed') if (value <= 0.0_rk) call fail('Wendland C4 r=0 is not positive') + if (.not. is_finite_scalar(value)) call fail('Wendland C4 r=0 is not finite') call sph_kernel_value(SPH_KERNEL_CUBIC_SPLINE, 0.0_rk, 1.0_rk, value, ierr) call assert_ok(ierr, 'cubic spline r=0 failed') if (value <= 0.0_rk) call fail('cubic spline r=0 is not positive') + if (.not. is_finite_scalar(value)) call fail('cubic spline r=0 is not finite') + + call sph_kernel_gradient(SPH_KERNEL_WENDLAND_C2, (/0.0_rk, 0.0_rk, 0.0_rk/), & + 1.0_rk, grad_a, ierr) + call assert_ok(ierr, 'zero-distance gradient failed') + if (maxval(abs(grad_a)) > 1.0e-12_rk) call fail('zero-distance gradient is not zero') call sph_kernel_value(SPH_KERNEL_WENDLAND_C2, 2.1_rk, 1.0_rk, value, ierr) call assert_ok(ierr, 'outside support failed') if (value /= 0.0_rk) call fail('kernel outside support is not zero') + call sph_kernel_gradient(SPH_KERNEL_WENDLAND_C2, (/2.1_rk, 0.0_rk, 0.0_rk/), & + 1.0_rk, grad_a, ierr) + call assert_ok(ierr, 'outside gradient failed') + if (maxval(abs(grad_a)) > 1.0e-12_rk) call fail('outside gradient is not zero') + + call sph_kernel_value(SPH_KERNEL_WENDLAND_C2, 1.999999_rk, 1.0_rk, value, ierr) + call assert_ok(ierr, 'near-support value failed') + if (.not. is_finite_scalar(value)) call fail('near-support value is not finite') + call sph_kernel_gradient(SPH_KERNEL_WENDLAND_C2, (/1.999999_rk, 0.0_rk, 0.0_rk/), & + 1.0_rk, grad_a, ierr) + call assert_ok(ierr, 'near-support gradient failed') + if (.not. is_finite_vector(grad_a)) call fail('near-support gradient is not finite') rij = (/0.5_rk, 0.0_rk, 0.0_rk/) call sph_kernel_gradient(SPH_KERNEL_WENDLAND_C2, rij, 1.0_rk, grad_a, ierr) call assert_ok(ierr, 'Wendland C2 gradient failed') + if (.not. is_finite_vector(grad_a)) call fail('Wendland C2 gradient is not finite') if (grad_a(1) >= 0.0_rk) call fail('gradient direction mismatch') if (abs(grad_a(2)) > 1.0e-12_rk .or. abs(grad_a(3)) > 1.0e-12_rk) then call fail('gradient transverse component mismatch') @@ -49,11 +70,14 @@ program test_kernel call sph_kernel_gradient(SPH_KERNEL_CUBIC_SPLINE, rij, 0.5_rk, grad_a, ierr) call assert_ok(ierr, 'different h gradient failed') if (maxval(abs(grad_a)) <= 0.0_rk) call fail('different h gradient is zero') + if (.not. is_finite_vector(grad_a)) call fail('different h gradient is not finite') call sph_kernel_value(SPH_KERNEL_WENDLAND_C2, 0.5_rk, 0.0_rk, value, ierr) if (ierr == SPH_SUCCESS) call fail('zero h did not fail') call sph_kernel_value(SPH_KERNEL_WENDLAND_C4, 0.5_rk, 0.0_rk, value, ierr) if (ierr == SPH_SUCCESS) call fail('Wendland C4 zero h did not fail') + call sph_kernel_value(SPH_KERNEL_CUBIC_SPLINE, 0.5_rk, 0.0_rk, value, ierr) + if (ierr == SPH_SUCCESS) call fail('cubic zero h did not fail') call sph_kernel_value(99, 0.5_rk, 1.0_rk, value, ierr) if (ierr == SPH_SUCCESS) call fail('unknown kernel type did not fail') @@ -67,6 +91,19 @@ contains if (ierr_value /= SPH_SUCCESS) call fail(message) end subroutine assert_ok + logical function is_finite_scalar(value_in) + real(rk), intent(in) :: value_in + + is_finite_scalar = value_in == value_in .and. abs(value_in) < huge(value_in) + end function is_finite_scalar + + logical function is_finite_vector(value_in) + real(rk), intent(in) :: value_in(3) + + is_finite_vector = all(value_in == value_in) .and. & + maxval(abs(value_in)) < huge(value_in(1)) + end function is_finite_vector + subroutine fail(message) character(len=*), intent(in) :: message diff --git a/tests/unit/test_neighbor.f90 b/tests/unit/test_neighbor.f90 index 5a52e38..42d51e2 100644 --- a/tests/unit/test_neighbor.f90 +++ b/tests/unit/test_neighbor.f90 @@ -8,6 +8,11 @@ program test_neighbor call check_empty_model() call check_single_particle() + call check_two_particle_inside() + call check_two_particle_outside() + call check_support_boundary() + call check_duplicate_coordinates() + call check_near_coordinates() call check_move_rebuild() call check_negative_coordinates() call check_different_h() @@ -35,6 +40,66 @@ contains call sph_db_free() end subroutine check_single_particle + subroutine check_two_particle_inside() + call sph_db_allocate(2, ierr) + call assert_ok(ierr, 'inside allocation failed') + h = 0.25_rk + x(:,1) = (/0.0_rk, 0.0_rk, 0.0_rk/) + x(:,2) = (/0.2_rk, 0.0_rk, 0.0_rk/) + call sph_neighbor_rebuild(ierr) + call assert_ok(ierr, 'inside rebuild failed') + if (neighbor_count(1) /= 1 .or. neighbor_count(2) /= 1) call fail('inside pair mismatch') + call sph_db_free() + end subroutine check_two_particle_inside + + subroutine check_two_particle_outside() + call sph_db_allocate(2, ierr) + call assert_ok(ierr, 'outside allocation failed') + h = 0.25_rk + x(:,1) = (/0.0_rk, 0.0_rk, 0.0_rk/) + x(:,2) = (/0.6_rk, 0.0_rk, 0.0_rk/) + call sph_neighbor_rebuild(ierr) + call assert_ok(ierr, 'outside rebuild failed') + if (neighbor_count(1) /= 0 .or. neighbor_count(2) /= 0) call fail('outside pair mismatch') + call sph_db_free() + end subroutine check_two_particle_outside + + subroutine check_support_boundary() + call sph_db_allocate(2, ierr) + call assert_ok(ierr, 'boundary allocation failed') + h = 0.25_rk + x(:,1) = (/0.0_rk, 0.0_rk, 0.0_rk/) + x(:,2) = (/0.5_rk, 0.0_rk, 0.0_rk/) + call sph_neighbor_rebuild(ierr) + call assert_ok(ierr, 'boundary rebuild failed') + if (neighbor_count(1) /= 1 .or. neighbor_count(2) /= 1) call fail('boundary pair mismatch') + call sph_db_free() + end subroutine check_support_boundary + + subroutine check_duplicate_coordinates() + call sph_db_allocate(2, ierr) + call assert_ok(ierr, 'duplicate allocation failed') + h = 0.25_rk + x(:,1) = (/0.0_rk, 0.0_rk, 0.0_rk/) + x(:,2) = x(:,1) + call sph_neighbor_rebuild(ierr) + call assert_ok(ierr, 'duplicate rebuild failed') + if (neighbor_count(1) /= 1 .or. neighbor_count(2) /= 1) call fail('duplicate pair mismatch') + call sph_db_free() + end subroutine check_duplicate_coordinates + + subroutine check_near_coordinates() + call sph_db_allocate(2, ierr) + call assert_ok(ierr, 'near allocation failed') + h = 0.25_rk + x(:,1) = (/0.0_rk, 0.0_rk, 0.0_rk/) + x(:,2) = (/1.0e-12_rk, -1.0e-12_rk, 1.0e-12_rk/) + call sph_neighbor_rebuild(ierr) + call assert_ok(ierr, 'near rebuild failed') + if (neighbor_count(1) /= 1 .or. neighbor_count(2) /= 1) call fail('near pair mismatch') + call sph_db_free() + end subroutine check_near_coordinates + subroutine check_move_rebuild() call sph_db_allocate(2, ierr) call assert_ok(ierr, 'move allocation failed') diff --git a/todo.md b/todo.md index 34433b4..81fe72a 100644 --- a/todo.md +++ b/todo.md @@ -118,29 +118,29 @@ - [x] 加固 Wendland C2 的 `h <= 0` 错误路径。 - [x] 加固 Wendland C4 的 `h <= 0` 错误路径。 -- [ ] 加固 cubic spline 的 `h <= 0` 错误路径。 -- [ ] 加固未知 kernel type 错误路径。 -- [ ] 加固 `r = 0` 时核函数值有限。 -- [ ] 加固 `r = 0` 时核函数梯度为零向量。 -- [ ] 加固接近支持半径时核函数值有限。 -- [ ] 加固接近支持半径时核函数梯度有限。 -- [ ] 加固超出支持半径时 `W = 0`。 -- [ ] 加固超出支持半径时 `grad W = 0`。 -- [ ] 加固对称粒子对梯度反对称。 -- [ ] 加固不同 `h(i)` 的核函数结果有限。 -- [ ] 确认默认 kernel 仍为 Wendland C2。 -- [ ] 确认 kernel 测试不变成长跑积分 benchmark。 +- [x] 加固 cubic spline 的 `h <= 0` 错误路径。 +- [x] 加固未知 kernel type 错误路径。 +- [x] 加固 `r = 0` 时核函数值有限。 +- [x] 加固 `r = 0` 时核函数梯度为零向量。 +- [x] 加固接近支持半径时核函数值有限。 +- [x] 加固接近支持半径时核函数梯度有限。 +- [x] 加固超出支持半径时 `W = 0`。 +- [x] 加固超出支持半径时 `grad W = 0`。 +- [x] 加固对称粒子对梯度反对称。 +- [x] 加固不同 `h(i)` 的核函数结果有限。 +- [x] 确认默认 kernel 仍为 Wendland C2。 +- [x] 确认 kernel 测试不变成长跑积分 benchmark。 ## 阶段 F:Neighbor 加固 -- [ ] 加固空模型邻域构建。 -- [ ] 加固单粒子邻域构建。 -- [ ] 加固双粒子支持半径内判定。 -- [ ] 加固双粒子支持半径外判定。 -- [ ] 加固支持半径边界附近判定。 -- [ ] 加固重复坐标粒子的邻域构建。 -- [ ] 加固极近坐标粒子的邻域构建。 -- [ ] 加固负坐标粒子的邻域构建。 +- [x] 加固空模型邻域构建。 +- [x] 加固单粒子邻域构建。 +- [x] 加固双粒子支持半径内判定。 +- [x] 加固双粒子支持半径外判定。 +- [x] 加固支持半径边界附近判定。 +- [x] 加固重复坐标粒子的邻域构建。 +- [x] 加固极近坐标粒子的邻域构建。 +- [x] 加固负坐标粒子的邻域构建。 - [ ] 加固稀疏粒子的包围盒计算。 - [ ] 加固稀疏粒子的 cell 维度控制。 - [ ] 加固不同 `h(i)` 对搜索半径的影响。