From 5a4af31894410cc81b8ecd3ed714854039cc04e5 Mon Sep 17 00:00:00 2001 From: Codex Date: Sun, 5 Jul 2026 23:55:23 +0800 Subject: [PATCH] Add CCLite 0.2.3 geometry primitives --- CMakeLists.txt | 7 + src/geometry/ccl_geometry.f90 | 372 ++++++++++++++++++++++++ tests/unit/test_geometry_primitives.f90 | 154 ++++++++++ todo.md | 24 +- 4 files changed, 545 insertions(+), 12 deletions(-) create mode 100644 src/geometry/ccl_geometry.f90 create mode 100644 tests/unit/test_geometry_primitives.f90 diff --git a/CMakeLists.txt b/CMakeLists.txt index 9964c81..7ffb1f6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,6 +17,7 @@ set(CCL_COMMON_SOURCES src/common/ccl_version.f90 src/common/ccl_errors.f90 src/common/ccl_log.f90 + src/geometry/ccl_geometry.f90 src/diagnostics/ccl_diagnostics.f90 src/case/ccl_string_utils.f90 src/case/ccl_case_types.f90 @@ -87,6 +88,11 @@ add_executable(test_interface_view ) target_link_libraries(test_interface_view PRIVATE ccl_common) +add_executable(test_geometry_primitives + tests/unit/test_geometry_primitives.f90 +) +target_link_libraries(test_geometry_primitives PRIVATE ccl_common) + add_test(NAME smoke_cclite_version COMMAND cclite --version) add_test(NAME smoke_cclite_help COMMAND cclite --help) add_test(NAME smoke_mock_sph_worker_version COMMAND mock_sph_worker --version) @@ -134,6 +140,7 @@ add_test(NAME ipc_lifecycle COMMAND test_ipc_lifecycle) add_test(NAME command_block_semantics COMMAND test_command_block) add_test(NAME data_block_semantics COMMAND test_data_block) add_test(NAME V020_interface_view_and_load_buffer COMMAND test_interface_view) +add_test(NAME V020_geometry_primitives COMMAND test_geometry_primitives) add_test(NAME dry_run_one_step COMMAND cclite dry-run ${CMAKE_SOURCE_DIR}/tests/data/v010_one_step.inp ) diff --git a/src/geometry/ccl_geometry.f90 b/src/geometry/ccl_geometry.f90 new file mode 100644 index 0000000..6b50324 --- /dev/null +++ b/src/geometry/ccl_geometry.f90 @@ -0,0 +1,372 @@ +module ccl_geometry + use, intrinsic :: ieee_arithmetic, only: ieee_is_finite + use iso_c_binding, only: c_double + use ccl_errors, only: CCL_ERROR_INPUT_INVALID_VALUE, CCL_SUCCESS + implicit none + + real(c_double), parameter :: CCL_GEOM_EPS = 1.0e-12_c_double + + type :: CCL_AABB_Type + logical :: is_valid = .false. + real(c_double) :: min_corner(3) = 0.0_c_double + real(c_double) :: max_corner(3) = 0.0_c_double + end type CCL_AABB_Type + + type :: CCL_Geometry_Diagnostics_Type + integer :: degenerate_edge_count = 0 + integer :: degenerate_triangle_count = 0 + integer :: invalid_normal_count = 0 + end type CCL_Geometry_Diagnostics_Type + +contains + + real(c_double) function ccl_vec3_dot(a, b) result(value) + real(c_double), intent(in) :: a(3) + real(c_double), intent(in) :: b(3) + + value = sum(a * b) + end function ccl_vec3_dot + + subroutine ccl_vec3_cross(a, b, value) + real(c_double), intent(in) :: a(3) + real(c_double), intent(in) :: b(3) + real(c_double), intent(out) :: value(3) + + value(1) = a(2) * b(3) - a(3) * b(2) + value(2) = a(3) * b(1) - a(1) * b(3) + value(3) = a(1) * b(2) - a(2) * b(1) + end subroutine ccl_vec3_cross + + real(c_double) function ccl_vec3_norm(a) result(value) + real(c_double), intent(in) :: a(3) + + value = sqrt(ccl_vec3_dot(a, a)) + end function ccl_vec3_norm + + subroutine ccl_vec3_normalize(a, value, ierr, diagnostics) + real(c_double), intent(in) :: a(3) + real(c_double), intent(out) :: value(3) + integer, intent(out) :: ierr + type(CCL_Geometry_Diagnostics_Type), intent(inout), optional :: diagnostics + real(c_double) :: norm_value + + ierr = CCL_SUCCESS + value = 0.0_c_double + if (.not. finite_vector3(a)) then + ierr = CCL_ERROR_INPUT_INVALID_VALUE + if (present(diagnostics)) diagnostics%invalid_normal_count = diagnostics%invalid_normal_count + 1 + return + end if + norm_value = ccl_vec3_norm(a) + if (norm_value <= CCL_GEOM_EPS) then + ierr = CCL_ERROR_INPUT_INVALID_VALUE + if (present(diagnostics)) diagnostics%invalid_normal_count = diagnostics%invalid_normal_count + 1 + return + end if + value = a / norm_value + end subroutine ccl_vec3_normalize + + subroutine ccl_aabb_init(aabb) + type(CCL_AABB_Type), intent(out) :: aabb + + aabb%is_valid = .false. + aabb%min_corner = huge(0.0_c_double) + aabb%max_corner = -huge(0.0_c_double) + end subroutine ccl_aabb_init + + subroutine ccl_aabb_expand_point(aabb, point, ierr) + type(CCL_AABB_Type), intent(inout) :: aabb + real(c_double), intent(in) :: point(3) + integer, intent(out) :: ierr + + ierr = CCL_SUCCESS + if (.not. finite_vector3(point)) then + ierr = CCL_ERROR_INPUT_INVALID_VALUE + return + end if + if (.not. aabb%is_valid) then + aabb%min_corner = point + aabb%max_corner = point + aabb%is_valid = .true. + else + aabb%min_corner = min(aabb%min_corner, point) + aabb%max_corner = max(aabb%max_corner, point) + end if + end subroutine ccl_aabb_expand_point + + subroutine ccl_aabb_expand_radius(aabb, point, radius, ierr) + type(CCL_AABB_Type), intent(inout) :: aabb + real(c_double), intent(in) :: point(3) + real(c_double), intent(in) :: radius + integer, intent(out) :: ierr + + if (.not. ieee_is_finite(radius) .or. radius < 0.0_c_double) then + ierr = CCL_ERROR_INPUT_INVALID_VALUE + return + end if + call ccl_aabb_expand_point(aabb, point - radius, ierr) + if (ierr /= CCL_SUCCESS) return + call ccl_aabb_expand_point(aabb, point + radius, ierr) + end subroutine ccl_aabb_expand_radius + + logical function ccl_aabb_overlap(left, right) result(overlap) + type(CCL_AABB_Type), intent(in) :: left + type(CCL_AABB_Type), intent(in) :: right + + overlap = .false. + if (.not. left%is_valid .or. .not. right%is_valid) return + overlap = all(left%max_corner >= right%min_corner) .and. all(right%max_corner >= left%min_corner) + end function ccl_aabb_overlap + + subroutine ccl_particle_aabb(x, contact_radius, aabb, ierr) + real(c_double), intent(in) :: x(3) + real(c_double), intent(in) :: contact_radius + type(CCL_AABB_Type), intent(out) :: aabb + integer, intent(out) :: ierr + + call ccl_aabb_init(aabb) + call ccl_aabb_expand_radius(aabb, x, contact_radius, ierr) + end subroutine ccl_particle_aabb + + subroutine ccl_facet_aabb(x, node_count, padding, aabb, ierr) + real(c_double), intent(in) :: x(3, 8) + integer, intent(in) :: node_count + real(c_double), intent(in) :: padding + type(CCL_AABB_Type), intent(out) :: aabb + integer, intent(out) :: ierr + integer :: i + + call ccl_aabb_init(aabb) + if (node_count < 3 .or. node_count > 8) then + ierr = CCL_ERROR_INPUT_INVALID_VALUE + return + end if + if (.not. ieee_is_finite(padding) .or. padding < 0.0_c_double) then + ierr = CCL_ERROR_INPUT_INVALID_VALUE + return + end if + do i = 1, node_count + call ccl_aabb_expand_point(aabb, x(:, i), ierr) + if (ierr /= CCL_SUCCESS) return + end do + if (padding > 0.0_c_double) then + aabb%min_corner = aabb%min_corner - padding + aabb%max_corner = aabb%max_corner + padding + end if + end subroutine ccl_facet_aabb + + subroutine ccl_point_segment_closest(p, a, b, closest, t, distance2, ierr, diagnostics) + real(c_double), intent(in) :: p(3) + real(c_double), intent(in) :: a(3) + real(c_double), intent(in) :: b(3) + real(c_double), intent(out) :: closest(3) + real(c_double), intent(out) :: t + real(c_double), intent(out) :: distance2 + integer, intent(out) :: ierr + type(CCL_Geometry_Diagnostics_Type), intent(inout), optional :: diagnostics + real(c_double) :: ab(3) + real(c_double) :: denom + + ierr = CCL_SUCCESS + closest = 0.0_c_double + t = 0.0_c_double + distance2 = 0.0_c_double + if (.not. finite_vector3(p) .or. .not. finite_vector3(a) .or. .not. finite_vector3(b)) then + ierr = CCL_ERROR_INPUT_INVALID_VALUE + return + end if + ab = b - a + denom = ccl_vec3_dot(ab, ab) + if (denom <= CCL_GEOM_EPS * CCL_GEOM_EPS) then + ierr = CCL_ERROR_INPUT_INVALID_VALUE + if (present(diagnostics)) diagnostics%degenerate_edge_count = diagnostics%degenerate_edge_count + 1 + return + end if + t = ccl_vec3_dot(p - a, ab) / denom + t = max(0.0_c_double, min(1.0_c_double, t)) + closest = a + t * ab + distance2 = ccl_vec3_dot(p - closest, p - closest) + end subroutine ccl_point_segment_closest + + subroutine ccl_point_triangle_closest(p, a, b, c, closest, weights, distance2, ierr, diagnostics) + real(c_double), intent(in) :: p(3) + real(c_double), intent(in) :: a(3) + real(c_double), intent(in) :: b(3) + real(c_double), intent(in) :: c(3) + real(c_double), intent(out) :: closest(3) + real(c_double), intent(out) :: weights(3) + real(c_double), intent(out) :: distance2 + integer, intent(out) :: ierr + type(CCL_Geometry_Diagnostics_Type), intent(inout), optional :: diagnostics + real(c_double) :: ab(3), ac(3), ap(3), bp(3), cp(3), normal(3) + real(c_double) :: d1, d2, d3, d4, d5, d6 + real(c_double) :: va, vb, vc, denom, v, w + + ierr = CCL_SUCCESS + closest = 0.0_c_double + weights = 0.0_c_double + distance2 = 0.0_c_double + if (.not. finite_vector3(p) .or. .not. finite_vector3(a) .or. & + .not. finite_vector3(b) .or. .not. finite_vector3(c)) then + ierr = CCL_ERROR_INPUT_INVALID_VALUE + return + end if + + ab = b - a + ac = c - a + call ccl_vec3_cross(ab, ac, normal) + if (ccl_vec3_dot(normal, normal) <= CCL_GEOM_EPS * CCL_GEOM_EPS) then + ierr = CCL_ERROR_INPUT_INVALID_VALUE + if (present(diagnostics)) diagnostics%degenerate_triangle_count = diagnostics%degenerate_triangle_count + 1 + return + end if + + ap = p - a + d1 = ccl_vec3_dot(ab, ap) + d2 = ccl_vec3_dot(ac, ap) + if (d1 <= 0.0_c_double .and. d2 <= 0.0_c_double) then + closest = a + weights = [1.0_c_double, 0.0_c_double, 0.0_c_double] + distance2 = ccl_vec3_dot(p - closest, p - closest) + return + end if + + bp = p - b + d3 = ccl_vec3_dot(ab, bp) + d4 = ccl_vec3_dot(ac, bp) + if (d3 >= 0.0_c_double .and. d4 <= d3) then + closest = b + weights = [0.0_c_double, 1.0_c_double, 0.0_c_double] + distance2 = ccl_vec3_dot(p - closest, p - closest) + return + end if + + vc = d1 * d4 - d3 * d2 + if (vc <= 0.0_c_double .and. d1 >= 0.0_c_double .and. d3 <= 0.0_c_double) then + v = d1 / (d1 - d3) + closest = a + v * ab + weights = [1.0_c_double - v, v, 0.0_c_double] + distance2 = ccl_vec3_dot(p - closest, p - closest) + return + end if + + cp = p - c + d5 = ccl_vec3_dot(ab, cp) + d6 = ccl_vec3_dot(ac, cp) + if (d6 >= 0.0_c_double .and. d5 <= d6) then + closest = c + weights = [0.0_c_double, 0.0_c_double, 1.0_c_double] + distance2 = ccl_vec3_dot(p - closest, p - closest) + return + end if + + vb = d5 * d2 - d1 * d6 + if (vb <= 0.0_c_double .and. d2 >= 0.0_c_double .and. d6 <= 0.0_c_double) then + w = d2 / (d2 - d6) + closest = a + w * ac + weights = [1.0_c_double - w, 0.0_c_double, w] + distance2 = ccl_vec3_dot(p - closest, p - closest) + return + end if + + va = d3 * d6 - d5 * d4 + if (va <= 0.0_c_double .and. (d4 - d3) >= 0.0_c_double .and. (d5 - d6) >= 0.0_c_double) then + w = (d4 - d3) / ((d4 - d3) + (d5 - d6)) + closest = b + w * (c - b) + weights = [0.0_c_double, 1.0_c_double - w, w] + distance2 = ccl_vec3_dot(p - closest, p - closest) + return + end if + + denom = 1.0_c_double / (va + vb + vc) + v = vb * denom + w = vc * denom + closest = a + ab * v + ac * w + weights = [1.0_c_double - v - w, v, w] + distance2 = ccl_vec3_dot(p - closest, p - closest) + end subroutine ccl_point_triangle_closest + + subroutine ccl_triangle_barycentric(point, a, b, c, weights, ierr, diagnostics) + real(c_double), intent(in) :: point(3) + real(c_double), intent(in) :: a(3) + real(c_double), intent(in) :: b(3) + real(c_double), intent(in) :: c(3) + real(c_double), intent(out) :: weights(3) + integer, intent(out) :: ierr + type(CCL_Geometry_Diagnostics_Type), intent(inout), optional :: diagnostics + real(c_double) :: v0(3), v1(3), v2(3) + real(c_double) :: d00, d01, d11, d20, d21, denom + + ierr = CCL_SUCCESS + weights = 0.0_c_double + v0 = b - a + v1 = c - a + v2 = point - a + d00 = ccl_vec3_dot(v0, v0) + d01 = ccl_vec3_dot(v0, v1) + d11 = ccl_vec3_dot(v1, v1) + d20 = ccl_vec3_dot(v2, v0) + d21 = ccl_vec3_dot(v2, v1) + denom = d00 * d11 - d01 * d01 + if (.not. ieee_is_finite(denom) .or. abs(denom) <= CCL_GEOM_EPS * CCL_GEOM_EPS) then + ierr = CCL_ERROR_INPUT_INVALID_VALUE + if (present(diagnostics)) diagnostics%degenerate_triangle_count = diagnostics%degenerate_triangle_count + 1 + return + end if + weights(2) = (d11 * d20 - d01 * d21) / denom + weights(3) = (d00 * d21 - d01 * d20) / denom + weights(1) = 1.0_c_double - weights(2) - weights(3) + end subroutine ccl_triangle_barycentric + + subroutine ccl_point_quad_closest(p, x, closest, weights4, distance2, ierr, diagnostics) + real(c_double), intent(in) :: p(3) + real(c_double), intent(in) :: x(3, 4) + real(c_double), intent(out) :: closest(3) + real(c_double), intent(out) :: weights4(4) + real(c_double), intent(out) :: distance2 + integer, intent(out) :: ierr + type(CCL_Geometry_Diagnostics_Type), intent(inout), optional :: diagnostics + real(c_double) :: closest_a(3), closest_b(3) + real(c_double) :: weights_a(3), weights_b(3) + real(c_double) :: distance2_a, distance2_b + integer :: ierr_a + integer :: ierr_b + + closest = 0.0_c_double + weights4 = 0.0_c_double + distance2 = 0.0_c_double + call ccl_point_triangle_closest(p, x(:, 1), x(:, 2), x(:, 3), closest_a, weights_a, & + distance2_a, ierr_a, diagnostics) + call ccl_point_triangle_closest(p, x(:, 1), x(:, 3), x(:, 4), closest_b, weights_b, & + distance2_b, ierr_b, diagnostics) + if (ierr_a /= CCL_SUCCESS .and. ierr_b /= CCL_SUCCESS) then + ierr = CCL_ERROR_INPUT_INVALID_VALUE + return + end if + ierr = CCL_SUCCESS + if (ierr_b /= CCL_SUCCESS .or. (ierr_a == CCL_SUCCESS .and. distance2_a <= distance2_b)) then + closest = closest_a + distance2 = distance2_a + weights4 = [weights_a(1), weights_a(2), weights_a(3), 0.0_c_double] + else + closest = closest_b + distance2 = distance2_b + weights4 = [weights_b(1), 0.0_c_double, weights_b(2), weights_b(3)] + end if + end subroutine ccl_point_quad_closest + + subroutine ccl_geometry_diagnostics_reset(diagnostics) + type(CCL_Geometry_Diagnostics_Type), intent(out) :: diagnostics + + diagnostics%degenerate_edge_count = 0 + diagnostics%degenerate_triangle_count = 0 + diagnostics%invalid_normal_count = 0 + end subroutine ccl_geometry_diagnostics_reset + + logical function finite_vector3(value) result(is_finite) + real(c_double), intent(in) :: value(3) + + is_finite = ieee_is_finite(value(1)) .and. ieee_is_finite(value(2)) .and. ieee_is_finite(value(3)) + end function finite_vector3 + +end module ccl_geometry diff --git a/tests/unit/test_geometry_primitives.f90 b/tests/unit/test_geometry_primitives.f90 new file mode 100644 index 0000000..360e0af --- /dev/null +++ b/tests/unit/test_geometry_primitives.f90 @@ -0,0 +1,154 @@ +program test_geometry_primitives + use iso_c_binding, only: c_double + use ccl_errors, only: CCL_ERROR_INPUT_INVALID_VALUE, CCL_SUCCESS + use ccl_geometry, only: CCL_AABB_Type, CCL_Geometry_Diagnostics_Type, ccl_aabb_expand_point, & + ccl_aabb_init, ccl_aabb_overlap, ccl_facet_aabb, ccl_geometry_diagnostics_reset, & + ccl_particle_aabb, ccl_point_quad_closest, ccl_point_segment_closest, & + ccl_point_triangle_closest, ccl_triangle_barycentric, ccl_vec3_cross, ccl_vec3_dot, & + ccl_vec3_norm, ccl_vec3_normalize + implicit none + + integer :: ierr + real(c_double) :: value + real(c_double) :: vector(3) + real(c_double) :: closest(3) + real(c_double) :: weights(3) + real(c_double) :: weights4(4) + real(c_double) :: distance2 + real(c_double) :: t + real(c_double) :: quad(3, 4) + real(c_double) :: facet(3, 8) + type(CCL_AABB_Type) :: box_a + type(CCL_AABB_Type) :: box_b + type(CCL_Geometry_Diagnostics_Type) :: diagnostics + + call require_real_close(ccl_vec3_dot([1.0_c_double, 2.0_c_double, 3.0_c_double], & + [4.0_c_double, 5.0_c_double, 6.0_c_double]), 32.0_c_double, "dot product") + call ccl_vec3_cross([1.0_c_double, 0.0_c_double, 0.0_c_double], & + [0.0_c_double, 1.0_c_double, 0.0_c_double], vector) + call require_vector_close(vector, [0.0_c_double, 0.0_c_double, 1.0_c_double], "cross product") + call require_real_close(ccl_vec3_norm([3.0_c_double, 4.0_c_double, 0.0_c_double]), & + 5.0_c_double, "norm") + call ccl_geometry_diagnostics_reset(diagnostics) + call ccl_vec3_normalize([0.0_c_double, 0.0_c_double, 2.0_c_double], vector, ierr, diagnostics) + call require_equal(ierr, CCL_SUCCESS, "normalize valid vector") + call require_vector_close(vector, [0.0_c_double, 0.0_c_double, 1.0_c_double], "normalized vector") + call ccl_vec3_normalize([0.0_c_double, 0.0_c_double, 0.0_c_double], vector, ierr, diagnostics) + call require_equal(ierr, CCL_ERROR_INPUT_INVALID_VALUE, "zero normal rejected") + call require_equal(diagnostics%invalid_normal_count, 1, "invalid normal counted") + + call ccl_aabb_init(box_a) + call ccl_aabb_expand_point(box_a, [0.0_c_double, 0.0_c_double, 0.0_c_double], ierr) + call require_equal(ierr, CCL_SUCCESS, "AABB first point") + call ccl_aabb_expand_point(box_a, [1.0_c_double, 1.0_c_double, 1.0_c_double], ierr) + call require_equal(ierr, CCL_SUCCESS, "AABB second point") + call ccl_particle_aabb([1.5_c_double, 0.5_c_double, 0.5_c_double], 0.6_c_double, box_b, ierr) + call require_equal(ierr, CCL_SUCCESS, "particle AABB") + call require_true(ccl_aabb_overlap(box_a, box_b), "touching AABBs overlap") + + facet = 0.0_c_double + facet(:, 1) = [0.0_c_double, 0.0_c_double, 0.0_c_double] + facet(:, 2) = [1.0_c_double, 0.0_c_double, 0.0_c_double] + facet(:, 3) = [1.0_c_double, 1.0_c_double, 0.0_c_double] + facet(:, 4) = [0.0_c_double, 1.0_c_double, 0.0_c_double] + call ccl_facet_aabb(facet, 4, 0.1_c_double, box_a, ierr) + call require_equal(ierr, CCL_SUCCESS, "facet AABB") + call require_real_close(box_a%min_corner(1), -0.1_c_double, "facet AABB padding") + + call ccl_geometry_diagnostics_reset(diagnostics) + call ccl_point_segment_closest([0.5_c_double, 1.0_c_double, 0.0_c_double], & + [0.0_c_double, 0.0_c_double, 0.0_c_double], [1.0_c_double, 0.0_c_double, 0.0_c_double], & + closest, t, distance2, ierr, diagnostics) + call require_equal(ierr, CCL_SUCCESS, "segment closest") + call require_real_close(t, 0.5_c_double, "segment parameter") + call require_vector_close(closest, [0.5_c_double, 0.0_c_double, 0.0_c_double], "segment closest point") + + call ccl_point_segment_closest([0.0_c_double, 0.0_c_double, 0.0_c_double], & + [1.0_c_double, 1.0_c_double, 1.0_c_double], [1.0_c_double, 1.0_c_double, 1.0_c_double], & + closest, t, distance2, ierr, diagnostics) + call require_equal(ierr, CCL_ERROR_INPUT_INVALID_VALUE, "degenerate segment rejected") + call require_equal(diagnostics%degenerate_edge_count, 1, "degenerate edge counted") + + call ccl_point_triangle_closest([0.25_c_double, 0.25_c_double, 1.0_c_double], & + [0.0_c_double, 0.0_c_double, 0.0_c_double], [1.0_c_double, 0.0_c_double, 0.0_c_double], & + [0.0_c_double, 1.0_c_double, 0.0_c_double], closest, weights, distance2, ierr, diagnostics) + call require_equal(ierr, CCL_SUCCESS, "triangle closest inside") + call require_vector_close(closest, [0.25_c_double, 0.25_c_double, 0.0_c_double], "triangle closest point") + call require_real_close(sum(weights), 1.0_c_double, "triangle weights sum") + call require_real_close(distance2, 1.0_c_double, "triangle distance2") + + call ccl_point_triangle_closest([2.0_c_double, 0.0_c_double, 0.0_c_double], & + [0.0_c_double, 0.0_c_double, 0.0_c_double], [1.0_c_double, 0.0_c_double, 0.0_c_double], & + [0.0_c_double, 1.0_c_double, 0.0_c_double], closest, weights, distance2, ierr, diagnostics) + call require_equal(ierr, CCL_SUCCESS, "triangle closest vertex") + call require_vector_close(closest, [1.0_c_double, 0.0_c_double, 0.0_c_double], "triangle vertex point") + + call ccl_triangle_barycentric([0.2_c_double, 0.3_c_double, 0.0_c_double], & + [0.0_c_double, 0.0_c_double, 0.0_c_double], [1.0_c_double, 0.0_c_double, 0.0_c_double], & + [0.0_c_double, 1.0_c_double, 0.0_c_double], weights, ierr, diagnostics) + call require_equal(ierr, CCL_SUCCESS, "barycentric valid") + call require_real_close(sum(weights), 1.0_c_double, "barycentric weight sum") + call require_real_close(weights(1), 0.5_c_double, "barycentric first weight") + + quad(:, 1) = [0.0_c_double, 0.0_c_double, 0.0_c_double] + quad(:, 2) = [1.0_c_double, 0.0_c_double, 0.0_c_double] + quad(:, 3) = [1.0_c_double, 1.0_c_double, 0.0_c_double] + quad(:, 4) = [0.0_c_double, 1.0_c_double, 0.0_c_double] + call ccl_point_quad_closest([0.75_c_double, 0.75_c_double, 0.5_c_double], quad, & + closest, weights4, distance2, ierr, diagnostics) + call require_equal(ierr, CCL_SUCCESS, "quad closest") + call require_real_close(sum(weights4), 1.0_c_double, "quad weights sum") + call require_real_close(distance2, 0.25_c_double, "quad distance2") + + call ccl_point_triangle_closest([0.0_c_double, 0.0_c_double, 0.0_c_double], & + [0.0_c_double, 0.0_c_double, 0.0_c_double], [1.0_c_double, 0.0_c_double, 0.0_c_double], & + [2.0_c_double, 0.0_c_double, 0.0_c_double], closest, weights, distance2, ierr, diagnostics) + call require_equal(ierr, CCL_ERROR_INPUT_INVALID_VALUE, "degenerate triangle rejected") + call require_true(diagnostics%degenerate_triangle_count >= 1, "degenerate triangle counted") + +contains + + subroutine require_equal(actual, expected, message) + integer, intent(in) :: actual + integer, intent(in) :: expected + character(len=*), intent(in) :: message + + if (actual /= expected) then + print '(a,": expected ",i0," got ",i0)', trim(message), expected, actual + stop 1 + end if + end subroutine require_equal + + subroutine require_true(condition, message) + logical, intent(in) :: condition + character(len=*), intent(in) :: message + + if (.not. condition) then + print '(a)', trim(message) + stop 1 + end if + end subroutine require_true + + subroutine require_real_close(actual, expected, message) + real(c_double), intent(in) :: actual + real(c_double), intent(in) :: expected + character(len=*), intent(in) :: message + + if (abs(actual - expected) > 1.0e-10_c_double) then + print '(a,": expected ",es12.4," got ",es12.4)', trim(message), expected, actual + stop 1 + end if + end subroutine require_real_close + + subroutine require_vector_close(actual, expected, message) + real(c_double), intent(in) :: actual(3) + real(c_double), intent(in) :: expected(3) + character(len=*), intent(in) :: message + + if (maxval(abs(actual - expected)) > 1.0e-10_c_double) then + print '(a,": vector mismatch")', trim(message) + stop 1 + end if + end subroutine require_vector_close + +end program test_geometry_primitives diff --git a/todo.md b/todo.md index a4fb596..df021be 100644 --- a/todo.md +++ b/todo.md @@ -153,40 +153,40 @@ 目标:实现 0.2.x 接触检测需要的基础几何函数。 -- [ ] T0203-01 建立 geometry 模块边界。 +- [x] T0203-01 建立 geometry 模块边界。 完成判据:Vec3、AABB 和最近点函数有独立模块或清晰命名空间。 -- [ ] T0203-02 实现 Vec3 基础运算。 +- [x] T0203-02 实现 Vec3 基础运算。 完成判据:支持 dot、cross、norm、scale、add、sub 和 normalize。 -- [ ] T0203-03 实现 AABB 初始化与扩展。 +- [x] T0203-03 实现 AABB 初始化与扩展。 完成判据:空 AABB、点扩展和半径扩展行为可测试。 -- [ ] T0203-04 实现 AABB 重叠测试。 +- [x] T0203-04 实现 AABB 重叠测试。 完成判据:相离、相切、包含和部分重叠四类情况结果正确。 -- [ ] T0203-05 实现 SPH particle AABB。 +- [x] T0203-05 实现 SPH particle AABB。 完成判据:粒子位置和 `contact_radius` 可生成包围盒。 -- [ ] T0203-06 实现 FEM facet AABB。 +- [x] T0203-06 实现 FEM facet AABB。 完成判据:三角形或四边形节点坐标可生成包围盒,并包含厚度或容差扩展。 -- [ ] T0203-07 实现 point-segment closest point。 +- [x] T0203-07 实现 point-segment closest point。 完成判据:线段内部、端点外侧和退化线段路径均有确定输出。 -- [ ] T0203-08 实现 point-triangle closest point。 +- [x] T0203-08 实现 point-triangle closest point。 完成判据:面内、边区、顶点区和退化三角形路径均有测试。 -- [ ] T0203-09 实现 barycentric/shape weight。 +- [x] T0203-09 实现 barycentric/shape weight。 完成判据:三角形权重和为 1,面内权重非负,退化输入返回错误。 -- [ ] T0203-10 实现 point-quad split 最小路径。 +- [x] T0203-10 实现 point-quad split 最小路径。 完成判据:平面四边形按两个三角形处理,并记录拆分选择。 -- [ ] T0203-11 增加退化几何诊断计数。 +- [x] T0203-11 增加退化几何诊断计数。 完成判据:退化边、退化三角形和非法法向不会产生非有限结果。 -- [ ] T0203-12 增加 `V020_GEOMETRY_PRIMITIVES` 单元测试。 +- [x] T0203-12 增加 `V020_GEOMETRY_PRIMITIVES` 单元测试。 完成判据:最近点误差、权重和、退化处理和非有限保护全部通过。 # 6. 0.2.4 宽相搜索