From 111e907509d5f4a8b417705ee10704d4fb1aa4da Mon Sep 17 00:00:00 2001 From: Codex Date: Fri, 3 Jul 2026 13:52:49 +0800 Subject: [PATCH] Expose explosive release balance interfaces --- CMakeLists.txt | 43 +++++++ Python/sphlite_debug.py | 23 ++++ include/sphlite.hpp | 15 +++ include/sphlite_c_api.h | 3 + src/app/sph_main.c | 17 +++ src/interface/sph_api.f90 | 35 +++++- src/interface/sph_c_api.c | 18 +++ src/output/sph_restart.f90 | 87 +++++++++++--- tests/interface/test_c_api.c | 23 ++++ tests/interface/test_cpp_api.cpp | 5 + .../test_explosive_restart_040_compat.f90 | 110 ++++++++++++++++++ tests/module/test_explosive_restart_041.f90 | 96 +++++++++++++++ ...st_explosive_restart_no_double_release.f90 | 69 +++++++++++ todo.md | 40 +++---- tools/testing/test_cli.py | 11 ++ tools/testing/test_python_debug.py | 9 ++ 16 files changed, 569 insertions(+), 35 deletions(-) create mode 100644 tests/module/test_explosive_restart_040_compat.f90 create mode 100644 tests/module/test_explosive_restart_041.f90 create mode 100644 tests/module/test_explosive_restart_no_double_release.f90 diff --git a/CMakeLists.txt b/CMakeLists.txt index 43bb7bd..1cbfab5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,6 +56,7 @@ if(CMAKE_Fortran_COMPILER_ID STREQUAL "GNU") #define SPHLITE_FC_sphft_get_gas_source_summary sphft_get_gas_source_summary_ #define SPHLITE_FC_sphft_set_ignition_point sphft_set_ignition_point_ #define SPHLITE_FC_sphft_get_explosive_summary sphft_get_explosive_summary_ +#define SPHLITE_FC_sphft_get_explosive_release_balance sphft_get_explosive_release_balance_ #endif ") endif() @@ -173,6 +174,8 @@ add_test(NAME c_api COMMAND test_c_api) set_tests_properties(c_api PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") add_test(NAME explosive_c_api COMMAND test_c_api) set_tests_properties(explosive_c_api PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") +add_test(NAME explosive_release_c_api COMMAND test_c_api) +set_tests_properties(explosive_release_c_api PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") add_executable(test_cpp_api tests/interface/test_cpp_api.cpp) target_include_directories(test_cpp_api PRIVATE include) @@ -182,6 +185,8 @@ target_compile_definitions(test_cpp_api PRIVATE target_link_libraries(test_cpp_api PRIVATE sphlite_c) add_test(NAME cpp_api COMMAND test_cpp_api) set_tests_properties(cpp_api PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") +add_test(NAME explosive_release_cpp_api COMMAND test_cpp_api) +set_tests_properties(explosive_release_cpp_api PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") add_executable(test_restart tests/module/test_restart.f90) target_link_libraries(test_restart PRIVATE sphlite_core) @@ -371,6 +376,24 @@ set_target_properties(test_explosive_restart_040 PROPERTIES Fortran_MODULE_DIREC add_test(NAME explosive_restart_040 COMMAND test_explosive_restart_040) set_tests_properties(explosive_restart_040 PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") +add_executable(test_explosive_restart_041 tests/module/test_explosive_restart_041.f90) +target_link_libraries(test_explosive_restart_041 PRIVATE sphlite_core) +set_target_properties(test_explosive_restart_041 PROPERTIES Fortran_MODULE_DIRECTORY "${SPHLITE_MODULE_DIR}") +add_test(NAME explosive_restart_041 COMMAND test_explosive_restart_041) +set_tests_properties(explosive_restart_041 PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") + +add_executable(test_explosive_restart_040_compat tests/module/test_explosive_restart_040_compat.f90) +target_link_libraries(test_explosive_restart_040_compat PRIVATE sphlite_core) +set_target_properties(test_explosive_restart_040_compat PROPERTIES Fortran_MODULE_DIRECTORY "${SPHLITE_MODULE_DIR}") +add_test(NAME explosive_restart_040_compat COMMAND test_explosive_restart_040_compat) +set_tests_properties(explosive_restart_040_compat PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") + +add_executable(test_explosive_restart_no_double_release tests/module/test_explosive_restart_no_double_release.f90) +target_link_libraries(test_explosive_restart_no_double_release PRIVATE sphlite_core) +set_target_properties(test_explosive_restart_no_double_release PROPERTIES Fortran_MODULE_DIRECTORY "${SPHLITE_MODULE_DIR}") +add_test(NAME explosive_restart_no_double_release COMMAND test_explosive_restart_no_double_release) +set_tests_properties(explosive_restart_no_double_release PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") + add_executable(test_explosive_restart_031_compat tests/module/test_explosive_restart_031_compat.f90) target_link_libraries(test_explosive_restart_031_compat PRIVATE sphlite_core) set_target_properties(test_explosive_restart_031_compat PROPERTIES Fortran_MODULE_DIRECTORY "${SPHLITE_MODULE_DIR}") @@ -426,6 +449,15 @@ add_test( ) set_tests_properties(explosive_python PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") +add_test( + NAME explosive_release_python + COMMAND "${Python3_EXECUTABLE}" + "${CMAKE_CURRENT_SOURCE_DIR}/tools/testing/test_python_debug.py" + --library "$" + --input "${CMAKE_CURRENT_SOURCE_DIR}/tests/data/minimal_particles.inp" +) +set_tests_properties(explosive_release_python PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") + add_test( NAME gas_python_extended COMMAND "${Python3_EXECUTABLE}" @@ -457,6 +489,17 @@ add_test( ) set_tests_properties(explosive_cli PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") +add_test( + NAME explosive_release_cli + COMMAND "${Python3_EXECUTABLE}" + "${CMAKE_CURRENT_SOURCE_DIR}/tools/testing/test_cli.py" + --exe "$" + --input "${CMAKE_CURRENT_SOURCE_DIR}/tests/data/water_minimal_021.inp" + --bad-input "${CMAKE_CURRENT_SOURCE_DIR}/tests/data/water_missing_eos_020.inp" + --output-dir "${CMAKE_BINARY_DIR}" +) +set_tests_properties(explosive_release_cli PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") + add_test( NAME gas_cli_extended COMMAND "${Python3_EXECUTABLE}" diff --git a/Python/sphlite_debug.py b/Python/sphlite_debug.py index dedb7d2..fbd4e28 100644 --- a/Python/sphlite_debug.py +++ b/Python/sphlite_debug.py @@ -136,6 +136,12 @@ class SPHLite: ctypes.POINTER(ctypes.c_double), ] self.lib.sphlite_get_explosive_summary.restype = ctypes.c_int + self.lib.sphlite_get_explosive_release_balance.argtypes = [ + ctypes.POINTER(ctypes.c_double), + ctypes.POINTER(ctypes.c_double), + ctypes.POINTER(ctypes.c_double), + ] + self.lib.sphlite_get_explosive_release_balance.restype = ctypes.c_int self.lib.sphlite_get_particle_state.argtypes = [ ctypes.c_int, @@ -433,6 +439,21 @@ class SPHLite: "explosive_detonation_time_range": list(detonation_range), } + def explosive_release_balance(self) -> dict[str, float | list[float]]: + mass_type = ctypes.c_double * 4 + energy_type = ctypes.c_double * 2 + momentum_type = ctypes.c_double * 3 + mass_values = mass_type() + energy_values = energy_type() + momentum_values = momentum_type() + self._check(self.lib.sphlite_get_explosive_release_balance( + mass_values, energy_values, momentum_values)) + return { + "explosive_release_mass_values": list(mass_values), + "explosive_release_energy_values": list(energy_values), + "explosive_release_momentum_values": list(momentum_values), + } + def inspect(self, filename: str | Path) -> dict[str, int | float | list[float]]: self.read_inp(filename) self.build_model() @@ -448,6 +469,7 @@ class SPHLite: summary.update(self.gas_extended_summary()) summary.update(self.gas_source_summary()) summary.update(self.explosive_summary()) + summary.update(self.explosive_release_balance()) return summary def run(self, filename: str | Path) -> dict[str, int | float | list[float]]: @@ -462,4 +484,5 @@ class SPHLite: summary.update(self.gas_extended_summary()) summary.update(self.gas_source_summary()) summary.update(self.explosive_summary()) + summary.update(self.explosive_release_balance()) return summary diff --git a/include/sphlite.hpp b/include/sphlite.hpp index 1d2c283..7ad1d2c 100644 --- a/include/sphlite.hpp +++ b/include/sphlite.hpp @@ -104,6 +104,12 @@ struct ExplosiveSummary { double detonation_time_range[2]; }; +struct ExplosiveReleaseBalance { + double mass_values[4]; + double energy_values[2]; + double momentum_values[3]; +}; + class Error : public std::runtime_error { public: explicit Error(const std::string &message) : std::runtime_error(message) {} @@ -263,6 +269,15 @@ inline ExplosiveSummary explosive_summary() return summary; } +inline ExplosiveReleaseBalance explosive_release_balance() +{ + ExplosiveReleaseBalance balance = { + {0.0, 0.0, 0.0, 0.0}, {0.0, 0.0}, {0.0, 0.0, 0.0}}; + check(sphlite_get_explosive_release_balance(balance.mass_values, + balance.energy_values, balance.momentum_values)); + return balance; +} + inline void set_output_directory(const std::string &path) { check(sphlite_set_output_directory(path.c_str())); diff --git a/include/sphlite_c_api.h b/include/sphlite_c_api.h index ea2ce78..9c0b0b7 100644 --- a/include/sphlite_c_api.h +++ b/include/sphlite_c_api.h @@ -94,6 +94,9 @@ SPHLITE_API int sphlite_get_explosive_summary(int *particle_count, double *lambda_range, double *released_totals, double *detonation_time_range); +SPHLITE_API int sphlite_get_explosive_release_balance(double *mass_values, + double *energy_values, + double *momentum_values); #ifdef __cplusplus } diff --git a/src/app/sph_main.c b/src/app/sph_main.c index 351ee35..15d782a 100644 --- a/src/app/sph_main.c +++ b/src/app/sph_main.c @@ -135,6 +135,9 @@ int main(int argc, char **argv) double explosive_lambda_range[3] = {0.0, 0.0, 0.0}; double explosive_released_totals[5] = {0.0, 0.0, 0.0, 0.0, 0.0}; double explosive_detonation_time_range[2] = {0.0, 0.0}; + double explosive_release_mass_values[4] = {0.0, 0.0, 0.0, 0.0}; + double explosive_release_energy_values[2] = {0.0, 0.0}; + double explosive_release_momentum_values[3] = {0.0, 0.0, 0.0}; int run_mode = 0; int check_mode = 0; const char *input = NULL; @@ -326,6 +329,13 @@ int main(int argc, char **argv) (void)sphlite_finalize(); return 1; } + ierr = sphlite_get_explosive_release_balance(explosive_release_mass_values, + explosive_release_energy_values, explosive_release_momentum_values); + if (ierr != 0) { + sphlite_print_error(); + (void)sphlite_finalize(); + return 1; + } printf("version: %d.%d.%d\n", major, minor, patch); printf("input: %s\n", input); @@ -374,6 +384,13 @@ int main(int argc, char **argv) printf("explosive_released_momentum_z: %.16e\n", explosive_released_totals[4]); printf("explosive_detonation_time_min: %.16e\n", explosive_detonation_time_range[0]); printf("explosive_detonation_time_max: %.16e\n", explosive_detonation_time_range[1]); + printf("explosive_initial_mass: %.16e\n", explosive_release_mass_values[0]); + printf("explosive_remaining_mass: %.16e\n", explosive_release_mass_values[2]); + printf("explosive_release_mass_error: %.16e\n", explosive_release_mass_values[3]); + printf("explosive_release_energy_error: %.16e\n", explosive_release_energy_values[1]); + printf("explosive_release_momentum_x: %.16e\n", explosive_release_momentum_values[0]); + printf("explosive_release_momentum_y: %.16e\n", explosive_release_momentum_values[1]); + printf("explosive_release_momentum_z: %.16e\n", explosive_release_momentum_values[2]); printf("status: ok\n"); ierr = sphlite_finalize(); diff --git a/src/interface/sph_api.f90 b/src/interface/sph_api.f90 index 30eee16..cc1d12e 100644 --- a/src/interface/sph_api.f90 +++ b/src/interface/sph_api.f90 @@ -25,7 +25,8 @@ module sph_api sph_gas_get_source_summary, sph_gas_get_bubble_metrics, & sph_gas_estimate_dt_limits use sph_explosive, only: sph_explosive_initialize, sph_explosive_reset, & - sph_explosive_get_summary, sph_explosive_set_default_ignition_point + sph_explosive_get_summary, sph_explosive_get_release_balance, & + sph_explosive_set_default_ignition_point use sph_solid, only: sph_solid_initialize, sph_solid_reset use sph_shell, only: sph_shell_initialize, sph_shell_reset use sph_api_state, only: sph_api_initialized, sph_api_model_built, & @@ -476,6 +477,24 @@ contains lambda_range, released_totals, detonation_time_range, ierr) end subroutine sph_get_explosive_summary + subroutine sph_get_explosive_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(3) + integer, intent(out) :: ierr + + mass_values = 0.0_rk + energy_values = 0.0_rk + momentum_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_explosive_get_release_balance(mass_values, energy_values, & + momentum_values, ierr) + end subroutine sph_get_explosive_release_balance + subroutine sph_api_require_initialized(ierr) integer, intent(out) :: ierr @@ -786,6 +805,20 @@ subroutine sphft_get_explosive_summary(particle_count, reacted_count, & lambda_range, released_totals, detonation_time_range, ierr) end subroutine sphft_get_explosive_summary +subroutine sphft_get_explosive_release_balance(mass_values, energy_values, & + momentum_values, ierr) + use sph_api, only: sph_get_explosive_release_balance + use sph_precision, only: rk + implicit none + real(rk), intent(out) :: mass_values(4) + real(rk), intent(out) :: energy_values(2) + real(rk), intent(out) :: momentum_values(3) + integer, intent(out) :: ierr + + call sph_get_explosive_release_balance(mass_values, energy_values, & + momentum_values, ierr) +end subroutine sphft_get_explosive_release_balance + subroutine sphft_set_output_directory_chars(chars, count, ierr) use sph_api, only: sph_set_output_directory implicit none diff --git a/src/interface/sph_c_api.c b/src/interface/sph_c_api.c index 29d8c44..00f45d6 100644 --- a/src/interface/sph_c_api.c +++ b/src/interface/sph_c_api.c @@ -96,6 +96,11 @@ extern void SPHLITE_FC_sphft_get_explosive_summary( double *released_totals, double *detonation_time_range, int *ierr); +extern void SPHLITE_FC_sphft_get_explosive_release_balance( + double *mass_values, + double *energy_values, + double *momentum_values, + int *ierr); static int sphlite_call_path( const char *path, @@ -436,3 +441,16 @@ int sphlite_get_explosive_summary(int *particle_count, lambda_range, released_totals, detonation_time_range, &ierr); return ierr; } + +int sphlite_get_explosive_release_balance(double *mass_values, + double *energy_values, + double *momentum_values) +{ + int ierr = 0; + if (mass_values == NULL || energy_values == NULL || momentum_values == NULL) { + return -1; + } + SPHLITE_FC_sphft_get_explosive_release_balance(mass_values, + energy_values, momentum_values, &ierr); + return ierr; +} diff --git a/src/output/sph_restart.f90 b/src/output/sph_restart.f90 index 84e6f1f..41464a3 100644 --- a/src/output/sph_restart.f90 +++ b/src/output/sph_restart.f90 @@ -42,10 +42,17 @@ module sph_restart explosive_ignition_material_id, explosive_ignition_x, & explosive_ignition_time, explosive_ignition_status, & explosive_detonation_time, explosive_reaction_progress, & - explosive_released_mass, explosive_released_energy, & - explosive_released_momentum, explosive_dt_reaction + explosive_initial_material_id, explosive_initial_mass, & + explosive_remaining_mass, explosive_released_mass, & + explosive_released_energy, explosive_released_momentum, & + explosive_release_mass_balance, explosive_release_energy_balance, & + explosive_release_momentum_balance, explosive_converted_count, & + explosive_source_target_count, explosive_source_mass_total, & + explosive_source_energy_total, explosive_source_momentum_total, & + explosive_dt_reaction use sph_explosive, only: & - sph_explosive_allocate_state, sph_explosive_clear_material_table + sph_explosive_allocate_state, sph_explosive_clear_material_table, & + sph_explosive_update_release_balance use sph_neighbor, only: neighbor_cell_size, neighbor_cell_dims, neighbor_num_cells, & sph_neighbor_rebuild implicit none @@ -73,7 +80,7 @@ contains end if write(SPH_RESTART_UNIT, '(A,1X,I0,1X,I0,1X,I0,1X,A)') 'SPHLITE_RESTART', & - SPH_VERSION_MAJOR, SPH_VERSION_MINOR, SPH_VERSION_PATCH, 'STATE_0_4' + SPH_VERSION_MAJOR, SPH_VERSION_MINOR, SPH_VERSION_PATCH, 'STATE_0_4_1' write(SPH_RESTART_UNIT, *) current_time, current_step, npart write(SPH_RESTART_UNIT, *) output_interval, output_enabled, safety_factor write(SPH_RESTART_UNIT, '(A)') trim(output_directory) @@ -242,7 +249,8 @@ contains end if if (trim(state_version) == 'STATE_0_3' .or. & trim(state_version) == 'STATE_0_3_1' .or. & - trim(state_version) == 'STATE_0_4') then + trim(state_version) == 'STATE_0_4' .or. & + trim(state_version) == 'STATE_0_4_1') then read(SPH_RESTART_UNIT, *, iostat=ios) gas_eos_type, gas_rho0, gas_gamma, & gas_e0, gas_p0, gas_jwl_a, gas_jwl_b, gas_jwl_r1, gas_jwl_r2, & gas_jwl_omega, gas_pinf @@ -300,7 +308,8 @@ contains end if gas_bubble_history_valid = gas_particle_count > 0 if (trim(state_version) == 'STATE_0_3_1' .or. & - trim(state_version) == 'STATE_0_4') then + trim(state_version) == 'STATE_0_4' .or. & + trim(state_version) == 'STATE_0_4_1') then has_gas_table = .true. has_gas_sources = .true. call sph_restart_read_gas_material_table(ios) @@ -311,7 +320,8 @@ contains return end if end if - if (trim(state_version) == 'STATE_0_4') has_explosive_state = .true. + if (trim(state_version) == 'STATE_0_4' .or. & + trim(state_version) == 'STATE_0_4_1') has_explosive_state = .true. else if (trim(state_version) /= 'STATE_0_2') then call sph_error_set(SPH_ERROR_INPUT, 'unsupported restart state version') ierr = SPH_ERROR_INPUT @@ -346,7 +356,7 @@ contains call sph_gas_clear_sources(ierr) end if if (ierr == SPH_SUCCESS .and. has_explosive_state) then - call sph_restart_read_explosive_state(ios) + call sph_restart_read_explosive_state(state_version, ios) if (ios /= 0) then call sph_error_set(SPH_ERROR_INPUT, 'invalid restart Explosive state') ierr = SPH_ERROR_INPUT @@ -427,21 +437,31 @@ contains explosive_ignition_x(:,i), explosive_ignition_time(i) end do write(SPH_RESTART_UNIT, *) explosive_dt_reaction + write(SPH_RESTART_UNIT, *) explosive_converted_count, explosive_source_target_count + write(SPH_RESTART_UNIT, *) explosive_source_mass_total, & + explosive_source_energy_total, explosive_source_momentum_total(:) + write(SPH_RESTART_UNIT, *) explosive_release_mass_balance(:) + write(SPH_RESTART_UNIT, *) explosive_release_energy_balance(:) + write(SPH_RESTART_UNIT, *) explosive_release_momentum_balance(:) do i = 1, npart write(SPH_RESTART_UNIT, *) explosive_ignition_status(i), & explosive_detonation_time(i), explosive_reaction_progress(i), & explosive_released_mass(i), explosive_released_energy(i), & - explosive_released_momentum(:,i) + explosive_released_momentum(:,i), explosive_initial_material_id(i), & + explosive_initial_mass(i), explosive_remaining_mass(i) end do end subroutine sph_restart_write_explosive_state - subroutine sph_restart_read_explosive_state(ios) + subroutine sph_restart_read_explosive_state(state_version, ios) + character(len=*), intent(in) :: state_version integer, intent(out) :: ios integer :: i integer :: table_count integer :: local_ierr + logical :: has_041_state ios = 0 + has_041_state = trim(state_version) == 'STATE_0_4_1' call sph_explosive_clear_material_table() read(SPH_RESTART_UNIT, *, iostat=ios) table_count if (ios /= 0) return @@ -481,15 +501,54 @@ contains ios = 1 return end if + if (has_041_state) then + read(SPH_RESTART_UNIT, *, iostat=ios) explosive_converted_count, & + explosive_source_target_count + if (ios /= 0) return + read(SPH_RESTART_UNIT, *, iostat=ios) explosive_source_mass_total, & + explosive_source_energy_total, explosive_source_momentum_total(:) + if (ios /= 0) return + read(SPH_RESTART_UNIT, *, iostat=ios) explosive_release_mass_balance(:) + if (ios /= 0) return + read(SPH_RESTART_UNIT, *, iostat=ios) explosive_release_energy_balance(:) + if (ios /= 0) return + read(SPH_RESTART_UNIT, *, iostat=ios) explosive_release_momentum_balance(:) + if (ios /= 0) return + end if do i = 1, npart - read(SPH_RESTART_UNIT, *, iostat=ios) explosive_ignition_status(i), & - explosive_detonation_time(i), explosive_reaction_progress(i), & - explosive_released_mass(i), explosive_released_energy(i), & - explosive_released_momentum(:,i) + if (has_041_state) then + read(SPH_RESTART_UNIT, *, iostat=ios) explosive_ignition_status(i), & + explosive_detonation_time(i), explosive_reaction_progress(i), & + explosive_released_mass(i), explosive_released_energy(i), & + explosive_released_momentum(:,i), explosive_initial_material_id(i), & + explosive_initial_mass(i), explosive_remaining_mass(i) + else + read(SPH_RESTART_UNIT, *, iostat=ios) explosive_ignition_status(i), & + explosive_detonation_time(i), explosive_reaction_progress(i), & + explosive_released_mass(i), explosive_released_energy(i), & + explosive_released_momentum(:,i) + if (ios == 0) call sph_restart_seed_explosive_041_defaults(i) + end if if (ios /= 0) return end do + call sph_explosive_update_release_balance() end subroutine sph_restart_read_explosive_state + subroutine sph_restart_seed_explosive_041_defaults(i) + integer, intent(in) :: i + real(rk) :: lambda_value + + explosive_initial_material_id(i) = material_id(i) + lambda_value = explosive_reaction_progress(i) + if (explosive_released_mass(i) > 0.0_rk .and. lambda_value > 0.0_rk) then + explosive_initial_mass(i) = explosive_released_mass(i) / lambda_value + else + explosive_initial_mass(i) = mass(i) + end if + explosive_remaining_mass(i) = max(0.0_rk, & + explosive_initial_mass(i) - explosive_released_mass(i)) + end subroutine sph_restart_seed_explosive_041_defaults + subroutine sph_restart_clear_explosive_state(ierr) integer, intent(out) :: ierr diff --git a/tests/interface/test_c_api.c b/tests/interface/test_c_api.c index ba7a2c5..09ea140 100644 --- a/tests/interface/test_c_api.c +++ b/tests/interface/test_c_api.c @@ -60,6 +60,9 @@ int main(void) double explosive_lambda_range[3] = {0.0, 0.0, 0.0}; double explosive_released_totals[5] = {0.0, 0.0, 0.0, 0.0, 0.0}; double explosive_detonation_range[2] = {0.0, 0.0}; + double explosive_release_mass_values[4] = {0.0, 0.0, 0.0, 0.0}; + double explosive_release_energy_values[2] = {0.0, 0.0}; + double explosive_release_momentum_values[3] = {0.0, 0.0, 0.0}; if (SPHLITE_PHASE_SOLID != 4 || SPHLITE_PHASE_GAS != 2 || SPHLITE_STATUS_ACTIVE != 0) { @@ -123,6 +126,18 @@ int main(void) explosive_detonation_range) != -1) { return fail("null explosive summary lambda pointer did not return -1"); } + if (sphlite_get_explosive_release_balance(NULL, + explosive_release_energy_values, explosive_release_momentum_values) != -1) { + return fail("null explosive release mass pointer did not return -1"); + } + if (sphlite_get_explosive_release_balance(explosive_release_mass_values, + NULL, explosive_release_momentum_values) != -1) { + return fail("null explosive release energy pointer did not return -1"); + } + if (sphlite_get_explosive_release_balance(explosive_release_mass_values, + explosive_release_energy_values, NULL) != -1) { + return fail("null explosive release momentum pointer did not return -1"); + } if (sphlite_get_gas_summary(&gas_volume, gas_center, &gas_mean_pressure, &gas_max_pressure) != 2) { return fail("uninitialized gas summary did not return Fortran state error"); @@ -280,6 +295,14 @@ int main(void) if (explosive_lambda_range[1] <= 0.0 || explosive_released_totals[1] <= 0.0) { return fail("explosive summary content mismatch"); } + ierr = sphlite_get_explosive_release_balance(explosive_release_mass_values, + explosive_release_energy_values, explosive_release_momentum_values); + if (ierr != 0) return fail("explosive release balance query failed"); + if (explosive_release_mass_values[0] <= 0.0 || + explosive_release_mass_values[1] <= 0.0 || + explosive_release_energy_values[0] <= 0.0) { + return fail("explosive release balance content mismatch"); + } ierr = sphlite_finalize(); if (ierr != 0) return fail("finalize explosive failed"); return 0; diff --git a/tests/interface/test_cpp_api.cpp b/tests/interface/test_cpp_api.cpp index 57e4a4a..9c21ca4 100644 --- a/tests/interface/test_cpp_api.cpp +++ b/tests/interface/test_cpp_api.cpp @@ -92,6 +92,11 @@ int main() if (explosive.lambda_range[1] <= 0.0 || explosive.released_totals[1] <= 0.0) { return 1; } + sphlite::ExplosiveReleaseBalance balance = sphlite::explosive_release_balance(); + if (balance.mass_values[0] <= 0.0 || balance.mass_values[1] <= 0.0 || + balance.energy_values[0] <= 0.0) { + return 1; + } explosive_session.close(); return 0; diff --git a/tests/module/test_explosive_restart_040_compat.f90 b/tests/module/test_explosive_restart_040_compat.f90 new file mode 100644 index 0000000..65911ab --- /dev/null +++ b/tests/module/test_explosive_restart_040_compat.f90 @@ -0,0 +1,110 @@ +program test_explosive_restart_040_compat + use sph_precision, only: rk + use sph_error, only: SPH_SUCCESS + use sph_api, only: sph_initialize, sph_finalize, sph_read_restart, & + sph_advance_explicit + use sph_explosive, only: sph_explosive_get_release_balance + use sph_explosive_state, only: explosive_initial_mass, explosive_remaining_mass + implicit none + + integer :: ierr + real(rk) :: mass_values(4) + real(rk) :: energy_values(2) + real(rk) :: momentum_values(3) + + call write_040_restart('build-codex-unix/restart_explosive_040_compat.tmp') + call sph_initialize(ierr) + call assert_ok(ierr, 'initialize failed') + call sph_read_restart('build-codex-unix/restart_explosive_040_compat.tmp', ierr) + call assert_ok(ierr, 'read 0.4 restart failed') + call sph_explosive_get_release_balance(mass_values, energy_values, & + momentum_values, ierr) + call assert_ok(ierr, '0.4 balance query failed') + call assert_close(explosive_initial_mass(1), 0.02_rk, '0.4 initial mass default mismatch') + call assert_close(explosive_remaining_mass(1), 0.01_rk, '0.4 remaining mass default mismatch') + call assert_close(mass_values(1), 0.02_rk, '0.4 initial mass balance mismatch') + call assert_close(mass_values(2), 0.01_rk, '0.4 released mass balance mismatch') + call assert_close(mass_values(3), 0.01_rk, '0.4 remaining mass balance mismatch') + call sph_advance_explicit(1.0e-7_rk, ierr) + call assert_ok(ierr, 'continue 0.4 restart failed') + call sph_explosive_get_release_balance(mass_values, energy_values, & + momentum_values, ierr) + call assert_ok(ierr, '0.4 balance after continue failed') + call assert_close(mass_values(2), 0.02_rk, '0.4 restart release increment mismatch') + call sph_finalize(ierr) + call assert_ok(ierr, 'finalize failed') + +contains + + subroutine write_040_restart(filename) + character(len=*), intent(in) :: filename + + open(unit=92, file=trim(filename), status='unknown', action='write') + write(92, '(A)') 'SPHLITE_RESTART 0 4 0 STATE_0_4' + write(92, *) 0.0_rk, 0, 1 + write(92, *) 1, .false., 0.5_rk + write(92, '(A)') 'build-codex-unix' + write(92, *) 1000.0_rk, 1500.0_rk, 7.0_rk, 0.0_rk, 0.0_rk + write(92, *) 1.0_rk, 2.0_rk, 0.01_rk + write(92, *) 0.0_rk, 0.0_rk, 0.0_rk + write(92, *) 0.15_rk, 1, 1, 1, 1 + write(92, *) 0, 0.0_rk + write(92, *) 0.0_rk, 0.0_rk, 0.0_rk, 0.0_rk, 0.0_rk, 0.0_rk, 0.0_rk + write(92, *) 1.0e-4_rk, 1.0e30_rk, 1.0e30_rk + write(92, *) 2, 1600.0_rk, 1.4_rk, 4.2e6_rk, 0.0_rk, 3.712e11_rk, & + 3.231e9_rk, 4.15_rk, 0.95_rk, 0.3_rk, 0.0_rk + write(92, *) 0.10_rk, 0.02_rk, 1.25e-5_rk + write(92, *) 0.0_rk, 0.0_rk, 0.0_rk + write(92, *) 0, 0.0_rk, 0.0_rk + write(92, *) 0.0_rk, 0.0_rk, 0.0_rk, 0.0_rk, 0.0_rk, 0.0_rk, & + 0.0_rk, 0.0_rk, 0.0_rk, 0.0_rk + write(92, *) 0.0_rk, 0.0_rk, 0.0_rk, 0.0_rk, 0.0_rk, 0.0_rk, 0.0_rk + write(92, *) 1.0e-4_rk, 1.0e30_rk, 1.0e-4_rk + write(92, *) 1 + write(92, *) 2, 'PRODUCTS', .true., 2 + write(92, *) 1600.0_rk, 4.2e6_rk, 293.15_rk + write(92, *) 1600.0_rk, 1.4_rk, 0.0_rk, 0.0_rk + write(92, *) 3.712e11_rk, 3.231e9_rk, 4.15_rk, 0.95_rk, 0.3_rk + write(92, *) 0.10_rk, 0.02_rk, 1.25e-5_rk + write(92, *) 1, 3, 0, 1, 1 + write(92, *) 0.0_rk, 0.0_rk, 0.0_rk, 0.0_rk, 0.0_rk, 0.0_rk, & + 0.0_rk, 0.0_rk, 0.0_rk, 0.0_rk, 0.0_rk, 0.0_rk, & + 0.0_rk, 0.0_rk, 0.0_rk + write(92, *) 0.02_rk, 1600.0_rk, 1.25e-5_rk, 0.0_rk, 0.0_rk, 293.15_rk, 0.10_rk + write(92, *) 0.0_rk, 0.0_rk, 0.0_rk, 0.0_rk, 0.0_rk + write(92, *) 1 + write(92, *) 1, 'TNT', .true., 2, 'PRODUCTS', 1 + write(92, *) 1600.0_rk, 6900.0_rk, 4.2e6_rk, 1.0e-7_rk + write(92, *) 1 + write(92, *) 1, 0.0_rk, 0.0_rk, 0.0_rk, 0.0_rk + write(92, *) 2.5e-8_rk + write(92, *) 1, 0.0_rk, 0.5_rk, 0.01_rk, 4.2e4_rk, & + 0.0_rk, 0.0_rk, 0.0_rk + close(92) + end subroutine write_040_restart + + 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_restart_040_compat diff --git a/tests/module/test_explosive_restart_041.f90 b/tests/module/test_explosive_restart_041.f90 new file mode 100644 index 0000000..0216056 --- /dev/null +++ b/tests/module/test_explosive_restart_041.f90 @@ -0,0 +1,96 @@ +program test_explosive_restart_041 + 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 + use sph_explosive, only: sph_explosive_get_release_balance + use sph_explosive_state, only: explosive_initial_mass, & + explosive_remaining_mass, explosive_converted_count + implicit none + + integer :: ierr + real(rk) :: mass_before(4) + real(rk) :: mass_after(4) + real(rk) :: energy_before(2) + real(rk) :: energy_after(2) + real(rk) :: momentum_before(3) + real(rk) :: momentum_after(3) + + call sph_initialize(ierr) + call assert_ok(ierr, 'initialize failed') + call sph_read_inp('tests/data/explosive_conversion_phase_040.inp', ierr) + call assert_ok(ierr, 'read failed') + call sph_build_model(ierr) + call assert_ok(ierr, 'build failed') + call sph_advance_explicit(1.0e-7_rk, ierr) + call assert_ok(ierr, 'advance failed') + call sph_explosive_get_release_balance(mass_before, energy_before, & + momentum_before, ierr) + call assert_ok(ierr, 'balance before restart failed') + call sph_write_restart('build-codex-unix/restart_explosive_041.tmp', ierr) + call assert_ok(ierr, 'write 0.4.1 restart failed') + call assert_restart_header('build-codex-unix/restart_explosive_041.tmp') + call sph_finalize(ierr) + call assert_ok(ierr, 'finalize first session failed') + + call sph_initialize(ierr) + call assert_ok(ierr, 'initialize restart session failed') + call sph_read_restart('build-codex-unix/restart_explosive_041.tmp', ierr) + call assert_ok(ierr, 'read 0.4.1 restart failed') + call sph_explosive_get_release_balance(mass_after, energy_after, & + momentum_after, ierr) + call assert_ok(ierr, 'balance after restart failed') + call assert_array_close(mass_after, mass_before, 4, 'mass balance restart mismatch') + call assert_array_close(energy_after, energy_before, 2, 'energy balance restart mismatch') + call assert_array_close(momentum_after, momentum_before, 3, 'momentum restart mismatch') + if (explosive_initial_mass(1) <= 0.0_rk) call fail('initial mass was not restored') + if (explosive_remaining_mass(1) /= 0.0_rk) call fail('remaining mass mismatch') + if (explosive_converted_count <= 0) call fail('converted count was not restored') + call sph_finalize(ierr) + call assert_ok(ierr, 'finalize restart session failed') + +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=91, file=trim(filename), status='old', action='read', iostat=ios) + if (ios /= 0) call fail('restart header open failed') + read(91, *, iostat=ios) tag, major, minor, patch, state + close(91) + if (ios /= 0) call fail('restart header read failed') + if (trim(tag) /= 'SPHLITE_RESTART') call fail('restart tag mismatch') + if (trim(state) /= 'STATE_0_4_1') call fail('restart state version 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 assert_array_close(actual, expected, n, message) + integer, intent(in) :: n + real(rk), intent(in) :: actual(n) + real(rk), intent(in) :: expected(n) + character(len=*), intent(in) :: message + + if (maxval(abs(actual - expected)) > 1.0e-12_rk) call fail(message) + end subroutine assert_array_close + + subroutine fail(message) + character(len=*), intent(in) :: message + + write(*, '(A)') trim(message) + stop 1 + end subroutine fail + +end program test_explosive_restart_041 diff --git a/tests/module/test_explosive_restart_no_double_release.f90 b/tests/module/test_explosive_restart_no_double_release.f90 new file mode 100644 index 0000000..5580b92 --- /dev/null +++ b/tests/module/test_explosive_restart_no_double_release.f90 @@ -0,0 +1,69 @@ +program test_explosive_restart_no_double_release + 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 + use sph_explosive, only: sph_explosive_get_release_balance + implicit none + + integer :: ierr + real(rk) :: mass_before(4) + real(rk) :: mass_after(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_conversion_phase_040.inp', ierr) + call assert_ok(ierr, 'read failed') + call sph_build_model(ierr) + call assert_ok(ierr, 'build failed') + call sph_advance_explicit(1.0e-7_rk, ierr) + call assert_ok(ierr, 'advance before restart failed') + call sph_explosive_get_release_balance(mass_before, energy_values, & + momentum_values, ierr) + call assert_ok(ierr, 'balance before restart failed') + call sph_write_restart('build-codex-unix/restart_no_double_release.tmp', ierr) + call assert_ok(ierr, 'write restart failed') + call sph_finalize(ierr) + call assert_ok(ierr, 'finalize first session failed') + + call sph_initialize(ierr) + call assert_ok(ierr, 'initialize restart session failed') + call sph_read_restart('build-codex-unix/restart_no_double_release.tmp', ierr) + call assert_ok(ierr, 'read restart failed') + call sph_advance_explicit(1.0e-7_rk, ierr) + call assert_ok(ierr, 'advance after restart failed') + call sph_explosive_get_release_balance(mass_after, energy_values, & + momentum_values, ierr) + call assert_ok(ierr, 'balance after restart failed') + call assert_close(mass_after(2), mass_before(2), 'restart repeated release') + call sph_finalize(ierr) + call assert_ok(ierr, 'finalize restart session 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) call fail(message) + 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_restart_no_double_release diff --git a/todo.md b/todo.md index 7b2aab8..f66a71a 100644 --- a/todo.md +++ b/todo.md @@ -102,26 +102,26 @@ ## 阶段 E:Restart、API、C++、Python 与 CLI -- [ ] 将 restart 状态版本更新为 `STATE_0_4_1`。 -- [ ] 将 Explosive 反应质量基准写入 0.4.1 restart。 -- [ ] 将 release balance 相关状态写入 0.4.1 restart。 -- [ ] 将 SOURCE/PHASE 诊断计数写入 0.4.1 restart。 -- [ ] 从 0.4.1 restart 读回反应质量基准。 -- [ ] 从 0.4.1 restart 读回 release balance 相关状态。 -- [ ] 从 0.4.0 restart 读回时初始化新增 0.4.1 状态。 -- [ ] 从 0.3.1 restart 读回时保持空 Explosive 状态。 -- [ ] 新增 restart 后继续推进不重复释放测试。 -- [ ] 新增 `sph_get_explosive_release_balance` Fortran API。 -- [ ] 新增 `sphlite_get_explosive_release_balance` C ABI。 -- [ ] 在 C ABI 中补齐新增接口的空指针错误路径。 -- [ ] 在 C API 测试中覆盖 release balance 查询。 -- [ ] 在 C++ wrapper 中增加 release balance 薄包装。 -- [ ] 在 C++ API 测试中覆盖 release balance 薄包装。 -- [ ] 在 Python ctypes 中增加 release balance 薄包装。 -- [ ] 在 Python checker 中覆盖多点点火和 release balance。 -- [ ] 在 CLI inspect/run 中追加 release balance 字段。 -- [ ] 在 CLI checker 中覆盖多点点火、多材料和 release balance 字段。 -- [ ] 新增 0.4.1 restart/API/CLI/Python 专项 CTest 条目。 +- [x] 将 restart 状态版本更新为 `STATE_0_4_1`。 +- [x] 将 Explosive 反应质量基准写入 0.4.1 restart。 +- [x] 将 release balance 相关状态写入 0.4.1 restart。 +- [x] 将 SOURCE/PHASE 诊断计数写入 0.4.1 restart。 +- [x] 从 0.4.1 restart 读回反应质量基准。 +- [x] 从 0.4.1 restart 读回 release balance 相关状态。 +- [x] 从 0.4.0 restart 读回时初始化新增 0.4.1 状态。 +- [x] 从 0.3.1 restart 读回时保持空 Explosive 状态。 +- [x] 新增 restart 后继续推进不重复释放测试。 +- [x] 新增 `sph_get_explosive_release_balance` Fortran API。 +- [x] 新增 `sphlite_get_explosive_release_balance` C ABI。 +- [x] 在 C ABI 中补齐新增接口的空指针错误路径。 +- [x] 在 C API 测试中覆盖 release balance 查询。 +- [x] 在 C++ wrapper 中增加 release balance 薄包装。 +- [x] 在 C++ API 测试中覆盖 release balance 薄包装。 +- [x] 在 Python ctypes 中增加 release balance 薄包装。 +- [x] 在 Python checker 中覆盖多点点火和 release balance。 +- [x] 在 CLI inspect/run 中追加 release balance 字段。 +- [x] 在 CLI checker 中覆盖多点点火、多材料和 release balance 字段。 +- [x] 新增 0.4.1 restart/API/CLI/Python 专项 CTest 条目。 ## 阶段 F:回归、门禁、文档同步与发布准备 diff --git a/tools/testing/test_cli.py b/tools/testing/test_cli.py index 8113529..285ae56 100644 --- a/tools/testing/test_cli.py +++ b/tools/testing/test_cli.py @@ -92,6 +92,13 @@ def main() -> int: "explosive_released_energy", "explosive_detonation_time_min", "explosive_detonation_time_max", + "explosive_initial_mass", + "explosive_remaining_mass", + "explosive_release_mass_error", + "explosive_release_energy_error", + "explosive_release_momentum_x", + "explosive_release_momentum_y", + "explosive_release_momentum_z", "status", ): require_field(inspect.stdout, field) @@ -158,6 +165,10 @@ def main() -> int: raise AssertionError("CLI explosive lambda mismatch") if float(explosive_fields["explosive_released_energy"]) <= 0.0: raise AssertionError("CLI explosive released energy mismatch") + if float(explosive_fields["explosive_initial_mass"]) <= 0.0: + raise AssertionError("CLI explosive initial mass mismatch") + if float(explosive_fields["explosive_release_energy_error"]) != 0.0: + raise AssertionError("CLI explosive release energy balance mismatch") check = run_command([exe, model, "--check"]) if "mode: check" not in check.stdout: diff --git a/tools/testing/test_python_debug.py b/tools/testing/test_python_debug.py index 1b75be7..585df63 100644 --- a/tools/testing/test_python_debug.py +++ b/tools/testing/test_python_debug.py @@ -33,6 +33,8 @@ def main() -> int: raise AssertionError("Python wrapper is missing Gas extended C ABI diagnostics") if not hasattr(solver.lib, "sphlite_get_explosive_summary"): raise AssertionError("Python wrapper is missing Explosive C ABI diagnostics") + if not hasattr(solver.lib, "sphlite_get_explosive_release_balance"): + raise AssertionError("Python wrapper is missing Explosive release C ABI") if not hasattr(solver.lib, "sphlite_set_ignition_point"): raise AssertionError("Python wrapper is missing Explosive ignition C ABI") if solver.version() != (0, 4, 1): @@ -59,6 +61,8 @@ def main() -> int: raise AssertionError("inspect helper did not include Gas extended diagnostics") if "explosive_particles" not in solid_summary or "explosive_lambda_range" not in solid_summary: raise AssertionError("inspect helper did not include Explosive diagnostics") + if "explosive_release_mass_values" not in solid_summary: + raise AssertionError("inspect helper did not include Explosive release balance") solver.set_output_directory(root / "build-codex-unix") solver.write_output(0, 0.0) restart = root / "build-codex-unix" / "python_restart.tmp" @@ -135,6 +139,11 @@ def main() -> int: raise AssertionError("explosive summary lambda mismatch") if explosive_summary["explosive_released_totals"][1] <= 0.0: raise AssertionError("explosive summary energy mismatch") + explosive_balance = explosive.explosive_release_balance() + if explosive_balance["explosive_release_mass_values"][0] <= 0.0: + raise AssertionError("explosive release balance mass mismatch") + if explosive_balance["explosive_release_energy_values"][0] <= 0.0: + raise AssertionError("explosive release balance energy mismatch") finally: explosive.finalize()