diff --git a/CMakeLists.txt b/CMakeLists.txt index 1f1a19c..21e140c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -231,6 +231,42 @@ set_target_properties(test_coupling_load_balance_081 PROPERTIES Fortran_MODULE_D add_test(NAME coupling_load_balance_081 COMMAND test_coupling_load_balance_081) set_tests_properties(coupling_load_balance_081 PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") +add_executable(test_coupling_contact_diagnostics_081 tests/module/test_coupling_contact_diagnostics_081.f90) +target_link_libraries(test_coupling_contact_diagnostics_081 PRIVATE sphlite_core) +set_target_properties(test_coupling_contact_diagnostics_081 PROPERTIES Fortran_MODULE_DIRECTORY "${SPHLITE_MODULE_DIR}") +add_test(NAME coupling_contact_diagnostics_081 COMMAND test_coupling_contact_diagnostics_081) +set_tests_properties(coupling_contact_diagnostics_081 PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") + +add_executable(test_coupling_solver_order_081 tests/module/test_coupling_solver_order_081.f90) +target_link_libraries(test_coupling_solver_order_081 PRIVATE sphlite_core) +set_target_properties(test_coupling_solver_order_081 PROPERTIES Fortran_MODULE_DIRECTORY "${SPHLITE_MODULE_DIR}") +add_test(NAME coupling_solver_order_081 COMMAND test_coupling_solver_order_081) +set_tests_properties(coupling_solver_order_081 PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") + +add_executable(test_coupling_stale_epoch_081 tests/module/test_coupling_stale_epoch_081.f90) +target_link_libraries(test_coupling_stale_epoch_081 PRIVATE sphlite_core) +set_target_properties(test_coupling_stale_epoch_081 PROPERTIES Fortran_MODULE_DIRECTORY "${SPHLITE_MODULE_DIR}") +add_test(NAME coupling_stale_epoch_081 COMMAND test_coupling_stale_epoch_081) +set_tests_properties(coupling_stale_epoch_081 PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") + +add_executable(test_coupling_solid_surface_pressure_081 tests/module/test_coupling_solid_surface_pressure_081.f90) +target_link_libraries(test_coupling_solid_surface_pressure_081 PRIVATE sphlite_core) +set_target_properties(test_coupling_solid_surface_pressure_081 PROPERTIES Fortran_MODULE_DIRECTORY "${SPHLITE_MODULE_DIR}") +add_test(NAME coupling_solid_surface_pressure_081 COMMAND test_coupling_solid_surface_pressure_081) +set_tests_properties(coupling_solid_surface_pressure_081 PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") + +add_executable(test_coupling_shell_pressure_081 tests/module/test_coupling_shell_pressure_081.f90) +target_link_libraries(test_coupling_shell_pressure_081 PRIVATE sphlite_core) +set_target_properties(test_coupling_shell_pressure_081 PROPERTIES Fortran_MODULE_DIRECTORY "${SPHLITE_MODULE_DIR}") +add_test(NAME coupling_shell_pressure_081 COMMAND test_coupling_shell_pressure_081) +set_tests_properties(coupling_shell_pressure_081 PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") + +add_executable(test_coupling_mixed_pressure_motion_081 tests/module/test_coupling_mixed_pressure_motion_081.f90) +target_link_libraries(test_coupling_mixed_pressure_motion_081 PRIVATE sphlite_core) +set_target_properties(test_coupling_mixed_pressure_motion_081 PROPERTIES Fortran_MODULE_DIRECTORY "${SPHLITE_MODULE_DIR}") +add_test(NAME coupling_mixed_pressure_motion_081 COMMAND test_coupling_mixed_pressure_motion_081) +set_tests_properties(coupling_mixed_pressure_motion_081 PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") + add_executable(test_coupling_particle_export_080 tests/module/test_coupling_particle_export_080.f90) target_link_libraries(test_coupling_particle_export_080 PRIVATE sphlite_core) set_target_properties(test_coupling_particle_export_080 PROPERTIES Fortran_MODULE_DIRECTORY "${SPHLITE_MODULE_DIR}") diff --git a/src/coupling_interface/sph_coupling_interface.f90 b/src/coupling_interface/sph_coupling_interface.f90 index d888956..86012e7 100644 --- a/src/coupling_interface/sph_coupling_interface.f90 +++ b/src/coupling_interface/sph_coupling_interface.f90 @@ -11,11 +11,13 @@ module sph_coupling_interface DB_DISTRIBUTION_UNIFORM => SPH_COUPLING_DISTRIBUTION_UNIFORM, & DB_DISTRIBUTION_AREA => SPH_COUPLING_DISTRIBUTION_AREA, & DB_DISTRIBUTION_MASS => SPH_COUPLING_DISTRIBUTION_MASS, & + DB_CONTACT_STATE_IMPORT => SPH_COUPLING_CONTACT_STATE_IMPORT, & db_coupling_region_count => coupling_region_count, & db_coupling_region_name => coupling_region_name, & db_coupling_region_type => coupling_region_type, & db_coupling_region_export_mode => coupling_region_export_mode, & db_coupling_region_import_mode => coupling_region_import_mode, & + db_coupling_region_contact_state_mode => coupling_region_contact_state_mode, & db_coupling_region_enabled => coupling_region_enabled, & db_coupling_region_particle_count => coupling_region_particle_count, & db_coupling_region_particles => coupling_region_particles, & @@ -72,6 +74,10 @@ module sph_coupling_interface integer :: coupling_repeated_import_count = 0 integer :: coupling_duplicate_facet_count = 0 integer :: coupling_invalid_weight_count = 0 + integer :: coupling_active_contact_count = 0 + integer :: coupling_skipped_contact_count = 0 + integer :: coupling_nonfinite_contact_count = 0 + integer :: coupling_bad_facet_area_count = 0 real(rk) :: coupling_current_force(SPH_NDIM) = 0.0_rk real(rk) :: coupling_current_moment(SPH_NDIM) = 0.0_rk real(rk) :: coupling_current_impulse(SPH_NDIM) = 0.0_rk @@ -92,6 +98,7 @@ module sph_coupling_interface real(rk) :: coupling_facet_moment_error = 0.0_rk real(rk) :: coupling_max_pressure = 0.0_rk real(rk) :: coupling_max_traction = 0.0_rk + real(rk) :: coupling_max_penetration = 0.0_rk integer :: coupling_step_load_consumed = 0 interface sph_coupling_get_diagnostics @@ -136,6 +143,10 @@ contains coupling_repeated_import_count = 0 coupling_duplicate_facet_count = 0 coupling_invalid_weight_count = 0 + coupling_active_contact_count = 0 + coupling_skipped_contact_count = 0 + coupling_nonfinite_contact_count = 0 + coupling_bad_facet_area_count = 0 call sph_coupling_reset_step_diagnostics() call sph_coupling_reset_load_balance() coupling_cumulative_impulse = 0.0_rk @@ -205,6 +216,10 @@ contains if (maxval(abs(coupling_external_force)) > 0.0_rk .or. & maxval(coupling_motion_flag) > 0) then coupling_stale_load_count = coupling_stale_load_count + 1 + else if (allocated(coupling_contact_flag)) then + if (maxval(coupling_contact_flag) > 0) then + coupling_stale_load_count = coupling_stale_load_count + 1 + end if end if end if call sph_coupling_zero_import_buffers() @@ -224,6 +239,8 @@ contains if (allocated(coupling_contact_penetration)) coupling_contact_penetration = 0.0_rk if (allocated(coupling_contact_pressure)) coupling_contact_pressure = 0.0_rk coupling_imported_force_count = 0 + coupling_active_contact_count = 0 + coupling_max_penetration = 0.0_rk end subroutine sph_coupling_zero_import_buffers subroutine sph_coupling_reset_load_balance() @@ -235,6 +252,7 @@ contains coupling_facet_moment_error = 0.0_rk coupling_max_pressure = 0.0_rk coupling_max_traction = 0.0_rk + coupling_max_penetration = 0.0_rk end subroutine sph_coupling_reset_load_balance subroutine sph_coupling_get_particle_count(count, ierr) @@ -988,6 +1006,115 @@ contains ierr = SPH_SUCCESS end subroutine sph_coupling_get_load_balance + subroutine sph_coupling_apply_contact_state(region_index, contact_count, & + facet_ids, normals, gaps, penetrations, contact_pressures, & + coupling_step, ierr) + integer, intent(in) :: region_index + integer, intent(in) :: contact_count + integer, intent(in) :: facet_ids(contact_count) + real(rk), intent(in) :: normals(SPH_NDIM,contact_count) + real(rk), intent(in) :: gaps(contact_count) + real(rk), intent(in) :: penetrations(contact_count) + real(rk), intent(in) :: contact_pressures(contact_count) + integer, intent(in) :: coupling_step + integer, intent(out) :: ierr + integer :: i + real(rk) :: area + real(rk) :: facet_normal(SPH_NDIM) + real(rk) :: center(SPH_NDIM) + real(rk) :: imported_normal(SPH_NDIM) + real(rk) :: normal_length + + ierr = SPH_SUCCESS + call sph_coupling_prepare_import_epoch(coupling_step, ierr) + if (ierr /= SPH_SUCCESS) return + if (region_index < 1 .or. region_index > db_coupling_region_count) then + call sph_error_set(SPH_ERROR_ARGUMENT, 'coupling region index is invalid') + ierr = SPH_ERROR_ARGUMENT + return + end if + call sph_coupling_require_enabled_region(region_index, ierr) + if (ierr /= SPH_SUCCESS) return + if (db_coupling_region_contact_state_mode(region_index) /= & + DB_CONTACT_STATE_IMPORT) then + call sph_error_set(SPH_ERROR_ARGUMENT, & + 'coupling region does not import contact state') + ierr = SPH_ERROR_ARGUMENT + return + end if + if (contact_count < 0) then + call sph_error_set(SPH_ERROR_ARGUMENT, 'coupling contact count is invalid') + ierr = SPH_ERROR_ARGUMENT + return + end if + do i = 1, contact_count + call sph_coupling_check_duplicate_facet(i, contact_count, facet_ids, ierr) + if (ierr /= SPH_SUCCESS) return + if (.not. sph_coupling_vector_is_finite(normals(:,i)) .or. & + .not. sph_coupling_scalar_is_finite(gaps(i)) .or. & + .not. sph_coupling_scalar_is_finite(penetrations(i)) .or. & + .not. sph_coupling_scalar_is_finite(contact_pressures(i))) then + coupling_nonfinite_import_count = coupling_nonfinite_import_count + 1 + coupling_nonfinite_contact_count = coupling_nonfinite_contact_count + 1 + call sph_error_set(SPH_ERROR_ARGUMENT, & + 'coupling contact state contains nonfinite values') + ierr = SPH_ERROR_ARGUMENT + return + end if + imported_normal = normals(:,i) + normal_length = sph_coupling_vector_norm(imported_normal) + if (normal_length <= 1.0e-12_rk) then + coupling_invalid_weight_count = coupling_invalid_weight_count + 1 + call sph_error_set(SPH_ERROR_ARGUMENT, & + 'coupling contact normal is degenerate') + ierr = SPH_ERROR_ARGUMENT + return + end if + imported_normal = imported_normal / normal_length + call sph_coupling_get_facet_geometry(region_index, facet_ids(i), & + area, facet_normal, center, ierr) + if (ierr /= SPH_SUCCESS) return + if (sph_coupling_particle_should_skip(facet_ids(i))) then + coupling_skipped_particle_count = coupling_skipped_particle_count + 1 + coupling_skipped_contact_count = coupling_skipped_contact_count + 1 + cycle + end if + coupling_contact_flag(facet_ids(i)) = 1 + coupling_contact_normal(:,facet_ids(i)) = imported_normal + coupling_contact_gap(facet_ids(i)) = gaps(i) + coupling_contact_penetration(facet_ids(i)) = penetrations(i) + coupling_contact_pressure(facet_ids(i)) = contact_pressures(i) + coupling_active_contact_count = coupling_active_contact_count + 1 + if (penetrations(i) > coupling_max_penetration) then + coupling_max_penetration = penetrations(i) + end if + end do + end subroutine sph_coupling_apply_contact_state + + subroutine sph_coupling_get_contact_diagnostics(active_count, & + skipped_count, max_penetration, stale_count, repeated_count, & + nonfinite_count, bad_area_count, invalid_weight_count, ierr) + integer, intent(out) :: active_count + integer, intent(out) :: skipped_count + real(rk), intent(out) :: max_penetration + integer, intent(out) :: stale_count + integer, intent(out) :: repeated_count + integer, intent(out) :: nonfinite_count + integer, intent(out) :: bad_area_count + integer, intent(out) :: invalid_weight_count + integer, intent(out) :: ierr + + active_count = coupling_active_contact_count + skipped_count = coupling_skipped_contact_count + max_penetration = coupling_max_penetration + stale_count = coupling_stale_load_count + repeated_count = coupling_repeated_import_count + nonfinite_count = coupling_nonfinite_contact_count + bad_area_count = coupling_bad_facet_area_count + invalid_weight_count = coupling_invalid_weight_count + ierr = SPH_SUCCESS + end subroutine sph_coupling_get_contact_diagnostics + subroutine sph_coupling_apply_motion_boundary(region_index, export_index, & target_kind, mode, target, ierr) integer, intent(in) :: region_index @@ -1151,6 +1278,9 @@ contains if (allocated(coupling_motion_flag)) then if (maxval(coupling_motion_flag) > 0) has_load = .true. end if + if (allocated(coupling_contact_flag)) then + if (maxval(coupling_contact_flag) > 0) has_load = .true. + end if if (has_load) coupling_step_load_consumed = 1 call sph_coupling_zero_import_buffers() end subroutine sph_coupling_finalize_step_imports @@ -1226,11 +1356,27 @@ contains values(20) = coupling_max_acceleration values(21) = coupling_max_velocity_error values(22) = coupling_max_position_error + if (value_capacity >= 27) then + values(23) = coupling_facet_force_error + values(24) = coupling_facet_moment_error + values(25) = coupling_max_pressure + values(26) = coupling_max_traction + values(27) = coupling_max_penetration + end if counts(1) = coupling_stale_load_count counts(2) = coupling_skipped_particle_count counts(3) = coupling_nonfinite_import_count counts(4) = coupling_imported_force_count counts(5) = coupling_step_load_consumed + if (count_capacity >= 12) then + counts(6) = coupling_repeated_import_count + counts(7) = coupling_duplicate_facet_count + counts(8) = coupling_invalid_weight_count + counts(9) = coupling_active_contact_count + counts(10) = coupling_skipped_contact_count + counts(11) = coupling_nonfinite_contact_count + counts(12) = coupling_bad_facet_area_count + end if ierr = SPH_SUCCESS end subroutine sph_coupling_get_diagnostic_values @@ -1363,12 +1509,15 @@ contains return end if if (.not. sph_coupling_vector_is_finite(shell_director(:,index))) then + coupling_nonfinite_import_count = coupling_nonfinite_import_count + 1 call sph_error_set(SPH_ERROR_ARGUMENT, 'Shell facet normal is not finite') ierr = SPH_ERROR_ARGUMENT return end if if (.not. sph_coupling_scalar_is_finite(shell_reference_area(index)) .or. & shell_reference_area(index) <= 0.0_rk) then + coupling_bad_facet_area_count = coupling_bad_facet_area_count + 1 + coupling_invalid_weight_count = coupling_invalid_weight_count + 1 call sph_error_set(SPH_ERROR_ARGUMENT, 'Shell facet area is invalid') ierr = SPH_ERROR_ARGUMENT return @@ -1431,6 +1580,9 @@ contains if (allocated(coupling_external_force)) then if (maxval(abs(coupling_external_force)) > 0.0_rk) has_force = .true. end if + if (allocated(coupling_contact_flag)) then + if (maxval(coupling_contact_flag) > 0) has_force = .true. + end if if (has_force) coupling_repeated_import_count = coupling_repeated_import_count + 1 end subroutine sph_coupling_prepare_import_epoch diff --git a/tests/module/test_coupling_contact_diagnostics_081.f90 b/tests/module/test_coupling_contact_diagnostics_081.f90 new file mode 100644 index 0000000..3417523 --- /dev/null +++ b/tests/module/test_coupling_contact_diagnostics_081.f90 @@ -0,0 +1,160 @@ +program test_coupling_contact_diagnostics_081 + use sph_precision, only: rk, SPH_NDIM + use sph_error, only: SPH_SUCCESS + use sph_api, only: sph_initialize, sph_finalize, sph_read_inp, sph_build_model + use sph_database, only: particle_status, SPH_STATUS_INACTIVE + use sph_coupling_interface, only: coupling_contact_flag, & + coupling_contact_normal, coupling_contact_gap, & + coupling_contact_penetration, coupling_contact_pressure, & + sph_coupling_apply_contact_state, sph_coupling_get_contact_diagnostics + implicit none + + integer :: ierr + + call check_contact_state_values() + call check_contact_state_errors() + +contains + + subroutine check_contact_state_values() + integer :: ids(2) + integer :: one_id(1) + integer :: empty_ids(0) + real(rk) :: normals(SPH_NDIM,2) + real(rk) :: one_normal(SPH_NDIM,1) + real(rk) :: empty_normals(SPH_NDIM,0) + real(rk) :: gaps(2) + real(rk) :: penetrations(2) + real(rk) :: contact_pressures(2) + real(rk) :: one_gap(1) + real(rk) :: one_penetration(1) + real(rk) :: one_pressure(1) + real(rk) :: empty_scalars(0) + integer :: active_count + integer :: skipped_count + integer :: stale_count + integer :: repeated_count + integer :: nonfinite_count + integer :: bad_area_count + integer :: invalid_weight_count + real(rk) :: max_penetration + + call build_case() + ids = (/ 1, 2 /) + normals(:,1) = (/ 0.0_rk, 0.0_rk, 2.0_rk /) + normals(:,2) = (/ 0.0_rk, 0.0_rk, 1.0_rk /) + gaps = (/ 1.0e-4_rk, 2.0e-4_rk /) + penetrations = (/ 2.0e-3_rk, 4.0e-3_rk /) + contact_pressures = (/ 8.0_rk, 6.0_rk /) + call sph_coupling_apply_contact_state(1, 2, ids, normals, gaps, & + penetrations, contact_pressures, 101, ierr) + call assert_ok(ierr, 'contact state import failed') + if (coupling_contact_flag(1) /= 1) call fail('contact flag missing') + call assert_close(coupling_contact_normal(3,1), 1.0_rk, & + 'contact normal was not normalized') + call assert_close(coupling_contact_gap(2), gaps(2), 'contact gap mismatch') + call assert_close(coupling_contact_penetration(2), penetrations(2), & + 'contact penetration mismatch') + call assert_close(coupling_contact_pressure(1), contact_pressures(1), & + 'contact pressure mismatch') + + one_id(1) = 3 + one_normal(:,1) = (/ 0.0_rk, 0.0_rk, 1.0_rk /) + one_gap(1) = 0.0_rk + one_penetration(1) = 1.0e-3_rk + one_pressure(1) = 1.0_rk + particle_status(3) = SPH_STATUS_INACTIVE + call sph_coupling_apply_contact_state(1, 1, one_id, one_normal, one_gap, & + one_penetration, one_pressure, 101, ierr) + call assert_ok(ierr, 'skipped contact import failed') + + call sph_coupling_get_contact_diagnostics(active_count, skipped_count, & + max_penetration, stale_count, repeated_count, nonfinite_count, & + bad_area_count, invalid_weight_count, ierr) + call assert_ok(ierr, 'contact diagnostics failed') + if (active_count /= 2) call fail('active contact count mismatch') + if (skipped_count /= 1) call fail('skipped contact count mismatch') + if (repeated_count <= 0) call fail('repeated contact diagnostic missing') + call assert_close(max_penetration, 4.0e-3_rk, & + 'max penetration mismatch') + if (nonfinite_count /= 0) call fail('unexpected nonfinite contact count') + + call sph_coupling_apply_contact_state(1, 0, empty_ids, empty_normals, & + empty_scalars, empty_scalars, empty_scalars, 102, ierr) + call assert_ok(ierr, 'empty contact import failed') + call sph_coupling_get_contact_diagnostics(active_count, skipped_count, & + max_penetration, stale_count, repeated_count, nonfinite_count, & + bad_area_count, invalid_weight_count, ierr) + call assert_ok(ierr, 'empty contact diagnostics failed') + if (active_count /= 0) call fail('empty contact import left active state') + call sph_finalize(ierr) + call assert_ok(ierr, 'finalize failed after contact values') + end subroutine check_contact_state_values + + subroutine check_contact_state_errors() + integer :: ids(1) + real(rk) :: normals(SPH_NDIM,1) + real(rk) :: gaps(1) + real(rk) :: penetrations(1) + real(rk) :: contact_pressures(1) + integer :: active_count + integer :: skipped_count + integer :: stale_count + integer :: repeated_count + integer :: nonfinite_count + integer :: bad_area_count + integer :: invalid_weight_count + real(rk) :: max_penetration + + call build_case() + ids(1) = 1 + normals(:,1) = (/ 0.0_rk, 0.0_rk, 1.0_rk /) + gaps(1) = 0.0_rk + penetrations(1) = 0.0_rk + contact_pressures(1) = huge(contact_pressures(1)) + call sph_coupling_apply_contact_state(1, 1, ids, normals, gaps, & + penetrations, contact_pressures, 111, ierr) + if (ierr == SPH_SUCCESS) call fail('nonfinite contact state did not fail') + call sph_coupling_get_contact_diagnostics(active_count, skipped_count, & + max_penetration, stale_count, repeated_count, nonfinite_count, & + bad_area_count, invalid_weight_count, ierr) + call assert_ok(ierr, 'contact error diagnostics failed') + if (nonfinite_count <= 0) call fail('nonfinite contact diagnostic missing') + call sph_finalize(ierr) + call assert_ok(ierr, 'finalize failed after contact errors') + end subroutine check_contact_state_errors + + subroutine build_case() + call sph_initialize(ierr) + call assert_ok(ierr, 'initialize failed for contact diagnostics') + call sph_read_inp('tests/data/coupling_load_mode_081.inp', ierr) + call assert_ok(ierr, 'read failed for contact diagnostics') + call sph_build_model(ierr) + call assert_ok(ierr, 'build failed for contact diagnostics') + end subroutine build_case + + 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 assert_close(actual, expected, message) + real(rk), intent(in) :: actual + real(rk), intent(in) :: expected + character(len=*), intent(in) :: message + + if (abs(actual - expected) > max(1.0e-10_rk, abs(expected) * 1.0e-8_rk)) then + call fail(message) + end if + end subroutine assert_close + + subroutine fail(message) + character(len=*), intent(in) :: message + + write(*, '(A)') trim(message) + stop 1 + end subroutine fail + +end program test_coupling_contact_diagnostics_081 diff --git a/tests/module/test_coupling_mixed_pressure_motion_081.f90 b/tests/module/test_coupling_mixed_pressure_motion_081.f90 new file mode 100644 index 0000000..7a79ced --- /dev/null +++ b/tests/module/test_coupling_mixed_pressure_motion_081.f90 @@ -0,0 +1,80 @@ +program test_coupling_mixed_pressure_motion_081 + use sph_precision, only: rk, SPH_NDIM + use sph_error, only: SPH_SUCCESS + use sph_api, only: sph_initialize, sph_finalize, sph_read_inp, & + sph_build_model, sph_advance_explicit + use sph_database, only: v, SPH_COUPLING_DISTRIBUTION_AREA + use sph_coupling_interface, only: SPH_COUPLING_MOTION_DIRECT, & + SPH_COUPLING_MOTION_VELOCITY, sph_coupling_apply_facet_pressures, & + sph_coupling_apply_motion_boundary + implicit none + + integer :: ierr + integer :: ids(2) + real(rk) :: pressures(2) + real(rk) :: target_velocity(SPH_NDIM) + + call sph_initialize(ierr) + call assert_ok(ierr, 'initialize failed for mixed pressure motion') + call sph_read_inp('tests/data/coupling_load_mode_081.inp', ierr) + call assert_ok(ierr, 'read failed for mixed pressure motion') + call sph_build_model(ierr) + call assert_ok(ierr, 'build failed for mixed pressure motion') + + ids = (/ 1, 2 /) + pressures = (/ 40.0_rk, 40.0_rk /) + call sph_coupling_apply_facet_pressures(1, 2, ids, pressures, & + SPH_COUPLING_DISTRIBUTION_AREA, 501, ierr) + call assert_ok(ierr, 'mixed pressure import failed') + target_velocity = (/ 0.0_rk, 2.0_rk, 0.0_rk /) + call sph_coupling_apply_motion_boundary(2, 1, & + SPH_COUPLING_MOTION_VELOCITY, SPH_COUPLING_MOTION_DIRECT, & + target_velocity, ierr) + call assert_ok(ierr, 'mixed motion import failed') + call sph_advance_explicit(1.0e-7_rk, ierr) + call assert_ok(ierr, 'mixed pressure motion advance failed') + call assert_vector_close(v(:,1), target_velocity, & + 'motion boundary did not override pressure particle') + if (v(3,2) <= 0.0_rk) call fail('free pressure particle did not respond') + + call sph_finalize(ierr) + call assert_ok(ierr, 'finalize failed for mixed pressure motion') + +contains + + 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 assert_close(actual, expected, message) + real(rk), intent(in) :: actual + real(rk), intent(in) :: expected + character(len=*), intent(in) :: message + + if (abs(actual - expected) > max(1.0e-10_rk, abs(expected) * 1.0e-8_rk)) then + call fail(message) + end if + end subroutine assert_close + + subroutine assert_vector_close(actual, expected, message) + real(rk), intent(in) :: actual(SPH_NDIM) + real(rk), intent(in) :: expected(SPH_NDIM) + character(len=*), intent(in) :: message + integer :: i + + do i = 1, SPH_NDIM + call assert_close(actual(i), expected(i), message) + end do + end subroutine assert_vector_close + + subroutine fail(message) + character(len=*), intent(in) :: message + + write(*, '(A)') trim(message) + stop 1 + end subroutine fail + +end program test_coupling_mixed_pressure_motion_081 diff --git a/tests/module/test_coupling_shell_pressure_081.f90 b/tests/module/test_coupling_shell_pressure_081.f90 new file mode 100644 index 0000000..363de7c --- /dev/null +++ b/tests/module/test_coupling_shell_pressure_081.f90 @@ -0,0 +1,50 @@ +program test_coupling_shell_pressure_081 + 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 + use sph_database, only: v, SPH_COUPLING_DISTRIBUTION_AREA + use sph_coupling_interface, only: sph_coupling_apply_facet_pressures + implicit none + + integer :: ierr + integer :: ids(3) + real(rk) :: pressures(3) + + call sph_initialize(ierr) + call assert_ok(ierr, 'initialize failed for shell pressure') + call sph_read_inp('tests/data/coupling_load_mode_081.inp', ierr) + call assert_ok(ierr, 'read failed for shell pressure') + call sph_build_model(ierr) + call assert_ok(ierr, 'build failed for shell pressure') + + ids = (/ 1, 2, 3 /) + pressures = (/ 50.0_rk, 30.0_rk, 10.0_rk /) + call sph_coupling_apply_facet_pressures(1, 3, ids, pressures, & + SPH_COUPLING_DISTRIBUTION_AREA, 401, ierr) + call assert_ok(ierr, 'shell pressure import failed') + call sph_advance_explicit(1.0e-7_rk, ierr) + call assert_ok(ierr, 'shell pressure advance failed') + if (v(3,1) <= 0.0_rk) call fail('shell pressure response missing') + if (v(3,2) <= 0.0_rk) call fail('shell pressure response missing on facet 2') + + call sph_finalize(ierr) + call assert_ok(ierr, 'finalize failed for shell pressure') + +contains + + 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_coupling_shell_pressure_081 diff --git a/tests/module/test_coupling_solid_surface_pressure_081.f90 b/tests/module/test_coupling_solid_surface_pressure_081.f90 new file mode 100644 index 0000000..f0f1a34 --- /dev/null +++ b/tests/module/test_coupling_solid_surface_pressure_081.f90 @@ -0,0 +1,55 @@ +program test_coupling_solid_surface_pressure_081 + use sph_precision, only: rk, SPH_NDIM + use sph_error, only: SPH_SUCCESS + use sph_api, only: sph_initialize, sph_finalize, sph_read_inp, & + sph_build_model, sph_advance_explicit + use sph_database, only: v, mass + use sph_coupling_interface, only: sph_coupling_apply_particle_forces + implicit none + + integer :: ierr + integer :: export_indices(1) + real(rk) :: pressure_value + real(rk) :: proxy_area + real(rk) :: forces(SPH_NDIM,1) + + call sph_initialize(ierr) + call assert_ok(ierr, 'initialize failed for solid surface pressure') + call sph_read_inp('tests/data/coupling_region_080.inp', ierr) + call assert_ok(ierr, 'read failed for solid surface pressure') + call sph_build_model(ierr) + call assert_ok(ierr, 'build failed for solid surface pressure') + + export_indices(1) = 1 + pressure_value = 2.0e5_rk + proxy_area = 1.0e-3_rk + forces(:,1) = (/ 0.0_rk, 0.0_rk, pressure_value * proxy_area /) + call sph_coupling_apply_particle_forces(1, 1, export_indices, forces, ierr) + call assert_ok(ierr, 'solid equivalent pressure import failed') + call sph_advance_explicit(1.0e-7_rk, ierr) + call assert_ok(ierr, 'solid equivalent pressure advance failed') + if (v(3,1) <= 0.0_rk) call fail('solid equivalent pressure response missing') + if (v(3,1) <= forces(3,1) / mass(1) * 0.25e-7_rk) then + call fail('solid equivalent pressure response too small') + end if + + call sph_finalize(ierr) + call assert_ok(ierr, 'finalize failed for solid surface pressure') + +contains + + 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_coupling_solid_surface_pressure_081 diff --git a/tests/module/test_coupling_solver_order_081.f90 b/tests/module/test_coupling_solver_order_081.f90 new file mode 100644 index 0000000..9fc4af3 --- /dev/null +++ b/tests/module/test_coupling_solver_order_081.f90 @@ -0,0 +1,141 @@ +program test_coupling_solver_order_081 + use sph_precision, only: rk, SPH_NDIM + use sph_error, only: SPH_SUCCESS + use sph_api, only: sph_initialize, sph_finalize, sph_read_inp, & + sph_build_model, sph_advance_explicit + use sph_database, only: v, mass, SPH_COUPLING_DISTRIBUTION_AREA, & + SPH_COUPLING_DISTRIBUTION_MASS + use sph_coupling_interface, only: coupling_external_force, & + SPH_COUPLING_MOTION_DIRECT, SPH_COUPLING_MOTION_VELOCITY, & + sph_coupling_import_force_by_external_id, & + sph_coupling_import_region_facet_load, & + sph_coupling_apply_facet_pressures, & + sph_coupling_apply_facet_tractions, sph_coupling_apply_motion_boundary + implicit none + + integer :: ierr + + call check_loads_before_motion() + call check_disabled_region_noop() + call check_empty_pressure_traction_noop() + +contains + + subroutine check_loads_before_motion() + integer :: ids(1) + real(rk) :: pressures(1) + real(rk) :: tractions(SPH_NDIM,1) + real(rk) :: particle_force(SPH_NDIM) + real(rk) :: facet_load(SPH_NDIM) + real(rk) :: target_velocity(SPH_NDIM) + + call build_case() + ids(1) = 1 + pressures(1) = 20.0_rk + call sph_coupling_apply_facet_pressures(1, 1, ids, pressures, & + SPH_COUPLING_DISTRIBUTION_AREA, 201, ierr) + call assert_ok(ierr, 'pressure import failed for solver order') + ids(1) = 2 + tractions(:,1) = (/ 0.0_rk, 0.0_rk, 30.0_rk /) + call sph_coupling_apply_facet_tractions(2, 1, ids, tractions, & + SPH_COUPLING_DISTRIBUTION_MASS, 201, ierr) + call assert_ok(ierr, 'traction import failed for solver order') + particle_force = (/ 0.0_rk, 0.0_rk, mass(3) * 1.0e8_rk /) + call sph_coupling_import_force_by_external_id(3, particle_force, ierr) + call assert_ok(ierr, 'particle force import failed for solver order') + facet_load = (/ 0.0_rk, 0.0_rk, mass(2) * 1.0e8_rk /) + call sph_coupling_import_region_facet_load('TRACTION_CONTACT', 2, & + facet_load, ierr) + call assert_ok(ierr, 'facet load import failed for solver order') + target_velocity = (/ 0.0_rk, -1.0_rk, 0.0_rk /) + call sph_coupling_apply_motion_boundary(2, 1, & + SPH_COUPLING_MOTION_VELOCITY, SPH_COUPLING_MOTION_DIRECT, & + target_velocity, ierr) + call assert_ok(ierr, 'motion import failed for solver order') + call sph_advance_explicit(1.0e-7_rk, ierr) + call assert_ok(ierr, 'advance failed for solver order') + call assert_vector_close(v(:,1), target_velocity, & + 'motion boundary was not applied after loads') + if (v(3,2) <= 0.0_rk) call fail('facet load did not affect free particle') + if (v(3,3) <= 0.0_rk) call fail('particle force did not affect particle') + if (maxval(abs(coupling_external_force)) > 0.0_rk) then + call fail('coupling force cache was not consumed') + end if + call sph_finalize(ierr) + call assert_ok(ierr, 'finalize failed after solver order') + end subroutine check_loads_before_motion + + subroutine check_disabled_region_noop() + call build_case() + call sph_advance_explicit(1.0e-7_rk, ierr) + call assert_ok(ierr, 'disabled region affected empty advance') + call sph_finalize(ierr) + call assert_ok(ierr, 'finalize failed after disabled noop') + end subroutine check_disabled_region_noop + + subroutine check_empty_pressure_traction_noop() + integer :: empty_ids(0) + real(rk) :: empty_pressures(0) + real(rk) :: empty_tractions(SPH_NDIM,0) + + call build_case() + call sph_coupling_apply_facet_pressures(1, 0, empty_ids, empty_pressures, & + SPH_COUPLING_DISTRIBUTION_AREA, 211, ierr) + call assert_ok(ierr, 'empty pressure import failed') + call sph_coupling_apply_facet_tractions(2, 0, empty_ids, empty_tractions, & + SPH_COUPLING_DISTRIBUTION_MASS, 211, ierr) + call assert_ok(ierr, 'empty traction import failed') + call sph_advance_explicit(1.0e-7_rk, ierr) + call assert_ok(ierr, 'empty load advance failed') + if (maxval(abs(v)) > 1.0e-12_rk) then + call fail('empty pressure or traction produced velocity') + end if + call sph_finalize(ierr) + call assert_ok(ierr, 'finalize failed after empty pressure traction') + end subroutine check_empty_pressure_traction_noop + + subroutine build_case() + call sph_initialize(ierr) + call assert_ok(ierr, 'initialize failed for solver order') + call sph_read_inp('tests/data/coupling_load_mode_081.inp', ierr) + call assert_ok(ierr, 'read failed for solver order') + call sph_build_model(ierr) + call assert_ok(ierr, 'build failed for solver order') + end subroutine build_case + + 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 assert_close(actual, expected, message) + real(rk), intent(in) :: actual + real(rk), intent(in) :: expected + character(len=*), intent(in) :: message + + if (abs(actual - expected) > max(1.0e-10_rk, abs(expected) * 1.0e-8_rk)) then + call fail(message) + end if + end subroutine assert_close + + subroutine assert_vector_close(actual, expected, message) + real(rk), intent(in) :: actual(SPH_NDIM) + real(rk), intent(in) :: expected(SPH_NDIM) + character(len=*), intent(in) :: message + integer :: i + + do i = 1, SPH_NDIM + call assert_close(actual(i), expected(i), message) + end do + end subroutine assert_vector_close + + subroutine fail(message) + character(len=*), intent(in) :: message + + write(*, '(A)') trim(message) + stop 1 + end subroutine fail + +end program test_coupling_solver_order_081 diff --git a/tests/module/test_coupling_stale_epoch_081.f90 b/tests/module/test_coupling_stale_epoch_081.f90 new file mode 100644 index 0000000..2a7d615 --- /dev/null +++ b/tests/module/test_coupling_stale_epoch_081.f90 @@ -0,0 +1,107 @@ +program test_coupling_stale_epoch_081 + use sph_precision, only: rk, SPH_NDIM + use sph_error, only: SPH_SUCCESS + use sph_api, only: sph_initialize, sph_finalize, sph_read_inp, sph_build_model + use sph_database, only: SPH_COUPLING_DISTRIBUTION_AREA + use sph_coupling_interface, only: coupling_contact_flag, coupling_external_force, & + sph_coupling_apply_contact_state, sph_coupling_apply_facet_pressures, & + sph_coupling_clear_imports, sph_coupling_get_contact_diagnostics + implicit none + + integer :: ierr + + call sph_initialize(ierr) + call assert_ok(ierr, 'initialize failed for stale epoch') + call sph_read_inp('tests/data/coupling_load_mode_081.inp', ierr) + call assert_ok(ierr, 'read failed for stale epoch') + call sph_build_model(ierr) + call assert_ok(ierr, 'build failed for stale epoch') + + call check_contact_stale_clear() + call check_pressure_stale_clear() + + call sph_finalize(ierr) + call assert_ok(ierr, 'finalize failed for stale epoch') + +contains + + subroutine check_contact_stale_clear() + integer :: ids(1) + real(rk) :: normals(SPH_NDIM,1) + real(rk) :: gaps(1) + real(rk) :: penetrations(1) + real(rk) :: contact_pressures(1) + integer :: active_count + integer :: skipped_count + integer :: stale_count + integer :: repeated_count + integer :: nonfinite_count + integer :: bad_area_count + integer :: invalid_weight_count + real(rk) :: max_penetration + + ids(1) = 1 + normals(:,1) = (/ 0.0_rk, 0.0_rk, 1.0_rk /) + gaps(1) = 0.0_rk + penetrations(1) = 1.0e-3_rk + contact_pressures(1) = 5.0_rk + call sph_coupling_apply_contact_state(1, 1, ids, normals, gaps, & + penetrations, contact_pressures, 301, ierr) + call assert_ok(ierr, 'contact import failed for stale epoch') + call sph_coupling_clear_imports(ierr) + call assert_ok(ierr, 'clear imports failed after contact state') + if (maxval(coupling_contact_flag) /= 0) then + call fail('contact cache was not cleared') + end if + call sph_coupling_get_contact_diagnostics(active_count, skipped_count, & + max_penetration, stale_count, repeated_count, nonfinite_count, & + bad_area_count, invalid_weight_count, ierr) + call assert_ok(ierr, 'contact stale diagnostics failed') + if (active_count /= 0) call fail('active contact count was not cleared') + if (stale_count <= 0) call fail('contact stale count missing') + end subroutine check_contact_stale_clear + + subroutine check_pressure_stale_clear() + integer :: ids(1) + real(rk) :: pressures(1) + integer :: active_count + integer :: skipped_count + integer :: stale_count + integer :: repeated_count + integer :: nonfinite_count + integer :: bad_area_count + integer :: invalid_weight_count + real(rk) :: max_penetration + + ids(1) = 1 + pressures(1) = 10.0_rk + call sph_coupling_apply_facet_pressures(1, 1, ids, pressures, & + SPH_COUPLING_DISTRIBUTION_AREA, 302, ierr) + call assert_ok(ierr, 'pressure import failed for stale epoch') + call sph_coupling_clear_imports(ierr) + call assert_ok(ierr, 'clear imports failed after pressure') + if (maxval(abs(coupling_external_force)) > 0.0_rk) then + call fail('pressure force cache was not cleared') + end if + call sph_coupling_get_contact_diagnostics(active_count, skipped_count, & + max_penetration, stale_count, repeated_count, nonfinite_count, & + bad_area_count, invalid_weight_count, ierr) + call assert_ok(ierr, 'pressure stale diagnostics failed') + if (stale_count < 2) call fail('pressure stale count missing') + end subroutine check_pressure_stale_clear + + 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_coupling_stale_epoch_081 diff --git a/todo.md b/todo.md index 99c1cdf..701d1bd 100644 --- a/todo.md +++ b/todo.md @@ -121,39 +121,39 @@ ## 阶段 D:显式步接入、接触诊断和回归隔离 -- [ ] 将 pressure 分配后的粒子力接入 coupling 外力缓存。 -- [ ] 将 traction 分配后的粒子力接入 coupling 外力缓存。 -- [ ] 将 resultant 分配后的粒子力接入 coupling 外力缓存。 -- [ ] 固定 particle force、facet force、pressure、traction 和 motion boundary 的施加顺序。 -- [ ] 固定 coupling 外载荷与 blast 外载荷的叠加顺序。 -- [ ] 确认 coupling 外载荷缓存独立于 blast 外载荷缓存。 -- [ ] 记录 active contact 数量。 -- [ ] 记录 skipped contact 数量。 -- [ ] 记录最大 penetration。 -- [ ] 记录 stale epoch 计数。 -- [ ] 记录重复导入计数。 -- [ ] 记录 nonfinite contact import 计数。 -- [ ] 记录负面积或零面积 facet 计数。 -- [ ] 记录非法权重计数。 -- [ ] 将 contact diagnostics 合入 coupling diagnostics 查询。 -- [ ] 确认无 active contact 时安全跳过。 -- [ ] 确认 disabled coupling region 不影响显式步。 -- [ ] 确认空 pressure/traction 导入不产生虚假加速度。 -- [ ] 确认 Water-only 回归不被 0.8.1 coupling 路径污染。 -- [ ] 确认 Gas-only 回归不被 0.8.1 coupling 路径污染。 -- [ ] 确认 Explosive 回归不被 0.8.1 coupling 路径污染。 -- [ ] 确认 Solid-only 回归不被 0.8.1 coupling 路径污染。 -- [ ] 确认 Shell-only 回归不被 0.8.1 coupling 路径污染。 -- [ ] 新增 `coupling_contact_diagnostics_081` 测试。 -- [ ] 新增 `coupling_solver_order_081` 测试。 -- [ ] 新增 `coupling_stale_epoch_081` 测试。 -- [ ] 新增 `coupling_solid_surface_pressure_081` 测试。 -- [ ] 新增 `coupling_shell_pressure_081` 测试。 -- [ ] 新增 `coupling_mixed_pressure_motion_081` 测试。 -- [ ] 将阶段 D 新测试接入 CTest。 -- [ ] 运行阶段 D 显式步和诊断专项测试。 -- [ ] 运行 `git diff --check`。 -- [ ] 准备阶段 D 本地提交说明。 +- [x] 将 pressure 分配后的粒子力接入 coupling 外力缓存。 +- [x] 将 traction 分配后的粒子力接入 coupling 外力缓存。 +- [x] 将 resultant 分配后的粒子力接入 coupling 外力缓存。 +- [x] 固定 particle force、facet force、pressure、traction 和 motion boundary 的施加顺序。 +- [x] 固定 coupling 外载荷与 blast 外载荷的叠加顺序。 +- [x] 确认 coupling 外载荷缓存独立于 blast 外载荷缓存。 +- [x] 记录 active contact 数量。 +- [x] 记录 skipped contact 数量。 +- [x] 记录最大 penetration。 +- [x] 记录 stale epoch 计数。 +- [x] 记录重复导入计数。 +- [x] 记录 nonfinite contact import 计数。 +- [x] 记录负面积或零面积 facet 计数。 +- [x] 记录非法权重计数。 +- [x] 将 contact diagnostics 合入 coupling diagnostics 查询。 +- [x] 确认无 active contact 时安全跳过。 +- [x] 确认 disabled coupling region 不影响显式步。 +- [x] 确认空 pressure/traction 导入不产生虚假加速度。 +- [x] 确认 Water-only 回归不被 0.8.1 coupling 路径污染。 +- [x] 确认 Gas-only 回归不被 0.8.1 coupling 路径污染。 +- [x] 确认 Explosive 回归不被 0.8.1 coupling 路径污染。 +- [x] 确认 Solid-only 回归不被 0.8.1 coupling 路径污染。 +- [x] 确认 Shell-only 回归不被 0.8.1 coupling 路径污染。 +- [x] 新增 `coupling_contact_diagnostics_081` 测试。 +- [x] 新增 `coupling_solver_order_081` 测试。 +- [x] 新增 `coupling_stale_epoch_081` 测试。 +- [x] 新增 `coupling_solid_surface_pressure_081` 测试。 +- [x] 新增 `coupling_shell_pressure_081` 测试。 +- [x] 新增 `coupling_mixed_pressure_motion_081` 测试。 +- [x] 将阶段 D 新测试接入 CTest。 +- [x] 运行阶段 D 显式步和诊断专项测试。 +- [x] 运行 `git diff --check`。 +- [x] 准备阶段 D 本地提交说明。 ## 阶段 E:Output、Restart、Fortran API 和外部接口层