Implement water EOS diagnostics

This commit is contained in:
Codex
2026-07-02 20:31:39 +08:00
parent 4ba50734f1
commit 68fd288631
4 changed files with 233 additions and 25 deletions
+2 -2
View File
@@ -11,7 +11,7 @@ module sph_input_reader
use sph_database, only: sph_db_set_material_density
use sph_water, only: sph_water_note_material, sph_water_set_eos, &
sph_water_set_viscosity, sph_water_set_particle_control, &
sph_water_set_body_force, sph_water_validate_input
sph_water_set_body_force, sph_water_apply_initial_conditions
use sph_inp_defs, only: SPH_INPUT_LINE_LEN, SPH_INPUT_FIELD_LEN, &
SPH_INPUT_MAX_FIELDS, SPH_KEY_NODE, SPH_KEY_ELEMENT, SPH_KEY_NSET, &
SPH_KEY_ELSET, SPH_KEY_MATERIAL, SPH_KEY_SECTION, SPH_KEY_SPHLITE, &
@@ -91,7 +91,7 @@ contains
ierr = SPH_ERROR_INPUT
return
end if
call sph_water_validate_input(ierr)
call sph_water_apply_initial_conditions(ierr)
end subroutine sph_input_build_model
subroutine sph_input_scan(filename, node_count, ierr)
+126
View File
@@ -1,6 +1,11 @@
module sph_water
use sph_precision, only: rk, SPH_NDIM
use sph_error, only: SPH_SUCCESS, SPH_ERROR_ARGUMENT, SPH_ERROR_INPUT, sph_error_set
use sph_database, only: npart, particle_phase, particle_status, mass, rho, &
volume, pressure, h, v, acc_body, water_particle_count, water_mass, &
water_momentum, water_max_pressure, water_min_density, water_max_density, &
water_pressure_impulse, SPH_PHASE_WATER, SPH_STATUS_ACTIVE, &
sph_db_clear_water_diagnostics
implicit none
logical :: water_module_initialized = .false.
@@ -179,6 +184,127 @@ contains
end if
end subroutine sph_water_validate_input
subroutine sph_water_apply_initial_conditions(ierr)
integer, intent(out) :: ierr
integer :: i
ierr = SPH_SUCCESS
if (.not. water_material_seen) return
call sph_water_validate_input(ierr)
if (ierr /= SPH_SUCCESS) return
do i = 1, npart
if (particle_status(i) /= SPH_STATUS_ACTIVE) cycle
particle_phase(i) = SPH_PHASE_WATER
rho(i) = water_rho0
pressure(i) = water_p0
mass(i) = water_default_mass
volume(i) = water_default_volume
h(i) = water_default_h
acc_body(:,i) = water_body_force
end do
call sph_water_update_diagnostics(ierr)
end subroutine sph_water_apply_initial_conditions
subroutine sph_water_tait_pressure(rho_value, pressure_value, ierr)
real(rk), intent(in) :: rho_value
real(rk), intent(out) :: pressure_value
integer, intent(out) :: ierr
real(rk) :: ratio
ierr = SPH_SUCCESS
pressure_value = 0.0_rk
if (rho_value <= 0.0_rk) then
call sph_error_set(SPH_ERROR_ARGUMENT, 'Water density must be positive')
ierr = SPH_ERROR_ARGUMENT
return
end if
if (water_rho0 <= 0.0_rk .or. water_gamma <= 0.0_rk) then
call sph_error_set(SPH_ERROR_ARGUMENT, 'Water Tait EOS parameters are invalid')
ierr = SPH_ERROR_ARGUMENT
return
end if
ratio = rho_value / water_rho0
pressure_value = water_p0 + water_b * (ratio**water_gamma - 1.0_rk)
end subroutine sph_water_tait_pressure
subroutine sph_water_sound_speed(c_value, ierr)
real(rk), intent(out) :: c_value
integer, intent(out) :: ierr
ierr = SPH_SUCCESS
c_value = water_c0
if (c_value <= 0.0_rk) then
call sph_error_set(SPH_ERROR_ARGUMENT, 'Water sound speed must be positive')
ierr = SPH_ERROR_ARGUMENT
end if
end subroutine sph_water_sound_speed
subroutine sph_water_update_pressure(ierr)
integer, intent(out) :: ierr
integer :: i
ierr = SPH_SUCCESS
do i = 1, npart
if (.not. sph_water_is_active_particle(i)) cycle
call sph_water_tait_pressure(rho(i), pressure(i), ierr)
if (ierr /= SPH_SUCCESS) return
end do
end subroutine sph_water_update_pressure
subroutine sph_water_update_diagnostics(ierr)
integer, intent(out) :: ierr
integer :: i
logical :: first_water
ierr = SPH_SUCCESS
call sph_db_clear_water_diagnostics()
first_water = .true.
do i = 1, npart
if (.not. sph_water_is_active_particle(i)) cycle
water_particle_count = water_particle_count + 1
water_mass = water_mass + mass(i)
water_momentum = water_momentum + mass(i) * v(:,i)
if (first_water) then
water_max_pressure = pressure(i)
water_min_density = rho(i)
water_max_density = rho(i)
first_water = .false.
else
if (pressure(i) > water_max_pressure) water_max_pressure = pressure(i)
if (rho(i) < water_min_density) water_min_density = rho(i)
if (rho(i) > water_max_density) water_max_density = rho(i)
end if
end do
end subroutine sph_water_update_diagnostics
subroutine sph_water_get_summary(mass_out, momentum_out, max_pressure_out, &
min_density_out, max_density_out, ierr)
real(rk), intent(out) :: mass_out
real(rk), intent(out) :: momentum_out(SPH_NDIM)
real(rk), intent(out) :: max_pressure_out
real(rk), intent(out) :: min_density_out
real(rk), intent(out) :: max_density_out
integer, intent(out) :: ierr
call sph_water_update_diagnostics(ierr)
if (ierr /= SPH_SUCCESS) return
mass_out = water_mass
momentum_out = water_momentum
max_pressure_out = water_max_pressure
min_density_out = water_min_density
max_density_out = water_max_density
end subroutine sph_water_get_summary
logical function sph_water_is_active_particle(i)
integer, intent(in) :: i
sph_water_is_active_particle = .false.
if (i < 1 .or. i > npart) return
if (particle_phase(i) /= SPH_PHASE_WATER) return
if (particle_status(i) /= SPH_STATUS_ACTIVE) return
sph_water_is_active_particle = .true.
end function sph_water_is_active_particle
function sph_water_upper(text) result(out)
character(len=*), intent(in) :: text
character(len=len(text)) :: out
+85 -3
View File
@@ -1,11 +1,93 @@
program test_water_eos
use sph_precision, only: rk
use sph_error, only: SPH_SUCCESS
use sph_database, only: sph_db_allocate, sph_db_free, particle_phase, &
particle_status, mass, rho, pressure, v, SPH_PHASE_WATER, SPH_PHASE_SOLID, &
SPH_STATUS_ACTIVE
use sph_water, only: sph_water_initialize, sph_water_reset, sph_water_set_eos, &
sph_water_set_viscosity, sph_water_set_particle_control, &
sph_water_tait_pressure, sph_water_sound_speed, sph_water_update_pressure, &
sph_water_update_diagnostics, sph_water_get_summary
implicit none
integer :: ierr
real(rk) :: p
real(rk) :: c
real(rk) :: total_mass
real(rk) :: momentum(3)
real(rk) :: max_pressure
real(rk) :: min_density
real(rk) :: max_density
call pass()
call sph_water_initialize()
call sph_water_set_eos('TAIT', 'WATER', 1000.0_rk, 1500.0_rk, &
7.0_rk, 0.0_rk, 0.0_rk, .false., ierr)
call assert_ok(ierr, 'set EOS failed')
call sph_water_set_viscosity('MONAGHAN', 'WATER', 0.1_rk, 0.0_rk, 0.01_rk, ierr)
call assert_ok(ierr, 'set viscosity failed')
call sph_water_set_particle_control(0.1_rk, 2.0_rk, 0.002_rk, ierr)
call assert_ok(ierr, 'set particle control failed')
call sph_water_tait_pressure(1000.0_rk, p, ierr)
call assert_ok(ierr, 'reference pressure failed')
if (abs(p) > 1.0e-8_rk) call fail('reference density pressure is not zero')
call sph_water_tait_pressure(1010.0_rk, p, ierr)
call assert_ok(ierr, 'compressed pressure failed')
if (p <= 0.0_rk) call fail('compressed water pressure is not positive')
call sph_water_sound_speed(c, ierr)
call assert_ok(ierr, 'sound speed failed')
if (abs(c - 1500.0_rk) > 1.0e-12_rk) call fail('sound speed mismatch')
call sph_water_set_eos('TAIT', 'WATER', -1000.0_rk, 1500.0_rk, &
7.0_rk, 0.0_rk, 0.0_rk, .false., ierr)
if (ierr == SPH_SUCCESS) call fail('bad EOS parameters did not fail')
call sph_water_set_eos('TAIT', 'WATER', 1000.0_rk, 1500.0_rk, &
7.0_rk, 0.0_rk, 0.0_rk, .false., ierr)
call assert_ok(ierr, 'restore EOS failed')
call sph_db_allocate(3, ierr)
call assert_ok(ierr, 'db allocation failed')
particle_phase = SPH_PHASE_WATER
particle_status = SPH_STATUS_ACTIVE
particle_phase(3) = SPH_PHASE_SOLID
mass = (/2.0_rk, 3.0_rk, 100.0_rk/)
rho = (/1000.0_rk, 1010.0_rk, 900.0_rk/)
v(:,1) = (/1.0_rk, 0.0_rk, 0.0_rk/)
v(:,2) = (/0.0_rk, 2.0_rk, 0.0_rk/)
v(:,3) = (/10.0_rk, 10.0_rk, 10.0_rk/)
call sph_water_update_pressure(ierr)
call assert_ok(ierr, 'update pressure failed')
call sph_water_update_diagnostics(ierr)
call assert_ok(ierr, 'update diagnostics failed')
call sph_water_get_summary(total_mass, momentum, max_pressure, &
min_density, max_density, ierr)
call assert_ok(ierr, 'summary failed')
if (abs(total_mass - 5.0_rk) > 1.0e-12_rk) call fail('water mass mismatch')
if (abs(momentum(1) - 2.0_rk) > 1.0e-12_rk) call fail('water momentum x mismatch')
if (abs(momentum(2) - 6.0_rk) > 1.0e-12_rk) call fail('water momentum y mismatch')
if (max_pressure <= 0.0_rk) call fail('max pressure mismatch')
if (abs(min_density - 1000.0_rk) > 1.0e-12_rk) call fail('min density mismatch')
if (abs(max_density - 1010.0_rk) > 1.0e-12_rk) call fail('max density mismatch')
if (pressure(3) /= 0.0_rk) call fail('non-water particle was not skipped')
call sph_db_free()
call sph_water_reset()
contains
subroutine pass()
end subroutine pass
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_water_eos
+20 -20
View File
@@ -164,26 +164,26 @@
- [x] 保存 Tait EOS 的 `c0`。
- [x] 保存 Tait EOS 的 `gamma`。
- [x] 保存 Tait EOS 的 `p0`。
- [ ] 保存 Tait EOS 的 `B`。
- [ ] 保存人工黏性 `alpha`。
- [ ] 保存人工黏性 `beta`。
- [ ] 保存人工黏性 `eta2`。
- [ ] 保存 body force 三维分量。
- [ ] 实现 Tait EOS 压力计算。
- [ ] 实现 Tait EOS 声速或声速占位计算。
- [ ] 实现 Tait EOS 参数校验。
- [ ] 实现 water phase 粒子筛选。
- [ ] 实现非 water phase 默认跳过。
- [ ] 实现水相粒子数诊断。
- [ ] 实现水相总质量诊断。
- [ ] 实现水相总动量诊断。
- [ ] 实现水相最大压力诊断。
- [ ] 实现水相最小密度诊断。
- [ ] 实现水相最大密度诊断。
- [ ] 实现压力冲量占位诊断。
- [ ] 增加 Tait EOS 标准压力测试。
- [ ] 增加 Tait EOS 参考密度零压测试。
- [ ] 增加 Tait EOS 非法参数测试。
- [x] 保存 Tait EOS 的 `B`。
- [x] 保存人工黏性 `alpha`。
- [x] 保存人工黏性 `beta`。
- [x] 保存人工黏性 `eta2`。
- [x] 保存 body force 三维分量。
- [x] 实现 Tait EOS 压力计算。
- [x] 实现 Tait EOS 声速或声速占位计算。
- [x] 实现 Tait EOS 参数校验。
- [x] 实现 water phase 粒子筛选。
- [x] 实现非 water phase 默认跳过。
- [x] 实现水相粒子数诊断。
- [x] 实现水相总质量诊断。
- [x] 实现水相总动量诊断。
- [x] 实现水相最大压力诊断。
- [x] 实现水相最小密度诊断。
- [x] 实现水相最大密度诊断。
- [x] 实现压力冲量占位诊断。
- [x] 增加 Tait EOS 标准压力测试。
- [x] 增加 Tait EOS 参考密度零压测试。
- [x] 增加 Tait EOS 非法参数测试。
- [ ] 增加 water summary 诊断测试。
## 阶段 H:Water 连续性方程