Add Gas explicit stepping and output

This commit is contained in:
Codex
2026-07-03 09:37:57 +08:00
parent 0c28f41d33
commit c2081e2d78
9 changed files with 280 additions and 26 deletions
+12
View File
@@ -207,6 +207,18 @@ set_target_properties(test_gas_summary PROPERTIES Fortran_MODULE_DIRECTORY "${SP
add_test(NAME gas_summary COMMAND test_gas_summary)
set_tests_properties(gas_summary PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
add_executable(test_solver_gas tests/module/test_solver_gas.f90)
target_link_libraries(test_solver_gas PRIVATE sphlite_core)
set_target_properties(test_solver_gas PROPERTIES Fortran_MODULE_DIRECTORY "${SPHLITE_MODULE_DIR}")
add_test(NAME solver_gas COMMAND test_solver_gas)
set_tests_properties(solver_gas PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
add_executable(test_gas_output tests/module/test_gas_output.f90)
target_link_libraries(test_gas_output PRIVATE sphlite_core)
set_target_properties(test_gas_output PROPERTIES Fortran_MODULE_DIRECTORY "${SPHLITE_MODULE_DIR}")
add_test(NAME gas_output COMMAND test_gas_output)
set_tests_properties(gas_output 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}")
@@ -90,6 +90,8 @@ R_eq = (3 V_gas / 4 pi)^(1/3)
半径变化率和中心迁移量由相邻诊断状态差分得到,因此第一版等价于单气团近似;多气团连通分量、复杂水气界面追踪和多周期气泡脉动留给后续版本。
0.3.0 的 Gas 显式推进采用 EOS 压力更新、连续性方程密度变化率、压力加速度和外部体力合成。Gas 人工黏性第一版明确跳过,不进入默认压力/动量路径;后续如需强冲击耗散,应作为独立模型和独立 gate 引入。
第一阶段水-气界面不做复杂界面重构,采用粒子相间基础压力/动量交换和气体团簇统计。
## 6. 爆炸模型
+3 -1
View File
@@ -400,7 +400,9 @@ contains
ierr = SPH_SUCCESS
if (npart <= 0) return
drho_dt = 0.0_rk
do i = 1, npart
if (sph_gas_is_active_particle(i)) drho_dt(i) = 0.0_rk
end do
do i = 1, npart
if (.not. sph_gas_is_active_particle(i)) cycle
do n = 1, neighbor_count(i)
+14 -1
View File
@@ -5,7 +5,9 @@ module sph_output_csv
use sph_database, only: npart, particle_id_ext, particle_phase, particle_status, &
material_id, section_id, x, v, rho, pressure, temperature, h, &
water_mass, water_momentum, water_max_pressure, water_min_density, &
water_max_density, water_dt_cfl, water_dt_accel, water_dt_viscous
water_max_density, water_dt_cfl, water_dt_accel, water_dt_viscous, &
gas_particle_count, gas_mass, gas_volume, gas_center, gas_mean_pressure, &
gas_max_pressure, gas_equivalent_radius, gas_radius_rate, gas_dtcrit
implicit none
integer, parameter :: SPH_OUTPUT_UNIT = 41
@@ -108,6 +110,17 @@ contains
write(SPH_OUTPUT_UNIT, '(A,",",ES24.16)') 'min_density', water_min_density
write(SPH_OUTPUT_UNIT, '(A,",",ES24.16)') 'max_density', water_max_density
write(SPH_OUTPUT_UNIT, '(A,",",ES24.16)') 'dtcrit', dtcrit
write(SPH_OUTPUT_UNIT, '(A,",",I0)') 'gas_particles', gas_particle_count
write(SPH_OUTPUT_UNIT, '(A,",",ES24.16)') 'gas_mass', gas_mass
write(SPH_OUTPUT_UNIT, '(A,",",ES24.16)') 'gas_volume', gas_volume
write(SPH_OUTPUT_UNIT, '(A,",",ES24.16)') 'gas_center_x', gas_center(1)
write(SPH_OUTPUT_UNIT, '(A,",",ES24.16)') 'gas_center_y', gas_center(2)
write(SPH_OUTPUT_UNIT, '(A,",",ES24.16)') 'gas_center_z', gas_center(3)
write(SPH_OUTPUT_UNIT, '(A,",",ES24.16)') 'gas_mean_pressure', gas_mean_pressure
write(SPH_OUTPUT_UNIT, '(A,",",ES24.16)') 'gas_max_pressure', gas_max_pressure
write(SPH_OUTPUT_UNIT, '(A,",",ES24.16)') 'gas_equivalent_radius', gas_equivalent_radius
write(SPH_OUTPUT_UNIT, '(A,",",ES24.16)') 'gas_radius_rate', gas_radius_rate
write(SPH_OUTPUT_UNIT, '(A,",",ES24.16)') 'gas_dtcrit', gas_dtcrit
close(unit=SPH_OUTPUT_UNIT)
end subroutine sph_output_write_summary
+27 -4
View File
@@ -8,6 +8,9 @@ module sph_solver_explicit
use sph_water, only: sph_water_update_pressure, sph_water_compute_density_rate, &
sph_water_compute_acceleration, sph_water_update_diagnostics, &
sph_water_estimate_dt_limits
use sph_gas, only: sph_gas_update_pressure, sph_gas_compute_density_rate, &
sph_gas_compute_acceleration, sph_gas_update_diagnostics, &
sph_gas_estimate_dt_limits
use sph_output_csv, only: sph_output_write_step
implicit none
@@ -20,7 +23,7 @@ contains
ierr = SPH_SUCCESS
dtcrit = dt_default
if (npart > 0) then
call sph_solver_water_dt(dtcrit, ierr)
call sph_solver_phase_dt(dtcrit, ierr)
if (ierr /= SPH_SUCCESS) return
if (dtcrit <= 0.0_rk .or. dtcrit > dt_default) dtcrit = dt_default
end if
@@ -43,10 +46,16 @@ contains
if (ierr /= SPH_SUCCESS) return
call sph_water_update_pressure(ierr)
if (ierr /= SPH_SUCCESS) return
call sph_gas_update_pressure(ierr)
if (ierr /= SPH_SUCCESS) return
call sph_water_compute_density_rate(ierr)
if (ierr /= SPH_SUCCESS) return
call sph_gas_compute_density_rate(ierr)
if (ierr /= SPH_SUCCESS) return
call sph_water_compute_acceleration(ierr)
if (ierr /= SPH_SUCCESS) return
call sph_gas_compute_acceleration(ierr)
if (ierr /= SPH_SUCCESS) return
do i = 1, npart
vhalf(:,i) = v(:,i) + 0.5_rk * dt * a(:,i)
x(:,i) = x(:,i) + dt * vhalf(:,i)
@@ -55,6 +64,8 @@ contains
end do
call sph_water_update_diagnostics(ierr)
if (ierr /= SPH_SUCCESS) return
call sph_gas_update_diagnostics(ierr)
if (ierr /= SPH_SUCCESS) return
end if
current_time = current_time + dt
@@ -85,12 +96,16 @@ contains
end do
end subroutine sph_solver_run_explicit
subroutine sph_solver_water_dt(dtcrit, ierr)
subroutine sph_solver_phase_dt(dtcrit, ierr)
real(rk), intent(out) :: dtcrit
integer, intent(out) :: ierr
real(rk) :: dt_cfl
real(rk) :: dt_accel
real(rk) :: dt_viscous
real(rk) :: gas_cfl
real(rk) :: gas_accel
real(rk) :: gas_limit
real(rk) :: water_limit
if (safety_factor <= 0.0_rk) then
call sph_error_set(SPH_ERROR_ARGUMENT, 'time step safety factor must be positive')
@@ -100,7 +115,15 @@ contains
end if
call sph_water_estimate_dt_limits(dt_cfl, dt_accel, dt_viscous, ierr)
if (ierr /= SPH_SUCCESS) return
dtcrit = min(dt_cfl, min(dt_accel, dt_viscous)) * safety_factor
end subroutine sph_solver_water_dt
water_limit = min(dt_cfl, min(dt_accel, dt_viscous))
dtcrit = 0.0_rk
if (water_limit > 0.0_rk) dtcrit = water_limit
call sph_gas_estimate_dt_limits(gas_cfl, gas_accel, gas_limit, ierr)
if (ierr /= SPH_SUCCESS) return
if (gas_limit > 0.0_rk) then
if (dtcrit <= 0.0_rk .or. gas_limit < dtcrit) dtcrit = gas_limit
end if
dtcrit = dtcrit * safety_factor
end subroutine sph_solver_phase_dt
end module sph_solver_explicit
+95
View File
@@ -0,0 +1,95 @@
program test_gas_output
use sph_precision, only: rk
use sph_error, only: SPH_SUCCESS
use sph_api, only: sph_initialize, sph_finalize, sph_read_inp, sph_build_model, &
sph_set_output_directory, sph_write_output
implicit none
integer :: ierr
call check_gas_summary_output()
contains
subroutine check_gas_summary_output()
call delete_output_pair(30)
call sph_initialize(ierr)
call assert_ok(ierr, 'initialize failed for Gas output')
call sph_read_inp('tests/data/gas_ideal_minimal_030.inp', ierr)
call assert_ok(ierr, 'Gas output input read failed')
call sph_build_model(ierr)
call assert_ok(ierr, 'Gas output build failed')
call sph_set_output_directory('build-codex-unix', ierr)
call assert_ok(ierr, 'Gas output directory failed')
call sph_write_output(30, 0.0_rk, ierr)
call assert_ok(ierr, 'Gas output write failed')
call assert_summary_metric('build-codex-unix/sphlite_00000030_summary.csv', 'gas_particles')
call assert_summary_metric('build-codex-unix/sphlite_00000030_summary.csv', 'gas_mass')
call assert_summary_metric('build-codex-unix/sphlite_00000030_summary.csv', 'gas_volume')
call assert_summary_metric('build-codex-unix/sphlite_00000030_summary.csv', 'gas_center_x')
call assert_summary_metric('build-codex-unix/sphlite_00000030_summary.csv', 'gas_center_y')
call assert_summary_metric('build-codex-unix/sphlite_00000030_summary.csv', 'gas_center_z')
call assert_summary_metric('build-codex-unix/sphlite_00000030_summary.csv', 'gas_mean_pressure')
call assert_summary_metric('build-codex-unix/sphlite_00000030_summary.csv', 'gas_max_pressure')
call assert_summary_metric('build-codex-unix/sphlite_00000030_summary.csv', 'gas_equivalent_radius')
call assert_summary_metric('build-codex-unix/sphlite_00000030_summary.csv', 'gas_radius_rate')
call assert_summary_metric('build-codex-unix/sphlite_00000030_summary.csv', 'gas_dtcrit')
call sph_finalize(ierr)
call assert_ok(ierr, 'finalize failed for Gas output')
end subroutine check_gas_summary_output
subroutine assert_summary_metric(filename, metric)
character(len=*), intent(in) :: filename
character(len=*), intent(in) :: metric
character(len=256) :: line
integer :: ios
logical :: found
found = .false.
open(unit=82, file=trim(filename), status='old', action='read', iostat=ios)
if (ios /= 0) call fail('Gas summary CSV open failed')
do
read(82, '(A)', iostat=ios) line
if (ios /= 0) exit
if (index(line, trim(metric) // ',') == 1) found = .true.
end do
close(unit=82)
if (.not. found) call fail('Gas summary CSV metric missing')
end subroutine assert_summary_metric
subroutine delete_output_pair(step_value)
integer, intent(in) :: step_value
character(len=256) :: filename
write(filename, '("build-codex-unix/sphlite_",I8.8,".csv")') step_value
call delete_file_if_exists(filename)
write(filename, '("build-codex-unix/sphlite_",I8.8,"_summary.csv")') step_value
call delete_file_if_exists(filename)
end subroutine delete_output_pair
subroutine delete_file_if_exists(filename)
character(len=*), intent(in) :: filename
logical :: exists
integer :: ios
inquire(file=trim(filename), exist=exists)
if (.not. exists) return
open(unit=83, file=trim(filename), status='old', iostat=ios)
if (ios == 0) close(unit=83, status='delete')
end subroutine delete_file_if_exists
subroutine assert_ok(ierr_value, message)
integer, intent(in) :: ierr_value
character(len=*), intent(in) :: message
if (ierr_value /= SPH_SUCCESS) call fail(message)
end subroutine assert_ok
subroutine fail(message)
character(len=*), intent(in) :: message
write(*, '(A)') trim(message)
stop 1
end subroutine fail
end program test_gas_output
+11
View File
@@ -133,6 +133,17 @@ contains
call assert_summary_metric(filename, 'min_density')
call assert_summary_metric(filename, 'max_density')
call assert_summary_metric(filename, 'dtcrit')
call assert_summary_metric(filename, 'gas_particles')
call assert_summary_metric(filename, 'gas_mass')
call assert_summary_metric(filename, 'gas_volume')
call assert_summary_metric(filename, 'gas_center_x')
call assert_summary_metric(filename, 'gas_center_y')
call assert_summary_metric(filename, 'gas_center_z')
call assert_summary_metric(filename, 'gas_mean_pressure')
call assert_summary_metric(filename, 'gas_max_pressure')
call assert_summary_metric(filename, 'gas_equivalent_radius')
call assert_summary_metric(filename, 'gas_radius_rate')
call assert_summary_metric(filename, 'gas_dtcrit')
end subroutine check_summary_metrics
subroutine assert_summary_metric(filename, metric)
+96
View File
@@ -0,0 +1,96 @@
program test_solver_gas
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_estimate_stable_dt, sph_get_current_time
use sph_database, only: x, v, a, rho, pressure, gas_dtcrit, gas_particle_count, &
water_mass
implicit none
integer :: ierr
integer :: step
real(rk) :: time
call check_gas_single_step()
call check_water_single_phase_regression()
contains
subroutine check_gas_single_step()
real(rk) :: dtcrit
real(rk) :: x_before(3)
call sph_initialize(ierr)
call assert_ok(ierr, 'initialize failed for Gas solver')
call sph_read_inp('tests/data/gas_ideal_minimal_030.inp', ierr)
call assert_ok(ierr, 'Gas solver input read failed')
call sph_build_model(ierr)
call assert_ok(ierr, 'Gas solver build failed')
v(:,1) = (/1.0_rk, 0.0_rk, 0.0_rk/)
x_before = x(:,1)
call sph_estimate_stable_dt(dtcrit, ierr)
call assert_ok(ierr, 'Gas dt estimate failed')
if (dtcrit <= 0.0_rk) call fail('Gas dtcrit is not positive')
if (gas_dtcrit <= 0.0_rk) call fail('Gas dt diagnostic is not positive')
call sph_advance_explicit(1.0e-6_rk, ierr)
call assert_ok(ierr, 'Gas explicit advance failed')
call sph_get_current_time(time, step, ierr)
call assert_ok(ierr, 'Gas current time failed')
if (step /= 1) call fail('Gas explicit step mismatch')
if (abs(time - 1.0e-6_rk) > 1.0e-12_rk) call fail('Gas explicit time mismatch')
if (x(1,1) <= x_before(1)) call fail('Gas particle position did not advance')
if (.not. finite_vector(x(:,1))) call fail('Gas position is not finite')
if (.not. finite_vector(v(:,1))) call fail('Gas velocity is not finite')
if (.not. finite_vector(a(:,1))) call fail('Gas acceleration is not finite')
if (.not. finite_scalar(rho(1))) call fail('Gas density is not finite')
if (.not. finite_scalar(pressure(1))) call fail('Gas pressure is not finite')
if (gas_particle_count /= 4) call fail('Gas diagnostics lost particles')
call sph_finalize(ierr)
call assert_ok(ierr, 'finalize failed for Gas solver')
end subroutine check_gas_single_step
subroutine check_water_single_phase_regression()
real(rk) :: rho_before
call sph_initialize(ierr)
call assert_ok(ierr, 'initialize failed for Water regression')
call sph_read_inp('tests/data/water_minimal_020.inp', ierr)
call assert_ok(ierr, 'Water regression input read failed')
call sph_build_model(ierr)
call assert_ok(ierr, 'Water regression build failed')
rho_before = rho(1)
call sph_advance_explicit(1.0e-6_rk, ierr)
call assert_ok(ierr, 'Water regression advance failed')
if (abs(rho(1) - rho_before) > 1.0e-6_rk) call fail('Gas path changed Water density')
if (water_mass <= 0.0_rk) call fail('Water diagnostics were not preserved')
call sph_finalize(ierr)
call assert_ok(ierr, 'finalize failed for Water regression')
end subroutine check_water_single_phase_regression
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
logical function finite_scalar(value_in)
real(rk), intent(in) :: value_in
finite_scalar = value_in == value_in .and. abs(value_in) < huge(value_in)
end function finite_scalar
logical function finite_vector(value_in)
real(rk), intent(in) :: value_in(:)
finite_vector = all(value_in == value_in) .and. maxval(abs(value_in)) < huge(value_in(1))
end function finite_vector
subroutine fail(message)
character(len=*), intent(in) :: message
write(*, '(A)') trim(message)
stop 1
end subroutine fail
end program test_solver_gas
+20 -20
View File
@@ -140,29 +140,29 @@
## 阶段 K:Gas 单相显式推进
- [ ] 实现 Gas 压力更新入口。
- [ ] 实现 Gas 密度变化率计算。
- [ ] 实现 Gas 压力加速度计算。
- [ ] 实现 Gas 人工黏性占位或明确跳过策略。
- [ ] 合成 Gas 外部体力加速度。
- [ ] 将 Gas 计算接入显式步进流程。
- [ ] 确认 Gas 显式步不改变 Water 单相结果。
- [ ] 实现 Gas 稳定时间步估计。
- [ ] 增加 Gas 单步推进测试。
- [ ] 增加 `solver_gas` 测试目标并接入 CTest。
- [x] 实现 Gas 压力更新入口。
- [x] 实现 Gas 密度变化率计算。
- [x] 实现 Gas 压力加速度计算。
- [x] 实现 Gas 人工黏性占位或明确跳过策略。
- [x] 合成 Gas 外部体力加速度。
- [x] 将 Gas 计算接入显式步进流程。
- [x] 确认 Gas 显式步不改变 Water 单相结果。
- [x] 实现 Gas 稳定时间步估计。
- [x] 增加 Gas 单步推进测试。
- [x] 增加 `solver_gas` 测试目标并接入 CTest。
## 阶段 L:Gas 输出
- [ ] 保持粒子 CSV 通用字段兼容。
- [ ] 在 summary CSV 写入 `gas_particles`。
- [ ] 在 summary CSV 写入 `gas_mass`。
- [ ] 在 summary CSV 写入 `gas_volume`。
- [ ] 在 summary CSV 写入 Gas 中心三分量。
- [ ] 在 summary CSV 写入 Gas 平均压力和最大压力。
- [ ] 在 summary CSV 写入等效气泡半径。
- [ ] 在 summary CSV 写入半径变化率。
- [ ] 在 summary CSV 写入 `gas_dtcrit`。
- [ ] 增加 `gas_output` 测试目标并接入 CTest。
- [x] 保持粒子 CSV 通用字段兼容。
- [x] 在 summary CSV 写入 `gas_particles`。
- [x] 在 summary CSV 写入 `gas_mass`。
- [x] 在 summary CSV 写入 `gas_volume`。
- [x] 在 summary CSV 写入 Gas 中心三分量。
- [x] 在 summary CSV 写入 Gas 平均压力和最大压力。
- [x] 在 summary CSV 写入等效气泡半径。
- [x] 在 summary CSV 写入半径变化率。
- [x] 在 summary CSV 写入 `gas_dtcrit`。
- [x] 增加 `gas_output` 测试目标并接入 CTest。
## 阶段 M:Gas Restart