From fbbaab3771f24bd36b942eaa961a88955b2d9434 Mon Sep 17 00:00:00 2001 From: Codex Date: Fri, 3 Jul 2026 13:36:16 +0800 Subject: [PATCH] Add explosive source phase diagnostics --- CMakeLists.txt | 18 +++++ src/explosive/sph_explosive.f90 | 46 ++++++++----- src/explosive/sph_explosive_state.f90 | 5 ++ src/output/sph_output_csv.f90 | 52 ++++++++++++-- tests/module/test_explosive_phase_refresh.f90 | 65 +++++++++++++++++ .../test_explosive_source_targeting.f90 | 69 +++++++++++++++++++ .../module/test_explosive_water_gas_smoke.f90 | 56 +++++++++++++++ tests/module/test_output.f90 | 10 ++- todo.md | 40 +++++------ 9 files changed, 318 insertions(+), 43 deletions(-) create mode 100644 tests/module/test_explosive_phase_refresh.f90 create mode 100644 tests/module/test_explosive_source_targeting.f90 create mode 100644 tests/module/test_explosive_water_gas_smoke.f90 diff --git a/CMakeLists.txt b/CMakeLists.txt index 927f53e..43bb7bd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -329,18 +329,36 @@ set_target_properties(test_explosive_release_source PROPERTIES Fortran_MODULE_DI add_test(NAME explosive_release_source COMMAND test_explosive_release_source) set_tests_properties(explosive_release_source PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") +add_executable(test_explosive_source_targeting tests/module/test_explosive_source_targeting.f90) +target_link_libraries(test_explosive_source_targeting PRIVATE sphlite_core) +set_target_properties(test_explosive_source_targeting PROPERTIES Fortran_MODULE_DIRECTORY "${SPHLITE_MODULE_DIR}") +add_test(NAME explosive_source_targeting COMMAND test_explosive_source_targeting) +set_tests_properties(explosive_source_targeting PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") + add_executable(test_explosive_to_gas_phase tests/module/test_explosive_to_gas_phase.f90) target_link_libraries(test_explosive_to_gas_phase PRIVATE sphlite_core) set_target_properties(test_explosive_to_gas_phase PROPERTIES Fortran_MODULE_DIRECTORY "${SPHLITE_MODULE_DIR}") add_test(NAME explosive_to_gas_phase COMMAND test_explosive_to_gas_phase) set_tests_properties(explosive_to_gas_phase PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") +add_executable(test_explosive_phase_refresh tests/module/test_explosive_phase_refresh.f90) +target_link_libraries(test_explosive_phase_refresh PRIVATE sphlite_core) +set_target_properties(test_explosive_phase_refresh PROPERTIES Fortran_MODULE_DIRECTORY "${SPHLITE_MODULE_DIR}") +add_test(NAME explosive_phase_refresh COMMAND test_explosive_phase_refresh) +set_tests_properties(explosive_phase_refresh PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") + add_executable(test_explosive_gas_coupling tests/module/test_explosive_gas_coupling.f90) target_link_libraries(test_explosive_gas_coupling PRIVATE sphlite_core) set_target_properties(test_explosive_gas_coupling PROPERTIES Fortran_MODULE_DIRECTORY "${SPHLITE_MODULE_DIR}") add_test(NAME explosive_gas_coupling COMMAND test_explosive_gas_coupling) set_tests_properties(explosive_gas_coupling PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") +add_executable(test_explosive_water_gas_smoke tests/module/test_explosive_water_gas_smoke.f90) +target_link_libraries(test_explosive_water_gas_smoke PRIVATE sphlite_core) +set_target_properties(test_explosive_water_gas_smoke PROPERTIES Fortran_MODULE_DIRECTORY "${SPHLITE_MODULE_DIR}") +add_test(NAME explosive_water_gas_smoke COMMAND test_explosive_water_gas_smoke) +set_tests_properties(explosive_water_gas_smoke PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") + add_executable(test_explosive_summary tests/module/test_explosive_summary.f90) target_link_libraries(test_explosive_summary PRIVATE sphlite_core) set_target_properties(test_explosive_summary PROPERTIES Fortran_MODULE_DIRECTORY "${SPHLITE_MODULE_DIR}") diff --git a/src/explosive/sph_explosive.f90 b/src/explosive/sph_explosive.f90 index 90ffb61..0f4db73 100644 --- a/src/explosive/sph_explosive.f90 +++ b/src/explosive/sph_explosive.f90 @@ -4,8 +4,9 @@ module sph_explosive sph_error_set use sph_database, only: SPH_MAX_MATERIALS, material_count, material_name, & material_density, npart, particle_phase, material_id, x0, v, mass, rho, & - volume, internal_energy, SPH_PHASE_GAS - use sph_gas, only: sph_gas_clear_sources, sph_gas_add_source_by_particle + volume, pressure, internal_energy, SPH_PHASE_GAS + use sph_gas, only: sph_gas_clear_sources, sph_gas_add_source_by_particle, & + sph_gas_compute_pressure_for_material use sph_explosive_state use sph_explosive_helpers implicit none @@ -43,6 +44,11 @@ contains explosive_release_mass_balance = 0.0_rk explosive_release_energy_balance = 0.0_rk explosive_release_momentum_balance = 0.0_rk + explosive_converted_count = 0 + explosive_source_target_count = 0 + explosive_source_mass_total = 0.0_rk + explosive_source_energy_total = 0.0_rk + explosive_source_momentum_total = 0.0_rk explosive_dt_reaction = 0.0_rk end subroutine sph_explosive_clear_material_table @@ -117,6 +123,11 @@ contains explosive_release_mass_balance = 0.0_rk explosive_release_energy_balance = 0.0_rk explosive_release_momentum_balance = 0.0_rk + explosive_converted_count = 0 + explosive_source_target_count = 0 + explosive_source_mass_total = 0.0_rk + explosive_source_energy_total = 0.0_rk + explosive_source_momentum_total = 0.0_rk end subroutine sph_explosive_clear_particle_state subroutine sph_explosive_note_material(name, material_type_in) @@ -474,6 +485,10 @@ contains ierr = SPH_ERROR_INPUT return end if + explosive_source_target_count = explosive_source_target_count + target_count + explosive_source_mass_total = explosive_source_mass_total + release_mass + explosive_source_energy_total = explosive_source_energy_total + release_energy + explosive_source_momentum_total = explosive_source_momentum_total + release_momentum mass_rate = release_mass / (dt * real(target_count, rk)) energy_rate = release_energy / (dt * real(target_count, rk)) momentum_rate = release_momentum / (dt * real(target_count, rk)) @@ -503,11 +518,16 @@ contains ierr = SPH_ERROR_INPUT return end if + if (particle_phase(index) /= SPH_PHASE_GAS) then + explosive_converted_count = explosive_converted_count + 1 + end if particle_phase(index) = SPH_PHASE_GAS material_id(index) = product_id if (material_density(product_id) > 0.0_rk) rho(index) = material_density(product_id) if (rho(index) > 0.0_rk) volume(index) = mass(index) / rho(index) internal_energy(index) = explosive_energy_per_mass(explosive_index) + call sph_gas_compute_pressure_for_material(product_id, rho(index), & + internal_energy(index), pressure(index), ierr) end subroutine sph_explosive_convert_particle_to_gas subroutine sph_explosive_estimate_dt_limit(dt_reaction, ierr) @@ -597,16 +617,11 @@ contains expected_energy = 0.0_rk do i = 1, npart if (.not. sph_explosive_is_tracked_particle(i)) cycle - explosive_release_mass_balance(1) = explosive_release_mass_balance(1) + & - explosive_initial_mass(i) - explosive_release_mass_balance(2) = explosive_release_mass_balance(2) + & - explosive_released_mass(i) - explosive_release_mass_balance(3) = explosive_release_mass_balance(3) + & - explosive_remaining_mass(i) - explosive_release_energy_balance(1) = explosive_release_energy_balance(1) + & - explosive_released_energy(i) - explosive_release_momentum_balance = explosive_release_momentum_balance + & - explosive_released_momentum(:,i) + explosive_release_mass_balance(1) = explosive_release_mass_balance(1) + explosive_initial_mass(i) + explosive_release_mass_balance(2) = explosive_release_mass_balance(2) + explosive_released_mass(i) + explosive_release_mass_balance(3) = explosive_release_mass_balance(3) + explosive_remaining_mass(i) + explosive_release_energy_balance(1) = explosive_release_energy_balance(1) + explosive_released_energy(i) + explosive_release_momentum_balance = explosive_release_momentum_balance + explosive_released_momentum(:,i) explosive_index = sph_explosive_table_index_by_material_id( & explosive_initial_material_id(i)) if (explosive_index > 0) then @@ -622,8 +637,7 @@ contains expected_energy end subroutine sph_explosive_update_release_balance - subroutine sph_explosive_get_release_balance(mass_values, energy_values, & - momentum_values, ierr) + subroutine sph_explosive_get_release_balance(mass_values, energy_values, momentum_values, ierr) real(rk), intent(out) :: mass_values(4) real(rk), intent(out) :: energy_values(2) real(rk), intent(out) :: momentum_values(SPH_NDIM) @@ -651,9 +665,7 @@ contains call sph_explosive_set_ignition(explosive_material_name(1), ignition_x, & ignition_time, ierr) if (ierr /= SPH_SUCCESS) return - if (allocated(explosive_detonation_time)) then - call sph_explosive_compute_detonation_times(ierr) - end if + if (allocated(explosive_detonation_time)) call sph_explosive_compute_detonation_times(ierr) end subroutine sph_explosive_set_default_ignition_point subroutine sph_explosive_get_detonation_time_range(time_min, time_max, ierr) diff --git a/src/explosive/sph_explosive_state.f90 b/src/explosive/sph_explosive_state.f90 index e14d20b..9cd7607 100644 --- a/src/explosive/sph_explosive_state.f90 +++ b/src/explosive/sph_explosive_state.f90 @@ -36,6 +36,11 @@ module sph_explosive_state real(rk) :: explosive_release_mass_balance(4) = 0.0_rk real(rk) :: explosive_release_energy_balance(2) = 0.0_rk real(rk) :: explosive_release_momentum_balance(SPH_NDIM) = 0.0_rk + integer :: explosive_converted_count = 0 + integer :: explosive_source_target_count = 0 + real(rk) :: explosive_source_mass_total = 0.0_rk + real(rk) :: explosive_source_energy_total = 0.0_rk + real(rk) :: explosive_source_momentum_total(SPH_NDIM) = 0.0_rk real(rk) :: explosive_dt_reaction = 0.0_rk end module sph_explosive_state diff --git a/src/output/sph_output_csv.f90 b/src/output/sph_output_csv.f90 index f37f0bb..fdc8aee 100644 --- a/src/output/sph_output_csv.f90 +++ b/src/output/sph_output_csv.f90 @@ -13,8 +13,13 @@ module sph_output_csv use sph_gas, only: sph_gas_get_source_summary use sph_explosive_state, only: & explosive_detonation_time, explosive_reaction_progress, & - explosive_released_mass, explosive_released_energy - use sph_explosive, only: sph_explosive_get_summary + explosive_initial_mass, explosive_remaining_mass, & + explosive_released_mass, explosive_released_energy, & + explosive_converted_count, explosive_source_target_count, & + explosive_source_mass_total, explosive_source_energy_total, & + explosive_source_momentum_total + use sph_explosive, only: sph_explosive_get_summary, & + sph_explosive_get_release_balance implicit none integer, parameter :: SPH_OUTPUT_UNIT = 41 @@ -55,6 +60,8 @@ contains integer :: i real(rk) :: explosive_td real(rk) :: explosive_lambda + real(rk) :: explosive_initial + real(rk) :: explosive_remaining real(rk) :: explosive_mass real(rk) :: explosive_energy @@ -69,23 +76,31 @@ contains write(SPH_OUTPUT_UNIT, '(A)') 'id,phase,status,material,section,x,y,z,' // & 'vx,vy,vz,rho,pressure,temperature,h,explosive_detonation_time,' // & - 'explosive_lambda,explosive_released_mass,explosive_released_energy' + 'explosive_lambda,explosive_initial_mass,explosive_remaining_mass,' // & + 'explosive_released_mass,explosive_released_energy' do i = 1, npart explosive_td = 0.0_rk explosive_lambda = 0.0_rk + explosive_initial = 0.0_rk + explosive_remaining = 0.0_rk explosive_mass = 0.0_rk explosive_energy = 0.0_rk if (allocated(explosive_detonation_time)) explosive_td = explosive_detonation_time(i) if (allocated(explosive_reaction_progress)) explosive_lambda = & explosive_reaction_progress(i) + if (allocated(explosive_initial_mass)) explosive_initial = & + explosive_initial_mass(i) + if (allocated(explosive_remaining_mass)) explosive_remaining = & + explosive_remaining_mass(i) if (allocated(explosive_released_mass)) explosive_mass = explosive_released_mass(i) if (allocated(explosive_released_energy)) explosive_energy = & explosive_released_energy(i) - write(SPH_OUTPUT_UNIT, '(5(I0,","),13(ES24.16,","),ES24.16)') & + write(SPH_OUTPUT_UNIT, '(5(I0,","),15(ES24.16,","),ES24.16)') & 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), & - explosive_td, explosive_lambda, explosive_mass, explosive_energy + explosive_td, explosive_lambda, explosive_initial, & + explosive_remaining, explosive_mass, explosive_energy end do close(unit=SPH_OUTPUT_UNIT) end subroutine sph_output_write_csv @@ -119,6 +134,9 @@ contains real(rk) :: explosive_lambda_range(3) real(rk) :: explosive_released_totals(5) real(rk) :: explosive_time_range(2) + real(rk) :: explosive_mass_balance(4) + real(rk) :: explosive_energy_balance(2) + real(rk) :: explosive_momentum_balance(3) ierr = SPH_SUCCESS gas_source_mass = 0.0_rk @@ -129,6 +147,8 @@ contains call sph_explosive_get_summary(explosive_particles, & explosive_reacted_particles, explosive_lambda_range, & explosive_released_totals, explosive_time_range, local_ierr) + call sph_explosive_get_release_balance(explosive_mass_balance, & + explosive_energy_balance, explosive_momentum_balance, local_ierr) dtcrit = water_dt_cfl if (water_dt_accel > 0.0_rk .and. water_dt_accel < dtcrit) dtcrit = water_dt_accel if (water_dt_viscous > 0.0_rk .and. water_dt_viscous < dtcrit) dtcrit = water_dt_viscous @@ -196,6 +216,28 @@ contains explosive_time_range(1) write(SPH_OUTPUT_UNIT, '(A,",",ES24.16)') 'explosive_detonation_time_max', & explosive_time_range(2) + write(SPH_OUTPUT_UNIT, '(A,",",ES24.16)') 'explosive_initial_mass', & + explosive_mass_balance(1) + write(SPH_OUTPUT_UNIT, '(A,",",ES24.16)') 'explosive_remaining_mass', & + explosive_mass_balance(3) + write(SPH_OUTPUT_UNIT, '(A,",",ES24.16)') 'explosive_release_mass_error', & + explosive_mass_balance(4) + write(SPH_OUTPUT_UNIT, '(A,",",ES24.16)') 'explosive_release_energy_error', & + explosive_energy_balance(2) + write(SPH_OUTPUT_UNIT, '(A,",",I0)') 'explosive_converted_particles', & + explosive_converted_count + write(SPH_OUTPUT_UNIT, '(A,",",I0)') 'explosive_source_particles', & + explosive_source_target_count + write(SPH_OUTPUT_UNIT, '(A,",",ES24.16)') 'explosive_source_mass_total', & + explosive_source_mass_total + write(SPH_OUTPUT_UNIT, '(A,",",ES24.16)') 'explosive_source_energy_total', & + explosive_source_energy_total + write(SPH_OUTPUT_UNIT, '(A,",",ES24.16)') 'explosive_source_momentum_x', & + explosive_source_momentum_total(1) + write(SPH_OUTPUT_UNIT, '(A,",",ES24.16)') 'explosive_source_momentum_y', & + explosive_source_momentum_total(2) + write(SPH_OUTPUT_UNIT, '(A,",",ES24.16)') 'explosive_source_momentum_z', & + explosive_source_momentum_total(3) close(unit=SPH_OUTPUT_UNIT) end subroutine sph_output_write_summary diff --git a/tests/module/test_explosive_phase_refresh.f90 b/tests/module/test_explosive_phase_refresh.f90 new file mode 100644 index 0000000..68a45d5 --- /dev/null +++ b/tests/module/test_explosive_phase_refresh.f90 @@ -0,0 +1,65 @@ +program test_explosive_phase_refresh + 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: particle_phase, material_id, mass, rho, volume, & + pressure, internal_energy, gas_particle_count, gas_mass, gas_max_pressure, & + SPH_PHASE_GAS + use sph_explosive_state, only: explosive_converted_count, & + explosive_reaction_progress + implicit none + + integer :: ierr + + call sph_initialize(ierr) + call assert_ok(ierr, 'initialize failed') + call sph_read_inp('tests/data/explosive_phase_refresh_041.inp', ierr) + call assert_ok(ierr, 'read phase refresh failed') + call sph_build_model(ierr) + call assert_ok(ierr, 'build phase refresh failed') + call sph_advance_explicit(1.0e-7_rk, ierr) + call assert_ok(ierr, 'advance phase refresh failed') + if (particle_phase(1) /= SPH_PHASE_GAS) call fail('phase did not refresh to Gas') + if (material_id(1) /= 2) call fail('product material did not refresh') + call assert_close(rho(1), 1200.0_rk, 'product Gas density mismatch') + call assert_close(volume(1), mass(1) / rho(1), 'product Gas volume mismatch') + call assert_close(internal_energy(1), 4.2e6_rk, 'product Gas energy mismatch') + if (pressure(1) <= 0.0_rk) call fail('product Gas pressure was not refreshed') + if (gas_particle_count <= 0 .or. gas_mass <= 0.0_rk) then + call fail('Gas summary did not include converted particle') + end if + if (gas_max_pressure <= 0.0_rk) call fail('Gas pressure summary mismatch') + if (explosive_converted_count <= 0) call fail('converted count missing') + call assert_close(explosive_reaction_progress(1), 1.0_rk, & + 'Explosive history was not retained') + call sph_finalize(ierr) + call assert_ok(ierr, 'finalize failed') + +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) > 1.0e-10_rk * max(1.0_rk, abs(expected))) 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_explosive_phase_refresh diff --git a/tests/module/test_explosive_source_targeting.f90 b/tests/module/test_explosive_source_targeting.f90 new file mode 100644 index 0000000..cba8bb7 --- /dev/null +++ b/tests/module/test_explosive_source_targeting.f90 @@ -0,0 +1,69 @@ +program test_explosive_source_targeting + 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: mass + use sph_explosive_state, only: explosive_source_target_count, & + explosive_source_mass_total, explosive_source_energy_total, & + explosive_source_momentum_total, explosive_released_mass + implicit none + + integer :: ierr + real(rk) :: target_a_before + real(rk) :: target_b_before + real(rk) :: target_a_after + real(rk) :: target_b_after + + call sph_initialize(ierr) + call assert_ok(ierr, 'initialize failed') + call sph_read_inp('tests/data/explosive_source_multi_target_041.inp', ierr) + call assert_ok(ierr, 'read source targeting failed') + call sph_build_model(ierr) + call assert_ok(ierr, 'build source targeting failed') + target_a_before = mass(3) + mass(4) + target_b_before = mass(5) + mass(6) + call sph_advance_explicit(1.0e-7_rk, ierr) + call assert_ok(ierr, 'advance source targeting failed') + target_a_after = mass(3) + mass(4) + target_b_after = mass(5) + mass(6) + if (target_a_after <= target_a_before) call fail('matched product Gas did not receive source') + call assert_close(target_b_after, target_b_before, & + 'unmatched product Gas received source') + if (explosive_source_target_count /= 2) call fail('source target count mismatch') + call assert_close(explosive_source_mass_total, explosive_released_mass(1), & + 'source mass total mismatch') + if (explosive_source_energy_total <= 0.0_rk) call fail('source energy total missing') + if (maxval(abs(explosive_source_momentum_total)) > 1.0e-12_rk) then + call fail('zero velocity source momentum mismatch') + end if + call sph_finalize(ierr) + call assert_ok(ierr, 'finalize failed') + +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) > 1.0e-12_rk * max(1.0_rk, abs(expected))) 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_explosive_source_targeting diff --git a/tests/module/test_explosive_water_gas_smoke.f90 b/tests/module/test_explosive_water_gas_smoke.f90 new file mode 100644 index 0000000..ef49211 --- /dev/null +++ b/tests/module/test_explosive_water_gas_smoke.f90 @@ -0,0 +1,56 @@ +program test_explosive_water_gas_smoke + 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_run_explicit + use sph_database, only: water_mass, water_max_pressure, gas_particle_count, & + gas_volume, gas_max_pressure + use sph_explosive, only: sph_explosive_get_release_balance + implicit none + + integer :: ierr + real(rk) :: mass_values(4) + real(rk) :: energy_values(2) + real(rk) :: momentum_values(3) + + call sph_initialize(ierr) + call assert_ok(ierr, 'initialize failed') + call sph_read_inp('tests/data/explosive_water_gas_mixed_041.inp', ierr) + call assert_ok(ierr, 'read mixed smoke failed') + call sph_build_model(ierr) + call assert_ok(ierr, 'build mixed smoke failed') + call sph_run_explicit(ierr) + call assert_ok(ierr, 'run mixed smoke failed') + if (water_mass <= 0.0_rk) call fail('Water summary vanished in mixed smoke') + if (water_max_pressure /= water_max_pressure) call fail('Water pressure is not finite') + if (gas_particle_count <= 0) call fail('Gas particles missing in mixed smoke') + if (gas_volume <= 0.0_rk) call fail('Gas volume mismatch in mixed smoke') + if (gas_max_pressure /= gas_max_pressure) call fail('Gas pressure is not finite') + call sph_explosive_get_release_balance(mass_values, energy_values, & + momentum_values, ierr) + call assert_ok(ierr, 'release balance query failed') + if (mass_values(2) <= 0.0_rk) call fail('Explosive did not release in mixed smoke') + if (mass_values(4) /= mass_values(4) .or. energy_values(2) /= energy_values(2)) then + call fail('release balance is not finite') + end if + momentum_values = momentum_values + call sph_finalize(ierr) + call assert_ok(ierr, 'finalize failed') + +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_explosive_water_gas_smoke diff --git a/tests/module/test_output.f90 b/tests/module/test_output.f90 index eebb69d..b51f8b1 100644 --- a/tests/module/test_output.f90 +++ b/tests/module/test_output.f90 @@ -116,7 +116,8 @@ contains if (ios /= 0) call fail('particle CSV header missing') if (trim(header) /= 'id,phase,status,material,section,x,y,z,' // & 'vx,vy,vz,rho,pressure,temperature,h,explosive_detonation_time,' // & - 'explosive_lambda,explosive_released_mass,explosive_released_energy') then + 'explosive_lambda,explosive_initial_mass,explosive_remaining_mass,' // & + 'explosive_released_mass,explosive_released_energy') then call fail('particle CSV header mismatch') end if end subroutine check_particle_header @@ -148,6 +149,13 @@ contains call assert_summary_metric(filename, 'explosive_particles') call assert_summary_metric(filename, 'explosive_lambda_mean') call assert_summary_metric(filename, 'explosive_released_energy') + call assert_summary_metric(filename, 'explosive_initial_mass') + call assert_summary_metric(filename, 'explosive_remaining_mass') + call assert_summary_metric(filename, 'explosive_release_mass_error') + call assert_summary_metric(filename, 'explosive_release_energy_error') + call assert_summary_metric(filename, 'explosive_converted_particles') + call assert_summary_metric(filename, 'explosive_source_particles') + call assert_summary_metric(filename, 'explosive_source_mass_total') end subroutine check_summary_metrics subroutine assert_summary_metric(filename, metric) diff --git a/todo.md b/todo.md index 1f17395..7b2aab8 100644 --- a/todo.md +++ b/todo.md @@ -79,26 +79,26 @@ ## 阶段 D:SOURCE、PHASE、混合链路与输出 -- [ ] 加固 SOURCE 路径 product Gas target 计数逻辑。 -- [ ] 确保 SOURCE 路径只选择匹配 product material 的 active Gas 粒子。 -- [ ] 确保 SOURCE 路径存在多个 Gas material 时不会跨 material 注入。 -- [ ] 对 SOURCE 路径无 active product Gas target 的输入保持 error。 -- [ ] 统计 SOURCE 路径参与接收的 Gas 粒子数。 -- [ ] 统计 SOURCE 路径注入的质量总量。 -- [ ] 统计 SOURCE 路径注入的能量总量。 -- [ ] 统计 SOURCE 路径注入的三向动量总量。 -- [ ] 加固 SOURCE 源项应用后的 Gas summary 刷新。 -- [ ] 加固 PHASE 转化后的 `particle_phase` 和 `material_id` 更新。 -- [ ] 加固 PHASE 转化后的 `rho`、`volume` 和 `internal_energy` 更新。 -- [ ] 加固 PHASE 转化后的 Gas pressure 刷新。 -- [ ] 加固 PHASE 转化后的 Gas summary 刷新。 -- [ ] 保持已转化 Gas 粒子的 Explosive 历史状态可追踪。 -- [ ] 新增 Water/Gas/Explosive 混合 smoke 显式推进测试。 -- [ ] 新增 SOURCE target material 测试并接入 CTest。 -- [ ] 新增 PHASE 状态刷新测试并接入 CTest。 -- [ ] 在 summary CSV 中追加 release balance 字段。 -- [ ] 在粒子 CSV 中追加 Explosive 反应质量和剩余质量字段。 -- [ ] 更新 output 测试以锁定 0.4.1 CSV header 和 summary 字段。 +- [x] 加固 SOURCE 路径 product Gas target 计数逻辑。 +- [x] 确保 SOURCE 路径只选择匹配 product material 的 active Gas 粒子。 +- [x] 确保 SOURCE 路径存在多个 Gas material 时不会跨 material 注入。 +- [x] 对 SOURCE 路径无 active product Gas target 的输入保持 error。 +- [x] 统计 SOURCE 路径参与接收的 Gas 粒子数。 +- [x] 统计 SOURCE 路径注入的质量总量。 +- [x] 统计 SOURCE 路径注入的能量总量。 +- [x] 统计 SOURCE 路径注入的三向动量总量。 +- [x] 加固 SOURCE 源项应用后的 Gas summary 刷新。 +- [x] 加固 PHASE 转化后的 `particle_phase` 和 `material_id` 更新。 +- [x] 加固 PHASE 转化后的 `rho`、`volume` 和 `internal_energy` 更新。 +- [x] 加固 PHASE 转化后的 Gas pressure 刷新。 +- [x] 加固 PHASE 转化后的 Gas summary 刷新。 +- [x] 保持已转化 Gas 粒子的 Explosive 历史状态可追踪。 +- [x] 新增 Water/Gas/Explosive 混合 smoke 显式推进测试。 +- [x] 新增 SOURCE target material 测试并接入 CTest。 +- [x] 新增 PHASE 状态刷新测试并接入 CTest。 +- [x] 在 summary CSV 中追加 release balance 字段。 +- [x] 在粒子 CSV 中追加 Explosive 反应质量和剩余质量字段。 +- [x] 更新 output 测试以锁定 0.4.1 CSV header 和 summary 字段。 ## 阶段 E:Restart、API、C++、Python 与 CLI