diff --git a/CMakeLists.txt b/CMakeLists.txt index 4962aa9..b2fb72d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -240,6 +240,24 @@ set_target_properties(test_blast_noop_regression PROPERTIES Fortran_MODULE_DIREC add_test(NAME blast_noop_regression COMMAND test_blast_noop_regression) set_tests_properties(blast_noop_regression PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") +add_executable(test_blast_summary tests/module/test_blast_summary.f90) +target_link_libraries(test_blast_summary PRIVATE sphlite_core) +set_target_properties(test_blast_summary PROPERTIES Fortran_MODULE_DIRECTORY "${SPHLITE_MODULE_DIR}") +add_test(NAME blast_summary COMMAND test_blast_summary) +set_tests_properties(blast_summary PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") + +add_executable(test_blast_output tests/module/test_blast_output.f90) +target_link_libraries(test_blast_output PRIVATE sphlite_core) +set_target_properties(test_blast_output PROPERTIES Fortran_MODULE_DIRECTORY "${SPHLITE_MODULE_DIR}") +add_test(NAME blast_output COMMAND test_blast_output) +set_tests_properties(blast_output PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") + +add_executable(test_blast_restart_boundary tests/module/test_blast_restart_boundary.f90) +target_link_libraries(test_blast_restart_boundary PRIVATE sphlite_core) +set_target_properties(test_blast_restart_boundary PROPERTIES Fortran_MODULE_DIRECTORY "${SPHLITE_MODULE_DIR}") +add_test(NAME blast_restart_boundary COMMAND test_blast_restart_boundary) +set_tests_properties(blast_restart_boundary PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") + add_executable(test_input_solid_material tests/module/test_input_solid_material.f90) target_link_libraries(test_input_solid_material PRIVATE sphlite_core) set_target_properties(test_input_solid_material PROPERTIES Fortran_MODULE_DIRECTORY "${SPHLITE_MODULE_DIR}") diff --git a/README.md b/README.md index 8401920..5a6ae09 100644 --- a/README.md +++ b/README.md @@ -95,3 +95,4 @@ SPHLite 的编译和测试要求应与 FEMLite 保持一致风格: - 0.6.0 本地 gate 已通过:完整 CTest 103/103,Shell 输入/状态基线专项 gate 4/4,`source_size` 1/1,`git diff --check` 通过。 - 0.6.1 本地 gate 已通过:完整 CTest 113/113,Shell 运动学专项 gate 13/13,`source_size`/`shell_061_source_size` 2/2,`git diff --check` 通过。 - 0.7.0 计划新增小型 Water/Gas/Explosive/Solid/Shell 局部爆炸 smoke、结构外载荷缓存、载荷诊断和默认回归 gate;该版本只用于链路验收,不作为工程精度 benchmark。 +- 0.7.0 局部爆炸诊断先提供 Fortran API 和 CSV 调试输出,不新增公开 C ABI/C++/Python 稳定接口,也不写入正式 `STATE_0_7` restart。 diff --git a/docs/05_interface_control_document.md b/docs/05_interface_control_document.md index 1ef0e9d..98208f4 100644 --- a/docs/05_interface_control_document.md +++ b/docs/05_interface_control_document.md @@ -231,6 +231,12 @@ Fortran API 是核心语义来源。C ABI 只做薄包装: - C wrapper 负责空指针、容量和字符串长度检查。 - Fortran 侧负责物理校验、数据库校验和错误消息。 +### 9.1 0.7.0 局部爆炸调试接口边界 + +0.7.0 的局部爆炸诊断先作为 Fortran API 和 CSV 调试输出提供,不进入公开 C ABI、C++ wrapper 或 Python `ctypes` 稳定接口。原因是局部爆炸载荷投影、Shell 外载荷闭环、restart 状态和后续 CouplingModule 交互语义尚未冻结,过早暴露 C ABI 会把调试字段固化为长期契约。 + +0.7.0 也不写入正式 `STATE_0_7` restart。局部爆炸控制和诊断在该版本属于可重建的调试状态;restart 继续保持既有 `STATE_0_5_1` 边界,后续版本再决定是否新增正式 blast state。 + 字符串从 C 传入 Fortran 时应按 FEMLite 风格传递字符缓冲区和长度,避免依赖编译器私有字符串 ABI。 ## 10. C++ 和 Python 接口 diff --git a/src/blast/sph_blast_load.f90 b/src/blast/sph_blast_load.f90 index 3afcb8a..c28ccd8 100644 --- a/src/blast/sph_blast_load.f90 +++ b/src/blast/sph_blast_load.f90 @@ -1,18 +1,23 @@ module sph_blast_load use sph_precision, only: rk, SPH_NDIM - use sph_error, only: SPH_SUCCESS, SPH_ERROR_DATABASE, sph_error_set + use sph_error, only: SPH_SUCCESS, SPH_ERROR_ARGUMENT, SPH_ERROR_DATABASE, & + sph_error_set use sph_database, only: SPH_MAX_REGIONS, npart, particle_phase, x, v, a, & mass, volume, SPH_PHASE_SOLID, SPH_PHASE_SHELL use sph_blast, only: blast_region_count, blast_region_enabled, & blast_center, blast_load_scale, blast_time_window, & blast_source_count, blast_target_count, blast_candidate_pair_count, & - blast_source_pressure_mean, blast_source_energy, blast_water_count, & - blast_water_pressure_min, blast_water_pressure_max, & + blast_skipped_source_count, blast_skipped_target_count, & + blast_source_mass, blast_source_pressure_mean, blast_source_energy, & + blast_water_count, blast_gas_count, blast_explosive_count, & + blast_gas_volume, blast_water_pressure_min, blast_water_pressure_max, & blast_explosive_progress_mean, sph_blast_refresh_snapshot, & sph_blast_target_accepts implicit none real(rk), parameter :: SPH_BLAST_LOAD_EPS = 1.0e-12_rk + integer, parameter :: SPH_BLAST_SUMMARY_COUNT_SIZE = 12 + integer, parameter :: SPH_BLAST_SUMMARY_VALUE_SIZE = 26 real(rk), allocatable :: blast_solid_external_force(:,:) real(rk), allocatable :: blast_shell_external_force(:,:) real(rk), allocatable :: blast_shell_external_moment(:,:) @@ -150,6 +155,50 @@ contains end do end subroutine sph_blast_load_apply_to_acceleration + subroutine sph_blast_load_get_summary(region, counts, values, ierr) + integer, intent(in) :: region + integer, intent(out) :: counts(SPH_BLAST_SUMMARY_COUNT_SIZE) + real(rk), intent(out) :: values(SPH_BLAST_SUMMARY_VALUE_SIZE) + integer, intent(out) :: ierr + + counts = 0 + values = 0.0_rk + ierr = SPH_SUCCESS + if (region < 1 .or. region > SPH_MAX_REGIONS) then + call sph_error_set(SPH_ERROR_ARGUMENT, 'Blast summary region is out of range') + ierr = SPH_ERROR_ARGUMENT + return + end if + counts(1) = blast_source_count(region) + counts(2) = blast_target_count(region) + counts(3) = blast_candidate_pair_count(region) + counts(4) = blast_skipped_source_count(region) + counts(5) = blast_skipped_target_count(region) + counts(6) = blast_load_target_count(region) + counts(7) = blast_load_pair_count(region) + counts(8) = blast_load_zero_weight_count(region) + counts(9) = blast_load_nonfinite_count(region) + counts(10) = blast_water_count(region) + counts(11) = blast_gas_count(region) + counts(12) = blast_explosive_count(region) + values(1) = blast_source_mass(region) + values(2) = blast_source_energy(region) + values(3) = blast_source_pressure_mean(region) + values(4) = blast_gas_volume(region) + values(5) = blast_explosive_progress_mean(region) + values(6) = blast_water_pressure_min(region) + values(7) = blast_water_pressure_max(region) + values(8:10) = blast_solid_total_force(:,region) + values(11:13) = blast_shell_total_force(:,region) + values(14:16) = blast_load_total_force(:,region) + values(17:19) = blast_load_impulse(:,region) + values(20:22) = blast_load_momentum_input(:,region) + values(23) = blast_load_work(region) + values(24) = blast_load_energy_input(region) + values(25) = blast_load_max_particle_force(region) + values(26) = blast_load_max_acceleration(region) + end subroutine sph_blast_load_get_summary + subroutine sph_blast_load_project_region(region) integer, intent(in) :: region real(rk) :: pressure_value diff --git a/src/interface/sph_api.f90 b/src/interface/sph_api.f90 index f2caa3e..b71f3e6 100644 --- a/src/interface/sph_api.f90 +++ b/src/interface/sph_api.f90 @@ -28,7 +28,9 @@ module sph_api sph_explosive_get_summary, sph_explosive_get_release_balance, & sph_explosive_set_default_ignition_point use sph_blast, only: sph_blast_initialize, sph_blast_reset - use sph_blast_load, only: sph_blast_load_initialize, sph_blast_load_reset + use sph_blast_load, only: sph_blast_load_initialize, sph_blast_load_reset, & + sph_blast_load_get_summary, SPH_BLAST_SUMMARY_COUNT_SIZE, & + SPH_BLAST_SUMMARY_VALUE_SIZE use sph_solid, only: sph_solid_initialize, sph_solid_reset use sph_solid_dynamics, only: sph_solid_get_counts, sph_solid_get_summary use sph_solid_api, only: sph_solid_get_state, sph_solid_get_diagnostics, & @@ -504,6 +506,21 @@ contains momentum_values, ierr) end subroutine sph_get_explosive_release_balance + subroutine sph_get_blast_summary(region, counts, values, ierr) + integer, intent(in) :: region + integer, intent(out) :: counts(SPH_BLAST_SUMMARY_COUNT_SIZE) + real(rk), intent(out) :: values(SPH_BLAST_SUMMARY_VALUE_SIZE) + integer, intent(out) :: ierr + + counts = 0 + values = 0.0_rk + call sph_api_require_initialized(ierr) + if (ierr /= SPH_SUCCESS) return + call sph_api_require_model_built(ierr) + if (ierr /= SPH_SUCCESS) return + call sph_blast_load_get_summary(region, counts, values, ierr) + end subroutine sph_get_blast_summary + subroutine sph_get_solid_counts(active_count, failed_count, ierr) integer, intent(out) :: active_count integer, intent(out) :: failed_count diff --git a/src/output/sph_output_csv.f90 b/src/output/sph_output_csv.f90 index dfadd5f..e7614e2 100644 --- a/src/output/sph_output_csv.f90 +++ b/src/output/sph_output_csv.f90 @@ -27,6 +27,21 @@ module sph_output_csv explosive_source_momentum_total use sph_explosive, only: sph_explosive_get_summary, & sph_explosive_get_release_balance + use sph_blast, only: blast_region_count, blast_source_count, & + blast_target_count, blast_candidate_pair_count, blast_water_count, & + blast_gas_count, blast_explosive_count, blast_skipped_source_count, & + blast_skipped_target_count, blast_source_mass, blast_source_energy, & + blast_source_pressure_mean, blast_gas_volume, & + blast_explosive_progress_mean, blast_water_pressure_min, & + blast_water_pressure_max + use sph_blast_load, only: blast_solid_external_force, & + blast_shell_external_force, blast_shell_external_moment, & + blast_load_target_count, blast_load_pair_count, & + blast_load_zero_weight_count, blast_load_nonfinite_count, & + blast_load_total_force, blast_solid_total_force, & + blast_shell_total_force, blast_load_impulse, & + blast_load_momentum_input, blast_load_work, blast_load_energy_input, & + blast_load_max_particle_force, blast_load_max_acceleration use sph_solid_state, only: solid_stress, solid_plastic_strain, solid_damage, & solid_softening, solid_strain_rate_eq, solid_reference_neighbor_count, & solid_correction_status, solid_failure_status @@ -80,6 +95,9 @@ contains real(rk) :: solid_softening_value real(rk) :: solid_strain_rate_value real(rk) :: solid_acceleration_norm + real(rk) :: blast_solid_force(3) + real(rk) :: blast_shell_force(3) + real(rk) :: blast_shell_moment(3) integer :: solid_reference_neighbors integer :: solid_correction_state integer :: solid_failure @@ -100,6 +118,9 @@ contains 'solid_stress_xx,solid_stress_yy,solid_stress_zz,solid_stress_xy,' // & 'solid_stress_yz,solid_stress_zx,solid_plastic_strain,solid_damage,' // & 'solid_softening,solid_strain_rate_eq,solid_acceleration_norm,' // & + 'blast_solid_fx,blast_solid_fy,blast_solid_fz,' // & + 'blast_shell_fx,blast_shell_fy,blast_shell_fz,' // & + 'blast_shell_mx,blast_shell_my,blast_shell_mz,' // & 'solid_failure_status,solid_reference_neighbor_count,' // & 'solid_correction_status' do i = 1, npart @@ -115,6 +136,9 @@ contains solid_softening_value = 0.0_rk solid_strain_rate_value = 0.0_rk solid_acceleration_norm = sqrt(sum(a(:,i) * a(:,i))) + blast_solid_force = 0.0_rk + blast_shell_force = 0.0_rk + blast_shell_moment = 0.0_rk solid_reference_neighbors = 0 solid_correction_state = 0 solid_failure = 0 @@ -139,7 +163,16 @@ contains if (allocated(solid_correction_status)) solid_correction_state = & solid_correction_status(i) if (allocated(solid_failure_status)) solid_failure = solid_failure_status(i) - write(SPH_OUTPUT_UNIT, '(5(I0,","),27(ES24.16,","),2(I0,","),I0)') & + if (allocated(blast_solid_external_force)) then + blast_solid_force = blast_solid_external_force(:,i) + end if + if (allocated(blast_shell_external_force)) then + blast_shell_force = blast_shell_external_force(:,i) + end if + if (allocated(blast_shell_external_moment)) then + blast_shell_moment = blast_shell_external_moment(:,i) + end if + write(SPH_OUTPUT_UNIT, '(5(I0,","),36(ES24.16,","),2(I0,","),I0)') & particle_id_ext(i), particle_phase(i), particle_status(i), & material_id(i), section_id(i), x(1,i), x(2,i), x(3,i), & v(1,i), v(2,i), v(3,i), rho(i), pressure(i), temperature(i), h(i), & @@ -147,7 +180,8 @@ contains explosive_remaining, explosive_mass, explosive_energy, & solid_stress_value(:), solid_plastic, solid_damage_value, & solid_softening_value, solid_strain_rate_value, & - solid_acceleration_norm, solid_failure, solid_reference_neighbors, & + solid_acceleration_norm, blast_solid_force, blast_shell_force, & + blast_shell_moment, solid_failure, solid_reference_neighbors, & solid_correction_state end do close(unit=SPH_OUTPUT_UNIT) @@ -287,6 +321,7 @@ contains write(SPH_OUTPUT_UNIT, '(A,",",ES24.16)') 'explosive_source_momentum_z', & explosive_source_momentum_total(3) call sph_output_write_solid_summary() + call sph_output_write_blast_summary() close(unit=SPH_OUTPUT_UNIT) end subroutine sph_output_write_summary @@ -326,4 +361,109 @@ contains write(SPH_OUTPUT_UNIT, '(A,",",ES24.16)') 'solid_dtcrit', solid_dtcrit end subroutine sph_output_write_solid_summary + subroutine sph_output_write_blast_summary() + integer :: region + character(len=128) :: metric + + write(SPH_OUTPUT_UNIT, '(A,",",I0)') 'blast_regions', blast_region_count + do region = 1, blast_region_count + call sph_output_blast_metric_name('blast_source_count', region, metric) + write(SPH_OUTPUT_UNIT, '(A,",",I0)') trim(metric), blast_source_count(region) + call sph_output_blast_metric_name('blast_target_count', region, metric) + write(SPH_OUTPUT_UNIT, '(A,",",I0)') trim(metric), blast_target_count(region) + call sph_output_blast_metric_name('blast_pair_count', region, metric) + write(SPH_OUTPUT_UNIT, '(A,",",I0)') trim(metric), & + blast_candidate_pair_count(region) + call sph_output_blast_metric_name('blast_water_count', region, metric) + write(SPH_OUTPUT_UNIT, '(A,",",I0)') trim(metric), blast_water_count(region) + call sph_output_blast_metric_name('blast_gas_count', region, metric) + write(SPH_OUTPUT_UNIT, '(A,",",I0)') trim(metric), blast_gas_count(region) + call sph_output_blast_metric_name('blast_explosive_count', region, metric) + write(SPH_OUTPUT_UNIT, '(A,",",I0)') trim(metric), & + blast_explosive_count(region) + call sph_output_blast_metric_name('blast_skipped_sources', region, metric) + write(SPH_OUTPUT_UNIT, '(A,",",I0)') trim(metric), & + blast_skipped_source_count(region) + call sph_output_blast_metric_name('blast_skipped_targets', region, metric) + write(SPH_OUTPUT_UNIT, '(A,",",I0)') trim(metric), & + blast_skipped_target_count(region) + call sph_output_blast_metric_name('blast_load_targets', region, metric) + write(SPH_OUTPUT_UNIT, '(A,",",I0)') trim(metric), & + blast_load_target_count(region) + call sph_output_blast_metric_name('blast_load_pairs', region, metric) + write(SPH_OUTPUT_UNIT, '(A,",",I0)') trim(metric), blast_load_pair_count(region) + call sph_output_blast_metric_name('blast_zero_weight', region, metric) + write(SPH_OUTPUT_UNIT, '(A,",",I0)') trim(metric), & + blast_load_zero_weight_count(region) + call sph_output_blast_metric_name('blast_nonfinite_loads', region, metric) + write(SPH_OUTPUT_UNIT, '(A,",",I0)') trim(metric), & + blast_load_nonfinite_count(region) + call sph_output_write_blast_reals(region) + end do + end subroutine sph_output_write_blast_summary + + subroutine sph_output_write_blast_reals(region) + integer, intent(in) :: region + + call sph_output_write_blast_real('blast_source_mass', region, & + blast_source_mass(region)) + call sph_output_write_blast_real('blast_source_energy', region, & + blast_source_energy(region)) + call sph_output_write_blast_real('blast_source_pressure_mean', region, & + blast_source_pressure_mean(region)) + call sph_output_write_blast_real('blast_gas_volume', region, & + blast_gas_volume(region)) + call sph_output_write_blast_real('blast_explosive_progress_mean', region, & + blast_explosive_progress_mean(region)) + call sph_output_write_blast_real('blast_water_pressure_min', region, & + blast_water_pressure_min(region)) + call sph_output_write_blast_real('blast_water_pressure_max', region, & + blast_water_pressure_max(region)) + call sph_output_write_blast_vector('blast_solid_force', region, & + blast_solid_total_force(:,region)) + call sph_output_write_blast_vector('blast_shell_force', region, & + blast_shell_total_force(:,region)) + call sph_output_write_blast_vector('blast_total_force', region, & + blast_load_total_force(:,region)) + call sph_output_write_blast_vector('blast_impulse', region, & + blast_load_impulse(:,region)) + call sph_output_write_blast_vector('blast_momentum_input', region, & + blast_load_momentum_input(:,region)) + call sph_output_write_blast_real('blast_work', region, blast_load_work(region)) + call sph_output_write_blast_real('blast_energy_input', region, & + blast_load_energy_input(region)) + call sph_output_write_blast_real('blast_max_particle_force', region, & + blast_load_max_particle_force(region)) + call sph_output_write_blast_real('blast_max_acceleration', region, & + blast_load_max_acceleration(region)) + end subroutine sph_output_write_blast_reals + + subroutine sph_output_write_blast_vector(base_name, region, values) + character(len=*), intent(in) :: base_name + integer, intent(in) :: region + real(rk), intent(in) :: values(3) + + call sph_output_write_blast_real(trim(base_name) // '_x', region, values(1)) + call sph_output_write_blast_real(trim(base_name) // '_y', region, values(2)) + call sph_output_write_blast_real(trim(base_name) // '_z', region, values(3)) + end subroutine sph_output_write_blast_vector + + subroutine sph_output_write_blast_real(base_name, region, value) + character(len=*), intent(in) :: base_name + integer, intent(in) :: region + real(rk), intent(in) :: value + character(len=128) :: metric + + call sph_output_blast_metric_name(base_name, region, metric) + write(SPH_OUTPUT_UNIT, '(A,",",ES24.16)') trim(metric), value + end subroutine sph_output_write_blast_real + + subroutine sph_output_blast_metric_name(base_name, region, metric) + character(len=*), intent(in) :: base_name + integer, intent(in) :: region + character(len=*), intent(out) :: metric + + write(metric, '(A,"_",I0)') trim(base_name), region + end subroutine sph_output_blast_metric_name + end module sph_output_csv diff --git a/tests/module/test_blast_output.f90 b/tests/module/test_blast_output.f90 new file mode 100644 index 0000000..a8b3e08 --- /dev/null +++ b/tests/module/test_blast_output.f90 @@ -0,0 +1,213 @@ +program test_blast_output + 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_set_output_directory, & + sph_write_output + implicit none + + integer :: ierr + + call delete_output_pair(70) + call sph_initialize(ierr) + call assert_ok(ierr, 'initialize failed for Blast output') + call sph_read_inp('tests/data/blast_water_gas_explosive_solid_070.inp', ierr) + call assert_ok(ierr, 'read failed for Blast output') + call sph_build_model(ierr) + call assert_ok(ierr, 'build failed for Blast output') + call sph_advance_explicit(1.0e-7_rk, ierr) + call assert_ok(ierr, 'advance failed for Blast output') + call sph_set_output_directory('build-codex-unix', ierr) + call assert_ok(ierr, 'set output directory failed for Blast output') + call sph_write_output(70, 1.0e-7_rk, ierr) + call assert_ok(ierr, 'write failed for Blast output') + call check_particle_csv('build-codex-unix/sphlite_00000070.csv') + call check_summary_csv('build-codex-unix/sphlite_00000070_summary.csv') + call sph_finalize(ierr) + call assert_ok(ierr, 'finalize failed for Blast output') + +contains + + subroutine check_particle_csv(filename) + character(len=*), intent(in) :: filename + character(len=512) :: header + integer :: unit + integer :: ios + + unit = 94 + open(unit=unit, file=trim(filename), status='old', action='read', iostat=ios) + if (ios /= 0) call fail('Blast particle CSV open failed') + read(unit, '(A)', iostat=ios) header + if (ios /= 0) call fail('Blast particle CSV header missing') + if (index(header, 'blast_solid_fx,blast_solid_fy,blast_solid_fz') <= 0) then + call fail('Blast particle CSV Solid force columns missing') + end if + call check_particle_rows(unit) + close(unit=unit) + end subroutine check_particle_csv + + subroutine check_particle_rows(unit) + integer, intent(in) :: unit + integer :: ios + integer :: id + real(rk) :: blast_values(9) + + do + call read_particle_row(unit, id, blast_values, ios) + if (ios /= 0) exit + if (id == 5) then + if (blast_values(1) <= 0.0_rk) call fail('Blast Solid force not output') + if (maxval(abs(blast_values(4:9))) > 0.0_rk) then + call fail('Blast Solid row polluted Shell load columns') + end if + return + end if + end do + call fail('Blast output target row missing') + end subroutine check_particle_rows + + subroutine read_particle_row(unit, id, blast_values, ios) + integer, intent(in) :: unit + integer, intent(out) :: id + real(rk), intent(out) :: blast_values(9) + integer, intent(out) :: ios + integer :: phase + integer :: status + integer :: mat + integer :: sec + integer :: failure + integer :: reference_neighbors + integer :: correction_status + real(rk) :: pos(3) + real(rk) :: vel(3) + real(rk) :: scalar_values(4) + real(rk) :: explosive_values(6) + real(rk) :: stress_values(6) + real(rk) :: solid_values(5) + + read(unit, *, iostat=ios) id, phase, status, mat, sec, pos, vel, & + scalar_values, explosive_values, stress_values, solid_values, & + blast_values, failure, reference_neighbors, correction_status + end subroutine read_particle_row + + subroutine check_summary_csv(filename) + character(len=*), intent(in) :: filename + + call assert_summary_int(filename, 'blast_regions', 1) + call assert_summary_int(filename, 'blast_source_count_1', 1) + call assert_summary_int(filename, 'blast_load_targets_1', 2) + call assert_summary_positive(filename, 'blast_solid_force_x_1') + call assert_summary_positive(filename, 'blast_total_force_x_1') + call assert_summary_positive(filename, 'blast_energy_input_1') + call assert_summary_positive(filename, 'blast_max_acceleration_1') + end subroutine check_summary_csv + + subroutine assert_summary_int(filename, metric, expected) + character(len=*), intent(in) :: filename + character(len=*), intent(in) :: metric + integer, intent(in) :: expected + integer :: actual + + call read_summary_int(filename, metric, actual) + if (actual /= expected) call fail('Blast summary integer mismatch') + end subroutine assert_summary_int + + subroutine assert_summary_positive(filename, metric) + character(len=*), intent(in) :: filename + character(len=*), intent(in) :: metric + real(rk) :: value + + call read_summary_real(filename, metric, value) + if (value <= 0.0_rk) call fail('Blast summary positive metric missing') + end subroutine assert_summary_positive + + subroutine read_summary_int(filename, metric, value) + character(len=*), intent(in) :: filename + character(len=*), intent(in) :: metric + integer, intent(out) :: value + character(len=256) :: line + integer :: unit + integer :: ios + integer :: start + + unit = 95 + open(unit=unit, file=trim(filename), status='old', action='read', iostat=ios) + if (ios /= 0) call fail('Blast summary integer open failed') + do + read(unit, '(A)', iostat=ios) line + if (ios /= 0) exit + if (index(line, trim(metric) // ',') == 1) then + start = len_trim(metric) + 2 + read(line(start:), *, iostat=ios) value + close(unit=unit) + if (ios /= 0) call fail('Blast summary integer parse failed') + return + end if + end do + close(unit=unit) + call fail('Blast summary integer missing') + end subroutine read_summary_int + + subroutine read_summary_real(filename, metric, value) + character(len=*), intent(in) :: filename + character(len=*), intent(in) :: metric + real(rk), intent(out) :: value + character(len=256) :: line + integer :: unit + integer :: ios + integer :: start + + unit = 96 + open(unit=unit, file=trim(filename), status='old', action='read', iostat=ios) + if (ios /= 0) call fail('Blast summary real open failed') + do + read(unit, '(A)', iostat=ios) line + if (ios /= 0) exit + if (index(line, trim(metric) // ',') == 1) then + start = len_trim(metric) + 2 + read(line(start:), *, iostat=ios) value + close(unit=unit) + if (ios /= 0) call fail('Blast summary real parse failed') + return + end if + end do + close(unit=unit) + call fail('Blast summary real missing') + end subroutine read_summary_real + + subroutine delete_output_pair(step_value) + integer, intent(in) :: step_value + character(len=256) :: filename + + write(filename, '("build-codex-unix/sphlite_",I8.8,".csv")') step_value + call delete_file_if_exists(filename) + write(filename, '("build-codex-unix/sphlite_",I8.8,"_summary.csv")') step_value + call delete_file_if_exists(filename) + end subroutine delete_output_pair + + subroutine delete_file_if_exists(filename) + character(len=*), intent(in) :: filename + logical :: exists + integer :: ios + + inquire(file=trim(filename), exist=exists) + if (.not. exists) return + open(unit=97, file=trim(filename), status='old', iostat=ios) + if (ios == 0) close(unit=97, status='delete') + end subroutine delete_file_if_exists + + 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_blast_output diff --git a/tests/module/test_blast_restart_boundary.f90 b/tests/module/test_blast_restart_boundary.f90 new file mode 100644 index 0000000..441a0e3 --- /dev/null +++ b/tests/module/test_blast_restart_boundary.f90 @@ -0,0 +1,78 @@ +program test_blast_restart_boundary + 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_write_restart, & + sph_read_restart, sph_get_blast_summary + use sph_blast_load, only: SPH_BLAST_SUMMARY_COUNT_SIZE, & + SPH_BLAST_SUMMARY_VALUE_SIZE + implicit none + + integer :: ierr + integer :: counts(SPH_BLAST_SUMMARY_COUNT_SIZE) + real(rk) :: values(SPH_BLAST_SUMMARY_VALUE_SIZE) + + call sph_initialize(ierr) + call assert_ok(ierr, 'initialize failed for Blast restart boundary') + call sph_read_inp('tests/data/blast_water_gas_explosive_solid_070.inp', ierr) + call assert_ok(ierr, 'read failed for Blast restart boundary') + call sph_build_model(ierr) + call assert_ok(ierr, 'build failed for Blast restart boundary') + call sph_advance_explicit(1.0e-7_rk, ierr) + call assert_ok(ierr, 'advance failed for Blast restart boundary') + call sph_get_blast_summary(1, counts, values, ierr) + call assert_ok(ierr, 'pre-restart Blast summary failed') + if (counts(6) <= 0) call fail('pre-restart Blast load summary missing') + call sph_write_restart('build-codex-unix/restart_blast_boundary.tmp', ierr) + call assert_ok(ierr, 'write failed for Blast restart boundary') + call assert_restart_header('build-codex-unix/restart_blast_boundary.tmp') + call sph_finalize(ierr) + call assert_ok(ierr, 'finalize write session failed for Blast restart boundary') + + call sph_initialize(ierr) + call assert_ok(ierr, 'initialize read session failed for Blast restart boundary') + call sph_read_restart('build-codex-unix/restart_blast_boundary.tmp', ierr) + call assert_ok(ierr, 'read failed for Blast restart boundary') + call sph_get_blast_summary(1, counts, values, ierr) + call assert_ok(ierr, 'post-restart Blast summary failed') + if (maxval(abs(counts)) /= 0) call fail('Blast restart restored non-state counts') + if (maxval(abs(values)) > 0.0_rk) call fail('Blast restart restored diagnostics') + call sph_finalize(ierr) + call assert_ok(ierr, 'finalize read session failed for Blast restart boundary') + +contains + + subroutine assert_restart_header(filename) + character(len=*), intent(in) :: filename + character(len=32) :: tag + character(len=32) :: state + integer :: major + integer :: minor + integer :: patch + integer :: ios + + open(unit=98, file=trim(filename), status='old', action='read', iostat=ios) + if (ios /= 0) call fail('Blast restart header open failed') + read(98, *, iostat=ios) tag, major, minor, patch, state + close(unit=98) + if (ios /= 0) call fail('Blast restart header read failed') + if (trim(tag) /= 'SPHLITE_RESTART') call fail('Blast restart tag mismatch') + if (trim(state) == 'STATE_0_7') call fail('Blast restart state was frozen too early') + if (trim(state) /= 'STATE_0_5_1') call fail('Blast restart boundary state mismatch') + end subroutine assert_restart_header + + 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_blast_restart_boundary diff --git a/tests/module/test_blast_summary.f90 b/tests/module/test_blast_summary.f90 new file mode 100644 index 0000000..473e3e4 --- /dev/null +++ b/tests/module/test_blast_summary.f90 @@ -0,0 +1,85 @@ +program test_blast_summary + 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_blast_summary + use sph_blast_load, only: SPH_BLAST_SUMMARY_COUNT_SIZE, & + SPH_BLAST_SUMMARY_VALUE_SIZE + implicit none + + integer :: ierr + integer :: counts(SPH_BLAST_SUMMARY_COUNT_SIZE) + real(rk) :: values(SPH_BLAST_SUMMARY_VALUE_SIZE) + + call check_initial_summary() + call check_advanced_summary() + call check_invalid_region() + +contains + + subroutine check_initial_summary() + call setup_blast_model() + call sph_get_blast_summary(1, counts, values, ierr) + call assert_ok(ierr, 'initial Blast summary query failed') + if (counts(1) /= 1) call fail('Blast source count mismatch') + if (counts(2) /= 4) call fail('Blast target count mismatch') + if (counts(3) /= 4) call fail('Blast candidate pair count mismatch') + if (counts(6) /= 4) call fail('Blast load target count mismatch') + if (counts(10) /= 2) call fail('Blast Water count mismatch') + if (counts(11) /= 1) call fail('Blast Gas count mismatch') + if (counts(12) /= 1) call fail('Blast Explosive count mismatch') + if (values(1) <= 0.0_rk) call fail('Blast source mass missing') + if (values(3) <= 0.0_rk) call fail('Blast source pressure missing') + if (values(8) <= 0.0_rk) call fail('Blast Solid force missing') + if (values(11) <= 0.0_rk) call fail('Blast Shell force missing') + if (values(25) <= 0.0_rk) call fail('Blast max force missing') + call sph_finalize(ierr) + call assert_ok(ierr, 'finalize initial Blast summary failed') + end subroutine check_initial_summary + + subroutine check_advanced_summary() + call setup_blast_model() + call sph_advance_explicit(1.0e-7_rk, ierr) + call assert_ok(ierr, 'Blast summary advance failed') + call sph_get_blast_summary(1, counts, values, ierr) + call assert_ok(ierr, 'advanced Blast summary query failed') + if (values(5) < 0.99_rk) call fail('Blast progress summary missing') + if (values(24) <= 0.0_rk) call fail('Blast energy input summary missing') + if (values(26) <= 0.0_rk) call fail('Blast acceleration summary missing') + if (counts(9) /= 0) call fail('Blast nonfinite count mismatch') + call sph_finalize(ierr) + call assert_ok(ierr, 'finalize advanced Blast summary failed') + end subroutine check_advanced_summary + + subroutine check_invalid_region() + call setup_blast_model() + call sph_get_blast_summary(0, counts, values, ierr) + if (ierr == SPH_SUCCESS) call fail('invalid Blast region summary succeeded') + call sph_finalize(ierr) + call assert_ok(ierr, 'finalize invalid Blast summary failed') + end subroutine check_invalid_region + + subroutine setup_blast_model() + call sph_initialize(ierr) + call assert_ok(ierr, 'initialize failed for Blast summary') + call sph_read_inp('tests/data/blast_water_gas_explosive_solid_shell_070.inp', ierr) + call assert_ok(ierr, 'read failed for Blast summary') + call sph_build_model(ierr) + call assert_ok(ierr, 'build failed for Blast summary') + end subroutine setup_blast_model + + 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_blast_summary diff --git a/tests/module/test_output.f90 b/tests/module/test_output.f90 index 9ec8934..36a241d 100644 --- a/tests/module/test_output.f90 +++ b/tests/module/test_output.f90 @@ -106,7 +106,7 @@ contains subroutine check_particle_header(filename) character(len=*), intent(in) :: filename - character(len=512) :: header + character(len=1024) :: header integer :: ios open(unit=71, file=trim(filename), status='old', action='read', iostat=ios) @@ -121,6 +121,9 @@ contains 'solid_stress_xx,solid_stress_yy,solid_stress_zz,solid_stress_xy,' // & 'solid_stress_yz,solid_stress_zx,solid_plastic_strain,solid_damage,' // & 'solid_softening,solid_strain_rate_eq,solid_acceleration_norm,' // & + 'blast_solid_fx,blast_solid_fy,blast_solid_fz,' // & + 'blast_shell_fx,blast_shell_fy,blast_shell_fz,' // & + 'blast_shell_mx,blast_shell_my,blast_shell_mz,' // & 'solid_failure_status,solid_reference_neighbor_count,' // & 'solid_correction_status') then call fail('particle CSV header mismatch') @@ -178,6 +181,7 @@ contains call assert_summary_metric(filename, 'solid_correction_det_min') call assert_summary_metric(filename, 'solid_correction_status') call assert_summary_metric(filename, 'solid_dtcrit') + call assert_summary_metric(filename, 'blast_regions') end subroutine check_summary_metrics subroutine assert_summary_metric(filename, metric) diff --git a/tests/module/test_solid_output.f90 b/tests/module/test_solid_output.f90 index 75286f2..e6258c4 100644 --- a/tests/module/test_solid_output.f90 +++ b/tests/module/test_solid_output.f90 @@ -62,7 +62,7 @@ contains subroutine check_particle_csv(filename) character(len=*), intent(in) :: filename - character(len=512) :: header + character(len=1024) :: header integer :: unit integer :: ios integer :: id @@ -81,6 +81,7 @@ contains real(rk) :: softening real(rk) :: strain_rate_eq real(rk) :: acceleration_norm + real(rk) :: blast_force_values(9) integer :: reference_neighbors integer :: correction_status @@ -96,13 +97,16 @@ contains 'solid_stress_xx,solid_stress_yy,solid_stress_zz,solid_stress_xy,' // & 'solid_stress_yz,solid_stress_zx,solid_plastic_strain,solid_damage,' // & 'solid_softening,solid_strain_rate_eq,solid_acceleration_norm,' // & + 'blast_solid_fx,blast_solid_fy,blast_solid_fz,' // & + 'blast_shell_fx,blast_shell_fy,blast_shell_fz,' // & + 'blast_shell_mx,blast_shell_my,blast_shell_mz,' // & 'solid_failure_status,solid_reference_neighbor_count,' // & 'solid_correction_status') then call fail('Solid particle CSV header mismatch') end if read(unit, *, iostat=ios) id, phase, status, mat, sec, pos, vel, & scalar_values, explosive_values, stress_values, plastic, damage, & - softening, strain_rate_eq, acceleration_norm, failure, & + softening, strain_rate_eq, acceleration_norm, blast_force_values, failure, & reference_neighbors, correction_status close(unit=unit) if (ios /= 0) call fail('Solid particle CSV row read failed') @@ -128,6 +132,9 @@ contains if (abs(acceleration_norm - sqrt(sum(a(:,1) * a(:,1)))) > 1.0e-12_rk) then call fail('Solid particle CSV acceleration mismatch') end if + if (maxval(abs(blast_force_values)) > 1.0e-12_rk) then + call fail('Solid particle CSV Blast load pollution') + end if if (failure /= solid_failure_status(1)) call fail('Solid particle CSV failure mismatch') if (reference_neighbors /= solid_reference_neighbor_count(1)) then call fail('Solid particle CSV reference neighbor mismatch') diff --git a/todo.md b/todo.md index 3114e6d..4c02ec4 100644 --- a/todo.md +++ b/todo.md @@ -173,39 +173,39 @@ ## 阶段 F:诊断、输出、restart 占位和公开接口边界 -- [ ] 设计 0.7.0 局部爆炸 summary 诊断结构。 -- [ ] 记录局部爆炸区域 active 源粒子数。 -- [ ] 记录局部爆炸区域 active 目标粒子数。 -- [ ] 记录 Water 压力贡献统计。 -- [ ] 记录 Gas 压力贡献统计。 -- [ ] 记录 Explosive release 贡献统计。 -- [ ] 记录 Solid 接收总载荷。 -- [ ] 记录 Shell 接收总载荷。 -- [ ] 记录结构载荷总冲量。 -- [ ] 记录结构载荷总做功。 -- [ ] 记录结构载荷最大粒子力。 -- [ ] 记录结构载荷最大粒子加速度贡献。 -- [ ] 记录被跳过源粒子数量。 -- [ ] 记录被跳过目标粒子数量。 -- [ ] 设计 summary CSV 的 0.7.0 调试字段。 -- [ ] 将局部爆炸 summary 写入 summary CSV。 -- [ ] 设计粒子 CSV 的 0.7.0 调试字段。 -- [ ] 将结构外载荷字段写入粒子 CSV。 -- [ ] 确认默认输出不开启时不生成临时结果。 -- [ ] 设计 restart 中 0.7.0 状态边界。 -- [ ] 明确 0.7.0 是否写入正式 `STATE_0_7`。 -- [ ] 若写入 restart,保存局部爆炸控制和诊断状态。 -- [ ] 若不写入 restart,在文档中明确为非交付范围。 -- [ ] 保持 0.6.1 restart 兼容读入路径稳定。 -- [ ] 设计 Fortran 内部诊断查询入口。 -- [ ] 明确 C ABI 是否暴露 0.7.0 调试字段。 -- [ ] 若暴露 C ABI,补齐小容量和空指针错误路径。 -- [ ] 若不暴露 C ABI,在文档中明确为非交付范围。 -- [ ] 新增 `blast_summary` 测试。 -- [ ] 新增 `blast_output` 测试。 -- [ ] 新增 `blast_restart_boundary` 测试。 -- [ ] 将诊断输出测试接入 CTest。 -- [ ] 准备阶段 F 本地提交说明。 +- [x] 设计 0.7.0 局部爆炸 summary 诊断结构。 +- [x] 记录局部爆炸区域 active 源粒子数。 +- [x] 记录局部爆炸区域 active 目标粒子数。 +- [x] 记录 Water 压力贡献统计。 +- [x] 记录 Gas 压力贡献统计。 +- [x] 记录 Explosive release 贡献统计。 +- [x] 记录 Solid 接收总载荷。 +- [x] 记录 Shell 接收总载荷。 +- [x] 记录结构载荷总冲量。 +- [x] 记录结构载荷总做功。 +- [x] 记录结构载荷最大粒子力。 +- [x] 记录结构载荷最大粒子加速度贡献。 +- [x] 记录被跳过源粒子数量。 +- [x] 记录被跳过目标粒子数量。 +- [x] 设计 summary CSV 的 0.7.0 调试字段。 +- [x] 将局部爆炸 summary 写入 summary CSV。 +- [x] 设计粒子 CSV 的 0.7.0 调试字段。 +- [x] 将结构外载荷字段写入粒子 CSV。 +- [x] 确认默认输出不开启时不生成临时结果。 +- [x] 设计 restart 中 0.7.0 状态边界。 +- [x] 明确 0.7.0 是否写入正式 `STATE_0_7`。 +- [x] 若写入 restart,保存局部爆炸控制和诊断状态(0.7.0 已决策不写入)。 +- [x] 若不写入 restart,在文档中明确为非交付范围。 +- [x] 保持 0.6.1 restart 兼容读入路径稳定。 +- [x] 设计 Fortran 内部诊断查询入口。 +- [x] 明确 C ABI 是否暴露 0.7.0 调试字段。 +- [x] 若暴露 C ABI,补齐小容量和空指针错误路径(0.7.0 已决策不暴露)。 +- [x] 若不暴露 C ABI,在文档中明确为非交付范围。 +- [x] 新增 `blast_summary` 测试。 +- [x] 新增 `blast_output` 测试。 +- [x] 新增 `blast_restart_boundary` 测试。 +- [x] 将诊断输出测试接入 CTest。 +- [x] 准备阶段 F 本地提交说明。 ## 阶段 G:局部爆炸 smoke、回归 gate 和文档发布准备