diff --git a/CMakeLists.txt b/CMakeLists.txt index 5488692..a00215a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,6 +52,8 @@ if(CMAKE_Fortran_COMPILER_ID STREQUAL "GNU") #define SPHLITE_FC_sphft_get_gas_summary sphft_get_gas_summary_ #define SPHLITE_FC_sphft_get_gas_bubble_metrics sphft_get_gas_bubble_metrics_ #define SPHLITE_FC_sphft_get_gas_dt_limits sphft_get_gas_dt_limits_ +#define SPHLITE_FC_sphft_get_gas_extended_summary sphft_get_gas_extended_summary_ +#define SPHLITE_FC_sphft_get_gas_source_summary sphft_get_gas_source_summary_ #endif ") endif() @@ -246,6 +248,12 @@ set_target_properties(test_gas_restart PROPERTIES Fortran_MODULE_DIRECTORY "${SP add_test(NAME gas_restart COMMAND test_gas_restart) set_tests_properties(gas_restart PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") +add_executable(test_gas_restart_030_compat tests/module/test_gas_restart_030_compat.f90) +target_link_libraries(test_gas_restart_030_compat PRIVATE sphlite_core) +set_target_properties(test_gas_restart_030_compat PROPERTIES Fortran_MODULE_DIRECTORY "${SPHLITE_MODULE_DIR}") +add_test(NAME gas_restart_030_compat COMMAND test_gas_restart_030_compat) +set_tests_properties(gas_restart_030_compat PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") + add_executable(test_water_density tests/module/test_water_density.f90) target_link_libraries(test_water_density PRIVATE sphlite_core) set_target_properties(test_water_density PROPERTIES Fortran_MODULE_DIRECTORY "${SPHLITE_MODULE_DIR}") diff --git a/Python/sphlite_debug.py b/Python/sphlite_debug.py index 4fe919a..eac5cad 100644 --- a/Python/sphlite_debug.py +++ b/Python/sphlite_debug.py @@ -105,6 +105,21 @@ class SPHLite: ] self.lib.sphlite_get_gas_dt_limits.restype = ctypes.c_int + self.lib.sphlite_get_gas_extended_summary.argtypes = [ + ctypes.POINTER(ctypes.c_double), + ctypes.POINTER(ctypes.c_double), + ctypes.POINTER(ctypes.c_double), + ctypes.POINTER(ctypes.c_double), + ] + self.lib.sphlite_get_gas_extended_summary.restype = ctypes.c_int + + self.lib.sphlite_get_gas_source_summary.argtypes = [ + ctypes.POINTER(ctypes.c_double), + ctypes.POINTER(ctypes.c_double), + ctypes.POINTER(ctypes.c_double), + ] + self.lib.sphlite_get_gas_source_summary.restype = ctypes.c_int + self.lib.sphlite_get_particle_state.argtypes = [ ctypes.c_int, ctypes.POINTER(ctypes.c_int), @@ -332,6 +347,43 @@ class SPHLite: "gas_dtcrit": float(dtcrit.value), } + def gas_extended_summary(self) -> dict[str, float | list[float]]: + mass = ctypes.c_double(0.0) + momentum_type = ctypes.c_double * 3 + range_type = ctypes.c_double * 2 + limits_type = ctypes.c_double * 3 + momentum = momentum_type() + density_range = range_type() + dt_limits = limits_type() + self._check(self.lib.sphlite_get_gas_extended_summary( + ctypes.byref(mass), + momentum, + density_range, + dt_limits, + )) + return { + "gas_mass": float(mass.value), + "gas_momentum": list(momentum), + "gas_density_range": list(density_range), + "gas_dt_limits": list(dt_limits), + } + + def gas_source_summary(self) -> dict[str, float | list[float]]: + mass_source = ctypes.c_double(0.0) + energy_source = ctypes.c_double(0.0) + momentum_type = ctypes.c_double * 3 + momentum_source = momentum_type() + self._check(self.lib.sphlite_get_gas_source_summary( + ctypes.byref(mass_source), + momentum_source, + ctypes.byref(energy_source), + )) + return { + "gas_source_mass": float(mass_source.value), + "gas_source_momentum": list(momentum_source), + "gas_source_energy": float(energy_source.value), + } + def inspect(self, filename: str | Path) -> dict[str, int | float | list[float]]: self.read_inp(filename) self.build_model() @@ -344,6 +396,8 @@ class SPHLite: summary.update(self.gas_summary()) summary.update(self.gas_bubble_metrics()) summary.update(self.gas_dt_limits()) + summary.update(self.gas_extended_summary()) + summary.update(self.gas_source_summary()) return summary def run(self, filename: str | Path) -> dict[str, int | float | list[float]]: @@ -355,4 +409,6 @@ class SPHLite: summary.update(self.gas_summary()) summary.update(self.gas_bubble_metrics()) summary.update(self.gas_dt_limits()) + summary.update(self.gas_extended_summary()) + summary.update(self.gas_source_summary()) return summary diff --git a/include/sphlite.hpp b/include/sphlite.hpp index 257e1ce..c9c0def 100644 --- a/include/sphlite.hpp +++ b/include/sphlite.hpp @@ -83,6 +83,19 @@ struct GasDtLimits { double dtcrit; }; +struct GasExtendedSummary { + double mass; + double momentum[3]; + double density_range[2]; + double dt_limits[3]; +}; + +struct GasSourceSummary { + double mass_source; + double momentum_source[3]; + double energy_source; +}; + class Error : public std::runtime_error { public: explicit Error(const std::string &message) : std::runtime_error(message) {} @@ -210,6 +223,23 @@ inline GasDtLimits gas_dt_limits() return limits; } +inline GasExtendedSummary gas_extended_summary() +{ + GasExtendedSummary summary = { + 0.0, {0.0, 0.0, 0.0}, {0.0, 0.0}, {0.0, 0.0, 0.0}}; + check(sphlite_get_gas_extended_summary(&summary.mass, summary.momentum, + summary.density_range, summary.dt_limits)); + return summary; +} + +inline GasSourceSummary gas_source_summary() +{ + GasSourceSummary summary = {0.0, {0.0, 0.0, 0.0}, 0.0}; + check(sphlite_get_gas_source_summary(&summary.mass_source, + summary.momentum_source, &summary.energy_source)); + return summary; +} + 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 ceffd87..a056232 100644 --- a/include/sphlite_c_api.h +++ b/include/sphlite_c_api.h @@ -79,8 +79,15 @@ SPHLITE_API int sphlite_get_gas_bubble_metrics(double *equivalent_radius, double *radius_rate, double *center); SPHLITE_API int sphlite_get_gas_dt_limits(double *dt_cfl, - double *dt_accel, - double *dtcrit); + double *dt_accel, + double *dtcrit); +SPHLITE_API int sphlite_get_gas_extended_summary(double *mass, + double *momentum, + double *density_range, + double *dt_limits); +SPHLITE_API int sphlite_get_gas_source_summary(double *mass_source, + double *momentum_source, + double *energy_source); #ifdef __cplusplus } diff --git a/src/app/sph_main.c b/src/app/sph_main.c index 98e4a0a..d93a298 100644 --- a/src/app/sph_main.c +++ b/src/app/sph_main.c @@ -122,6 +122,13 @@ int main(int argc, char **argv) double gas_dt_cfl = 0.0; double gas_dt_accel = 0.0; double gas_dtcrit = 0.0; + double gas_extended_mass = 0.0; + double gas_momentum[3] = {0.0, 0.0, 0.0}; + double gas_density_range[2] = {0.0, 0.0}; + double gas_dt_limits[3] = {0.0, 0.0, 0.0}; + double gas_source_mass = 0.0; + double gas_source_momentum[3] = {0.0, 0.0, 0.0}; + double gas_source_energy = 0.0; int run_mode = 0; int check_mode = 0; const char *input = NULL; @@ -284,6 +291,20 @@ int main(int argc, char **argv) (void)sphlite_finalize(); return 1; } + ierr = sphlite_get_gas_extended_summary(&gas_extended_mass, gas_momentum, + gas_density_range, gas_dt_limits); + if (ierr != 0) { + sphlite_print_error(); + (void)sphlite_finalize(); + return 1; + } + ierr = sphlite_get_gas_source_summary(&gas_source_mass, gas_source_momentum, + &gas_source_energy); + 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); @@ -303,9 +324,22 @@ int main(int argc, char **argv) printf("gas_center_z: %.16e\n", gas_center[2]); printf("gas_mean_pressure: %.16e\n", gas_mean_pressure); printf("gas_max_pressure: %.16e\n", gas_max_pressure); + printf("gas_mass: %.16e\n", gas_extended_mass); + printf("gas_momentum_x: %.16e\n", gas_momentum[0]); + printf("gas_momentum_y: %.16e\n", gas_momentum[1]); + printf("gas_momentum_z: %.16e\n", gas_momentum[2]); + printf("gas_min_density: %.16e\n", gas_density_range[0]); + printf("gas_max_density: %.16e\n", gas_density_range[1]); printf("gas_equivalent_radius: %.16e\n", gas_equivalent_radius); printf("gas_radius_rate: %.16e\n", gas_radius_rate); + printf("gas_dt_cfl: %.16e\n", gas_dt_limits[0]); + printf("gas_dt_accel: %.16e\n", gas_dt_limits[1]); printf("gas_dtcrit: %.16e\n", gas_dtcrit); + printf("gas_source_mass: %.16e\n", gas_source_mass); + printf("gas_source_energy: %.16e\n", gas_source_energy); + printf("gas_source_momentum_x: %.16e\n", gas_source_momentum[0]); + printf("gas_source_momentum_y: %.16e\n", gas_source_momentum[1]); + printf("gas_source_momentum_z: %.16e\n", gas_source_momentum[2]); printf("status: ok\n"); ierr = sphlite_finalize(); diff --git a/src/gas/sph_gas.f90 b/src/gas/sph_gas.f90 index 7cd61d9..32f5f49 100644 --- a/src/gas/sph_gas.f90 +++ b/src/gas/sph_gas.f90 @@ -879,6 +879,25 @@ contains max_pressure_out = gas_max_pressure end subroutine sph_gas_get_summary + subroutine sph_gas_get_extended_summary(mass_out, momentum_out, & + density_range_out, dt_limits_out, ierr) + real(rk), intent(out) :: mass_out + real(rk), intent(out) :: momentum_out(SPH_NDIM) + real(rk), intent(out) :: density_range_out(2) + real(rk), intent(out) :: dt_limits_out(3) + integer, intent(out) :: ierr + + call sph_gas_update_diagnostics(ierr) + if (ierr /= SPH_SUCCESS) return + call sph_gas_estimate_dt_limits(dt_limits_out(1), dt_limits_out(2), & + dt_limits_out(3), ierr) + if (ierr /= SPH_SUCCESS) return + mass_out = gas_mass + momentum_out = gas_momentum + density_range_out(1) = gas_min_density + density_range_out(2) = gas_max_density + end subroutine sph_gas_get_extended_summary + subroutine sph_gas_get_bubble_metrics(equivalent_radius_out, radius_rate_out, & center_out, ierr) real(rk), intent(out) :: equivalent_radius_out @@ -1041,6 +1060,71 @@ contains end do end subroutine sph_gas_count_unbound_materials + subroutine sph_gas_rebuild_legacy_restart_state(ierr) + integer, intent(out) :: ierr + integer :: i + integer :: gas_index + + ierr = SPH_SUCCESS + call sph_gas_clear_material_table() + do i = 1, npart + if (particle_phase(i) /= SPH_PHASE_GAS) cycle + if (particle_status(i) /= SPH_STATUS_ACTIVE) cycle + if (gas_material_count >= SPH_MAX_MATERIALS) exit + gas_material_count = 1 + gas_material_ids(1) = material_id(i) + gas_material_names(1) = gas_material_name + gas_material_eos_defined(1) = gas_eos_type /= GAS_EOS_NONE + gas_material_eos_type(1) = gas_eos_type + gas_material_density_default(1) = rho(i) + gas_material_energy_default(1) = gas_e0 + gas_material_temperature_default(1) = temperature(i) + gas_material_rho0(1) = gas_rho0 + gas_material_gamma(1) = gas_gamma + gas_material_p0(1) = gas_p0 + gas_material_jwl_a(1) = gas_jwl_a + gas_material_jwl_b(1) = gas_jwl_b + gas_material_jwl_r1(1) = gas_jwl_r1 + gas_material_jwl_r2(1) = gas_jwl_r2 + gas_material_jwl_omega(1) = gas_jwl_omega + gas_material_pinf(1) = gas_pinf + gas_material_default_h(1) = gas_default_h + gas_material_default_mass(1) = gas_default_mass + gas_material_default_volume(1) = gas_default_volume + exit + end do + gas_index = gas_material_count + if (gas_index > 0) then + gas_material_seen = .true. + gas_eos_defined = gas_material_eos_defined(1) + gas_material_internal_id = gas_material_ids(1) + end if + call sph_gas_clear_sources(ierr) + end subroutine sph_gas_rebuild_legacy_restart_state + + subroutine sph_gas_clear_material_table() + gas_material_count = 0 + gas_material_ids = 0 + gas_material_names = ' ' + gas_material_eos_defined = .false. + gas_material_eos_type = GAS_EOS_NONE + gas_material_density_default = 0.0_rk + gas_material_energy_default = 0.0_rk + gas_material_temperature_default = 293.15_rk + gas_material_rho0 = 1.0_rk + gas_material_gamma = 1.4_rk + gas_material_p0 = 0.0_rk + gas_material_jwl_a = 0.0_rk + gas_material_jwl_b = 0.0_rk + gas_material_jwl_r1 = 0.0_rk + gas_material_jwl_r2 = 0.0_rk + gas_material_jwl_omega = 0.0_rk + gas_material_pinf = 0.0_rk + gas_material_default_h = 1.0_rk + gas_material_default_mass = 1.0_rk + gas_material_default_volume = 1.0_rk + end subroutine sph_gas_clear_material_table + logical function sph_gas_is_finite(value) real(rk), intent(in) :: value diff --git a/src/interface/sph_api.f90 b/src/interface/sph_api.f90 index 15d5fe4..6de88cd 100644 --- a/src/interface/sph_api.f90 +++ b/src/interface/sph_api.f90 @@ -21,7 +21,9 @@ module sph_api use sph_water, only: sph_water_initialize, sph_water_reset, & sph_water_get_summary, sph_water_estimate_dt_limits use sph_gas, only: sph_gas_initialize, sph_gas_reset, & - sph_gas_get_summary, sph_gas_get_bubble_metrics, sph_gas_estimate_dt_limits + sph_gas_get_summary, sph_gas_get_extended_summary, & + 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 use sph_solid, only: sph_solid_initialize, sph_solid_reset use sph_shell, only: sph_shell_initialize, sph_shell_reset @@ -399,6 +401,44 @@ contains call sph_gas_estimate_dt_limits(dt_cfl, dt_accel, dtcrit, ierr) end subroutine sph_get_gas_dt_limits + subroutine sph_get_gas_extended_summary(mass, momentum, density_range, & + dt_limits, ierr) + real(rk), intent(out) :: mass + real(rk), intent(out) :: momentum(3) + real(rk), intent(out) :: density_range(2) + real(rk), intent(out) :: dt_limits(3) + integer, intent(out) :: ierr + + mass = 0.0_rk + momentum = 0.0_rk + density_range = 0.0_rk + dt_limits = 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_gas_get_extended_summary(mass, momentum, density_range, & + dt_limits, ierr) + end subroutine sph_get_gas_extended_summary + + subroutine sph_get_gas_source_summary(mass_source, momentum_source, & + energy_source, ierr) + real(rk), intent(out) :: mass_source + real(rk), intent(out) :: momentum_source(3) + real(rk), intent(out) :: energy_source + integer, intent(out) :: ierr + + mass_source = 0.0_rk + momentum_source = 0.0_rk + energy_source = 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_gas_get_source_summary(mass_source, momentum_source, & + energy_source, ierr) + end subroutine sph_get_gas_source_summary + subroutine sph_api_require_initialized(ierr) integer, intent(out) :: ierr @@ -651,6 +691,35 @@ subroutine sphft_get_gas_dt_limits(dt_cfl, dt_accel, dtcrit, ierr) call sph_get_gas_dt_limits(dt_cfl, dt_accel, dtcrit, ierr) end subroutine sphft_get_gas_dt_limits +subroutine sphft_get_gas_extended_summary(mass, momentum, density_range, & + dt_limits, ierr) + use sph_api, only: sph_get_gas_extended_summary + use sph_precision, only: rk + implicit none + real(rk), intent(out) :: mass + real(rk), intent(out) :: momentum(3) + real(rk), intent(out) :: density_range(2) + real(rk), intent(out) :: dt_limits(3) + integer, intent(out) :: ierr + + call sph_get_gas_extended_summary(mass, momentum, density_range, & + dt_limits, ierr) +end subroutine sphft_get_gas_extended_summary + +subroutine sphft_get_gas_source_summary(mass_source, momentum_source, & + energy_source, ierr) + use sph_api, only: sph_get_gas_source_summary + use sph_precision, only: rk + implicit none + real(rk), intent(out) :: mass_source + real(rk), intent(out) :: momentum_source(3) + real(rk), intent(out) :: energy_source + integer, intent(out) :: ierr + + call sph_get_gas_source_summary(mass_source, momentum_source, & + energy_source, ierr) +end subroutine sphft_get_gas_source_summary + 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 ff047f3..1b501a1 100644 --- a/src/interface/sph_c_api.c +++ b/src/interface/sph_c_api.c @@ -75,6 +75,17 @@ extern void SPHLITE_FC_sphft_get_gas_bubble_metrics( int *ierr); extern void SPHLITE_FC_sphft_get_gas_dt_limits( double *dt_cfl, double *dt_accel, double *dtcrit, int *ierr); +extern void SPHLITE_FC_sphft_get_gas_extended_summary( + double *mass, + double *momentum, + double *density_range, + double *dt_limits, + int *ierr); +extern void SPHLITE_FC_sphft_get_gas_source_summary( + double *mass_source, + double *momentum_source, + double *energy_source, + int *ierr); static int sphlite_call_path( const char *path, @@ -353,8 +364,8 @@ int sphlite_get_gas_bubble_metrics(double *equivalent_radius, } int sphlite_get_gas_dt_limits(double *dt_cfl, - double *dt_accel, - double *dtcrit) + double *dt_accel, + double *dtcrit) { int ierr = 0; if (dt_cfl == NULL || dt_accel == NULL || dtcrit == NULL) { @@ -363,3 +374,31 @@ int sphlite_get_gas_dt_limits(double *dt_cfl, SPHLITE_FC_sphft_get_gas_dt_limits(dt_cfl, dt_accel, dtcrit, &ierr); return ierr; } + +int sphlite_get_gas_extended_summary(double *mass, + double *momentum, + double *density_range, + double *dt_limits) +{ + int ierr = 0; + if (mass == NULL || momentum == NULL || density_range == NULL || + dt_limits == NULL) { + return -1; + } + SPHLITE_FC_sphft_get_gas_extended_summary(mass, momentum, density_range, + dt_limits, &ierr); + return ierr; +} + +int sphlite_get_gas_source_summary(double *mass_source, + double *momentum_source, + double *energy_source) +{ + int ierr = 0; + if (mass_source == NULL || momentum_source == NULL || energy_source == NULL) { + return -1; + } + SPHLITE_FC_sphft_get_gas_source_summary(mass_source, momentum_source, + energy_source, &ierr); + return ierr; +} diff --git a/src/output/sph_restart.f90 b/src/output/sph_restart.f90 index f8b8443..19a65ea 100644 --- a/src/output/sph_restart.f90 +++ b/src/output/sph_restart.f90 @@ -3,8 +3,9 @@ module sph_restart use sph_error, only: SPH_SUCCESS, SPH_ERROR_IO, SPH_ERROR_INPUT, sph_error_set use sph_control, only: current_time, current_step, output_interval, output_directory, & output_enabled, safety_factor - use sph_database, only: npart, sph_db_allocate, particle_id_ext, particle_phase, & - particle_status, material_id, section_id, x0, x, v, a, vhalf, mass, rho, & + use sph_database, only: npart, SPH_MAX_MATERIALS, sph_db_allocate, & + particle_id_ext, particle_phase, particle_status, material_id, & + section_id, x0, x, v, a, vhalf, mass, rho, & volume, pressure, internal_energy, temperature, h, water_particle_count, & water_mass, water_momentum, water_max_pressure, water_min_density, & water_max_density, water_pressure_impulse, water_dt_cfl, water_dt_accel, & @@ -19,7 +20,18 @@ module sph_restart use sph_gas, only: 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, gas_default_h, gas_default_mass, gas_default_volume, & - gas_body_force, gas_bubble_history_valid + gas_body_force, gas_bubble_history_valid, gas_material_count, & + gas_material_ids, gas_material_names, gas_material_eos_defined, & + gas_material_eos_type, gas_material_density_default, & + gas_material_energy_default, gas_material_temperature_default, & + gas_material_rho0, gas_material_gamma, gas_material_p0, & + gas_material_jwl_a, gas_material_jwl_b, gas_material_jwl_r1, & + gas_material_jwl_r2, gas_material_jwl_omega, gas_material_pinf, & + gas_material_default_h, gas_material_default_mass, & + gas_material_default_volume, gas_mass_source, gas_energy_source, & + gas_momentum_source, sph_gas_allocate_sources, sph_gas_clear_sources, & + sph_gas_clear_material_table, sph_gas_rebuild_legacy_restart_state, & + sph_gas_update_diagnostics use sph_neighbor, only: neighbor_cell_size, neighbor_cell_dims, neighbor_num_cells, & sph_neighbor_rebuild implicit none @@ -35,6 +47,9 @@ contains integer :: i ierr = SPH_SUCCESS + call sph_gas_allocate_sources(ierr) + if (ierr /= SPH_SUCCESS) return + open(unit=SPH_RESTART_UNIT, file=trim(filename), status='unknown', & action='write', iostat=ios) if (ios /= 0) then @@ -44,7 +59,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_3' + SPH_VERSION_MAJOR, SPH_VERSION_MINOR, SPH_VERSION_PATCH, 'STATE_0_3_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) @@ -66,6 +81,20 @@ contains write(SPH_RESTART_UNIT, *) gas_equivalent_radius, gas_previous_equivalent_radius, & gas_radius_rate, gas_previous_center(:), gas_center_shift write(SPH_RESTART_UNIT, *) gas_dt_cfl, gas_dt_accel, gas_dtcrit + write(SPH_RESTART_UNIT, *) gas_material_count + do i = 1, gas_material_count + write(SPH_RESTART_UNIT, *) gas_material_ids(i), trim(gas_material_names(i)), & + gas_material_eos_defined(i), gas_material_eos_type(i) + write(SPH_RESTART_UNIT, *) gas_material_density_default(i), & + gas_material_energy_default(i), gas_material_temperature_default(i) + write(SPH_RESTART_UNIT, *) gas_material_rho0(i), gas_material_gamma(i), & + gas_material_p0(i), gas_material_pinf(i) + write(SPH_RESTART_UNIT, *) gas_material_jwl_a(i), gas_material_jwl_b(i), & + gas_material_jwl_r1(i), gas_material_jwl_r2(i), & + gas_material_jwl_omega(i) + write(SPH_RESTART_UNIT, *) gas_material_default_h(i), & + gas_material_default_mass(i), gas_material_default_volume(i) + end do do i = 1, npart write(SPH_RESTART_UNIT, *) particle_id_ext(i), particle_phase(i), & particle_status(i), material_id(i), section_id(i) @@ -73,6 +102,10 @@ contains write(SPH_RESTART_UNIT, *) mass(i), rho(i), volume(i), pressure(i), & internal_energy(i), temperature(i), h(i) end do + do i = 1, npart + write(SPH_RESTART_UNIT, *) gas_mass_source(i), gas_energy_source(i), & + gas_momentum_source(:,i) + end do close(unit=SPH_RESTART_UNIT) end subroutine sph_restart_write @@ -87,8 +120,12 @@ contains integer :: ios integer :: count integer :: i + logical :: has_gas_table + logical :: has_gas_sources ierr = SPH_SUCCESS + has_gas_table = .false. + has_gas_sources = .false. open(unit=SPH_RESTART_UNIT, file=trim(filename), status='old', & action='read', iostat=ios) if (ios /= 0) then @@ -181,7 +218,8 @@ contains close(unit=SPH_RESTART_UNIT) return end if - if (trim(state_version) == 'STATE_0_3') then + if (trim(state_version) == 'STATE_0_3' .or. & + trim(state_version) == 'STATE_0_3_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 @@ -238,6 +276,17 @@ contains return end if gas_bubble_history_valid = gas_particle_count > 0 + if (trim(state_version) == 'STATE_0_3_1') then + has_gas_table = .true. + has_gas_sources = .true. + call sph_restart_read_gas_material_table(ios) + if (ios /= 0) then + call sph_error_set(SPH_ERROR_INPUT, 'invalid restart Gas material table') + ierr = SPH_ERROR_INPUT + close(unit=SPH_RESTART_UNIT) + return + end if + end if else if (trim(state_version) /= 'STATE_0_2') then call sph_error_set(SPH_ERROR_INPUT, 'unsupported restart state version') ierr = SPH_ERROR_INPUT @@ -259,11 +308,70 @@ contains call sph_error_set(SPH_ERROR_INPUT, 'restart file ended unexpectedly') ierr = SPH_ERROR_INPUT end if + if (ierr == SPH_SUCCESS .and. has_gas_sources) then + call sph_gas_allocate_sources(ierr) + if (ierr == SPH_SUCCESS) call sph_restart_read_gas_sources(ios) + if (ierr == SPH_SUCCESS .and. ios /= 0) then + call sph_error_set(SPH_ERROR_INPUT, 'invalid restart Gas source state') + ierr = SPH_ERROR_INPUT + end if + else if (ierr == SPH_SUCCESS .and. trim(state_version) == 'STATE_0_3') then + call sph_gas_rebuild_legacy_restart_state(ierr) + else if (ierr == SPH_SUCCESS) then + call sph_gas_clear_sources(ierr) + end if if (ierr == SPH_SUCCESS) then call sph_neighbor_rebuild(ierr) if (ierr == SPH_SUCCESS) call sph_water_update_diagnostics(ierr) + if (ierr == SPH_SUCCESS) call sph_gas_update_diagnostics(ierr) end if close(unit=SPH_RESTART_UNIT) end subroutine sph_restart_read + subroutine sph_restart_read_gas_material_table(ios) + integer, intent(out) :: ios + integer :: i + integer :: table_count + + call sph_gas_clear_material_table() + read(SPH_RESTART_UNIT, *, iostat=ios) table_count + if (ios /= 0) return + if (table_count < 0 .or. table_count > SPH_MAX_MATERIALS) then + ios = 1 + return + end if + gas_material_count = table_count + do i = 1, gas_material_count + read(SPH_RESTART_UNIT, *, iostat=ios) gas_material_ids(i), & + gas_material_names(i), gas_material_eos_defined(i), & + gas_material_eos_type(i) + if (ios /= 0) return + read(SPH_RESTART_UNIT, *, iostat=ios) gas_material_density_default(i), & + gas_material_energy_default(i), gas_material_temperature_default(i) + if (ios /= 0) return + read(SPH_RESTART_UNIT, *, iostat=ios) gas_material_rho0(i), & + gas_material_gamma(i), gas_material_p0(i), gas_material_pinf(i) + if (ios /= 0) return + read(SPH_RESTART_UNIT, *, iostat=ios) gas_material_jwl_a(i), & + gas_material_jwl_b(i), gas_material_jwl_r1(i), & + gas_material_jwl_r2(i), gas_material_jwl_omega(i) + if (ios /= 0) return + read(SPH_RESTART_UNIT, *, iostat=ios) gas_material_default_h(i), & + gas_material_default_mass(i), gas_material_default_volume(i) + if (ios /= 0) return + end do + end subroutine sph_restart_read_gas_material_table + + subroutine sph_restart_read_gas_sources(ios) + integer, intent(out) :: ios + integer :: i + + ios = 0 + do i = 1, npart + read(SPH_RESTART_UNIT, *, iostat=ios) gas_mass_source(i), & + gas_energy_source(i), gas_momentum_source(:,i) + if (ios /= 0) return + end do + end subroutine sph_restart_read_gas_sources + end module sph_restart diff --git a/tests/interface/test_c_api.c b/tests/interface/test_c_api.c index 66db71c..fd6751d 100644 --- a/tests/interface/test_c_api.c +++ b/tests/interface/test_c_api.c @@ -48,6 +48,13 @@ int main(void) double gas_radius = 0.0; double gas_radius_rate = 0.0; double gas_dtcrit = 0.0; + double gas_extended_mass = 0.0; + double gas_momentum[3] = {0.0, 0.0, 0.0}; + double gas_density_range[2] = {0.0, 0.0}; + double gas_dt_limits[3] = {0.0, 0.0, 0.0}; + double gas_source_mass = 0.0; + double gas_source_momentum[3] = {0.0, 0.0, 0.0}; + double gas_source_energy = 0.0; if (SPHLITE_PHASE_SOLID != 4 || SPHLITE_PHASE_GAS != 2 || SPHLITE_STATUS_ACTIVE != 0) { @@ -93,6 +100,14 @@ int main(void) if (sphlite_get_gas_dt_limits(NULL, &dt_accel, &gas_dtcrit) != -1) { return fail("null gas dt cfl pointer did not return -1"); } + if (sphlite_get_gas_extended_summary(NULL, gas_momentum, + gas_density_range, gas_dt_limits) != -1) { + return fail("null gas extended mass pointer did not return -1"); + } + if (sphlite_get_gas_source_summary(&gas_source_mass, NULL, + &gas_source_energy) != -1) { + return fail("null gas source 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"); @@ -213,6 +228,18 @@ int main(void) ierr = sphlite_get_gas_dt_limits(&dt_cfl, &dt_accel, &gas_dtcrit); if (ierr != 0) return fail("gas dt query failed"); if (dt_cfl <= 0.0 || gas_dtcrit <= 0.0) return fail("gas dt content mismatch"); + ierr = sphlite_get_gas_extended_summary(&gas_extended_mass, gas_momentum, + gas_density_range, gas_dt_limits); + if (ierr != 0) return fail("gas extended summary query failed"); + if (gas_extended_mass <= 0.0 || gas_density_range[1] < gas_density_range[0]) { + return fail("gas extended summary content mismatch"); + } + ierr = sphlite_get_gas_source_summary(&gas_source_mass, gas_source_momentum, + &gas_source_energy); + if (ierr != 0) return fail("gas source summary query failed"); + if (gas_source_mass != 0.0 || gas_source_energy != 0.0) { + return fail("gas source summary default mismatch"); + } ierr = sphlite_finalize(); if (ierr != 0) return fail("finalize gas failed"); return 0; diff --git a/tests/interface/test_cpp_api.cpp b/tests/interface/test_cpp_api.cpp index dcbcb72..ee412df 100644 --- a/tests/interface/test_cpp_api.cpp +++ b/tests/interface/test_cpp_api.cpp @@ -68,6 +68,14 @@ int main() if (gas_limits.cfl <= 0.0 || gas_limits.dtcrit <= 0.0) { return 1; } + sphlite::GasExtendedSummary extended = sphlite::gas_extended_summary(); + if (extended.mass <= 0.0 || extended.density_range[1] < extended.density_range[0]) { + return 1; + } + sphlite::GasSourceSummary source = sphlite::gas_source_summary(); + if (source.mass_source != 0.0 || source.energy_source != 0.0) { + return 1; + } gas_session.close(); return 0; diff --git a/tests/module/test_gas_restart.f90 b/tests/module/test_gas_restart.f90 index efba7dc..e70d20f 100644 --- a/tests/module/test_gas_restart.f90 +++ b/tests/module/test_gas_restart.f90 @@ -8,7 +8,8 @@ program test_gas_restart gas_equivalent_radius, gas_previous_equivalent_radius, gas_radius_rate, & gas_dtcrit, SPH_PHASE_GAS use sph_gas, only: gas_eos_type, gas_default_h, gas_default_mass, & - gas_default_volume, gas_body_force + gas_default_volume, gas_body_force, gas_material_count, & + sph_gas_add_source_by_particle, sph_gas_get_source_summary implicit none integer :: ierr @@ -28,6 +29,9 @@ program test_gas_restart real(rk) :: api_dt_cfl real(rk) :: api_dt_accel real(rk) :: api_dtcrit + real(rk) :: source_momentum(3) + real(rk) :: source_mass + real(rk) :: source_energy call sph_initialize(ierr) call assert_ok(ierr, 'initialize failed for Gas restart') @@ -37,6 +41,9 @@ program test_gas_restart call assert_ok(ierr, 'Gas restart build failed') call sph_advance_explicit(1.0e-6_rk, ierr) call assert_ok(ierr, 'Gas restart advance failed') + source_momentum = (/0.1_rk, 0.2_rk, 0.3_rk/) + call sph_gas_add_source_by_particle(1, 0.5_rk, source_momentum, 1.5_rk, ierr) + call assert_ok(ierr, 'Gas restart source add failed') eos_type_before = gas_eos_type volume_before = gas_volume center_before = gas_center @@ -53,6 +60,7 @@ program test_gas_restart call assert_ok(ierr, 'Gas restart read failed') if (particle_phase(1) /= SPH_PHASE_GAS) call fail('Gas restart phase mismatch') if (gas_eos_type /= eos_type_before) call fail('Gas restart EOS type mismatch') + if (gas_material_count /= 1) call fail('Gas restart material table mismatch') if (abs(gas_volume - volume_before) > 1.0e-12_rk) call fail('Gas restart volume mismatch') if (maxval(abs(gas_center - center_before)) > 1.0e-12_rk) call fail('Gas restart center mismatch') if (abs(gas_equivalent_radius - radius_before) > 1.0e-12_rk) then @@ -72,6 +80,10 @@ program test_gas_restart call sph_get_gas_dt_limits(api_dt_cfl, api_dt_accel, api_dtcrit, ierr) call assert_ok(ierr, 'Gas dt API after restart failed') if (api_dt_cfl <= 0.0_rk .or. api_dtcrit <= 0.0_rk) call fail('Gas API dt mismatch') + call sph_gas_get_source_summary(source_mass, source_momentum, source_energy, ierr) + call assert_ok(ierr, 'Gas source API after restart failed') + if (abs(source_mass - 0.5_rk) > 1.0e-12_rk) call fail('Gas source mass restart mismatch') + if (abs(source_energy - 1.5_rk) > 1.0e-12_rk) call fail('Gas source energy restart mismatch') call sph_advance_explicit(1.0e-6_rk, ierr) call assert_ok(ierr, 'Gas restart continue step failed') call sph_finalize(ierr) diff --git a/tests/module/test_gas_restart_030_compat.f90 b/tests/module/test_gas_restart_030_compat.f90 new file mode 100644 index 0000000..4ed9017 --- /dev/null +++ b/tests/module/test_gas_restart_030_compat.f90 @@ -0,0 +1,87 @@ +program test_gas_restart_030_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, sph_get_gas_dt_limits + use sph_database, only: particle_phase, SPH_PHASE_GAS + use sph_gas, only: gas_material_count, sph_gas_get_source_summary + implicit none + + integer :: ierr + real(rk) :: dt_cfl + real(rk) :: dt_accel + real(rk) :: dtcrit + real(rk) :: source_mass + real(rk) :: source_energy + real(rk) :: source_momentum(3) + + call write_legacy_restart('build-codex-unix/restart_gas_030.tmp') + call sph_initialize(ierr) + call assert_ok(ierr, 'initialize failed for legacy Gas restart') + call sph_read_restart('build-codex-unix/restart_gas_030.tmp', ierr) + call assert_ok(ierr, 'legacy Gas restart read failed') + if (particle_phase(1) /= SPH_PHASE_GAS) call fail('legacy Gas phase mismatch') + if (gas_material_count /= 1) call fail('legacy Gas material table mismatch') + call sph_gas_get_source_summary(source_mass, source_momentum, source_energy, ierr) + call assert_ok(ierr, 'legacy Gas source summary failed') + if (source_mass /= 0.0_rk .or. source_energy /= 0.0_rk) then + call fail('legacy Gas source defaults mismatch') + end if + call sph_get_gas_dt_limits(dt_cfl, dt_accel, dtcrit, ierr) + call assert_ok(ierr, 'legacy Gas dt failed') + if (dt_cfl <= 0.0_rk .or. dtcrit <= 0.0_rk) call fail('legacy Gas dt mismatch') + call sph_advance_explicit(1.0e-7_rk, ierr) + call assert_ok(ierr, 'legacy Gas continue step failed') + call sph_finalize(ierr) + call assert_ok(ierr, 'legacy Gas finalize failed') + +contains + + subroutine write_legacy_restart(filename) + character(len=*), intent(in) :: filename + + open(unit=91, file=trim(filename), status='unknown', action='write') + write(91, '(A)') 'SPHLITE_RESTART 0 3 0 STATE_0_3' + write(91, *) 0.0_rk, 0, 1 + write(91, *) 1, .false., 0.5_rk + write(91, '(A)') 'build-codex-unix' + write(91, *) 1000.0_rk, 1500.0_rk, 7.0_rk, 0.0_rk, 0.0_rk + write(91, *) 1.0_rk, 2.0_rk, 0.01_rk + write(91, *) 0.0_rk, 0.0_rk, 0.0_rk + write(91, *) 0.15_rk, 1, 1, 1, 1 + write(91, *) 0, 0.0_rk + write(91, *) 0.0_rk, 0.0_rk, 0.0_rk, 0.0_rk, 0.0_rk, 0.0_rk, 0.0_rk + write(91, *) 0.0_rk, 0.0_rk, 0.0_rk + write(91, *) 1, 1.2_rk, 1.4_rk, 2.0_rk, 0.0_rk, 0.0_rk, & + 0.0_rk, 0.0_rk, 0.0_rk, 0.0_rk, 0.0_rk + write(91, *) 0.15_rk, 0.01_rk, 0.008_rk + write(91, *) 0.0_rk, 0.0_rk, 0.0_rk + write(91, *) 1, 0.01_rk, 0.008_rk + write(91, *) 0.0_rk, 0.0_rk, 0.0_rk, 0.0_rk, 0.0_rk, 0.0_rk, & + 0.96_rk, 0.96_rk, 1.2_rk, 1.2_rk + write(91, *) 0.124070870_rk, 0.124070870_rk, 0.0_rk, & + 0.0_rk, 0.0_rk, 0.0_rk, 0.0_rk + write(91, *) 0.15_rk, 0.15_rk, 0.15_rk + write(91, *) 1, 2, 0, 1, 1 + write(91, *) 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(91, *) 0.01_rk, 1.2_rk, 0.008_rk, 0.96_rk, 2.0_rk, 293.15_rk, 0.15_rk + close(91) + end subroutine write_legacy_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 fail(message) + character(len=*), intent(in) :: message + + write(*, '(A)') trim(message) + stop 1 + end subroutine fail + +end program test_gas_restart_030_compat diff --git a/todo.md b/todo.md index d969edb..d1761cc 100644 --- a/todo.md +++ b/todo.md @@ -102,26 +102,26 @@ ## 阶段 E:Restart、API、C++、Python 与 CLI -- [ ] 设计 0.3.1 restart 的 Gas state revision 标识。 -- [ ] 将 Gas material/EOS 表写入 0.3.1 restart。 -- [ ] 将 Gas 默认粒子控制状态写入 0.3.1 restart。 -- [ ] 将 Gas 外部体力状态写入 0.3.1 restart。 -- [ ] 将 Gas 源项缓存写入 0.3.1 restart。 -- [ ] 将 Gas dt 诊断写入 0.3.1 restart。 -- [ ] 将 Gas bubble metrics 历史状态写入 0.3.1 restart。 -- [ ] 从 0.3.1 restart 读回 Gas material/EOS 表。 -- [ ] 从 0.3.1 restart 读回 Gas 源项缓存。 -- [ ] 从 0.3.1 restart 读回后重建邻域并继续显式步。 -- [ ] 增加读取 0.3.0 `STATE_0_3` restart 的兼容路径。 -- [ ] 为 0.3.0 restart 缺失的 Gas material 表初始化默认值。 -- [ ] 为 0.3.0 restart 缺失的 Gas 源项状态初始化零值。 -- [ ] 增加 `sph_get_gas_extended_summary` Fortran API。 -- [ ] 增加 `sph_get_gas_source_summary` Fortran API。 -- [ ] 在 C ABI 中追加 Gas extended summary 查询接口。 -- [ ] 在 C ABI 中追加 Gas source summary 查询接口。 -- [ ] 在 C++ wrapper 中增加 Gas extended/source summary 薄包装。 -- [ ] 在 Python ctypes 中增加 Gas extended/source summary 薄包装。 -- [ ] 在 CLI inspect/run 中增加 0.3.1 Gas 扩展字段检查。 +- [x] 设计 0.3.1 restart 的 Gas state revision 标识。 +- [x] 将 Gas material/EOS 表写入 0.3.1 restart。 +- [x] 将 Gas 默认粒子控制状态写入 0.3.1 restart。 +- [x] 将 Gas 外部体力状态写入 0.3.1 restart。 +- [x] 将 Gas 源项缓存写入 0.3.1 restart。 +- [x] 将 Gas dt 诊断写入 0.3.1 restart。 +- [x] 将 Gas bubble metrics 历史状态写入 0.3.1 restart。 +- [x] 从 0.3.1 restart 读回 Gas material/EOS 表。 +- [x] 从 0.3.1 restart 读回 Gas 源项缓存。 +- [x] 从 0.3.1 restart 读回后重建邻域并继续显式步。 +- [x] 增加读取 0.3.0 `STATE_0_3` restart 的兼容路径。 +- [x] 为 0.3.0 restart 缺失的 Gas material 表初始化默认值。 +- [x] 为 0.3.0 restart 缺失的 Gas 源项状态初始化零值。 +- [x] 增加 `sph_get_gas_extended_summary` Fortran API。 +- [x] 增加 `sph_get_gas_source_summary` Fortran API。 +- [x] 在 C ABI 中追加 Gas extended summary 查询接口。 +- [x] 在 C ABI 中追加 Gas source summary 查询接口。 +- [x] 在 C++ wrapper 中增加 Gas extended/source summary 薄包装。 +- [x] 在 Python ctypes 中增加 Gas extended/source summary 薄包装。 +- [x] 在 CLI inspect/run 中增加 0.3.1 Gas 扩展字段检查。 ## 阶段 F:测试接入、文档同步与发布门禁 diff --git a/tools/testing/test_cli.py b/tools/testing/test_cli.py index f1b097b..7bcb700 100644 --- a/tools/testing/test_cli.py +++ b/tools/testing/test_cli.py @@ -72,8 +72,16 @@ def main() -> int: "gas_volume", "gas_mean_pressure", "gas_max_pressure", + "gas_mass", + "gas_momentum_x", + "gas_min_density", + "gas_max_density", "gas_equivalent_radius", + "gas_dt_cfl", + "gas_dt_accel", "gas_dtcrit", + "gas_source_mass", + "gas_source_energy", "status", ): require_field(inspect.stdout, field) @@ -118,6 +126,10 @@ def main() -> int: raise AssertionError("CLI gas radius mismatch") if float(gas_fields["gas_dtcrit"]) <= 0.0: raise AssertionError("CLI gas dt mismatch") + if float(gas_fields["gas_mass"]) <= 0.0: + raise AssertionError("CLI gas extended mass mismatch") + if float(gas_fields["gas_source_mass"]) != 0.0: + raise AssertionError("CLI gas source default 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 4f1424d..1c68559 100644 --- a/tools/testing/test_python_debug.py +++ b/tools/testing/test_python_debug.py @@ -29,6 +29,8 @@ def main() -> int: raise AssertionError("Python wrapper is not using the C ABI library") if not hasattr(solver.lib, "sphlite_get_gas_summary"): raise AssertionError("Python wrapper is missing Gas C ABI diagnostics") + if not hasattr(solver.lib, "sphlite_get_gas_extended_summary"): + raise AssertionError("Python wrapper is missing Gas extended C ABI diagnostics") if solver.version() != (0, 3, 1): raise AssertionError("Python version mismatch") @@ -49,6 +51,8 @@ def main() -> int: raise AssertionError("inspect helper did not include Water diagnostics") if "gas_volume" not in solid_summary or "gas_dtcrit" not in solid_summary: raise AssertionError("inspect helper did not include Gas diagnostics") + if "gas_source_mass" not in solid_summary or "gas_density_range" not in solid_summary: + raise AssertionError("inspect helper did not include Gas extended diagnostics") solver.set_output_directory(root / "build-codex-unix") solver.write_output(0, 0.0) restart = root / "build-codex-unix" / "python_restart.tmp" @@ -101,6 +105,10 @@ def main() -> int: raise AssertionError("gas bubble radius mismatch") if gas_summary["gas_dtcrit"] <= 0.0: raise AssertionError("gas dt mismatch") + if gas_summary["gas_mass"] <= 0.0: + raise AssertionError("gas extended mass mismatch") + if gas_summary["gas_source_energy"] != 0.0: + raise AssertionError("gas source summary default mismatch") finally: gas.finalize()