diff --git a/src/input/sph_input_reader.f90 b/src/input/sph_input_reader.f90 index 966843e..3985f76 100644 --- a/src/input/sph_input_reader.f90 +++ b/src/input/sph_input_reader.f90 @@ -12,6 +12,7 @@ module sph_input_reader 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_apply_initial_conditions + use sph_neighbor, only: sph_neighbor_rebuild 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, & @@ -92,6 +93,8 @@ contains return end if call sph_water_apply_initial_conditions(ierr) + if (ierr /= SPH_SUCCESS) return + call sph_neighbor_rebuild(ierr) end subroutine sph_input_build_model subroutine sph_input_scan(filename, node_count, ierr) diff --git a/src/solver/sph_solver_explicit.f90 b/src/solver/sph_solver_explicit.f90 index e8aadfb..097cb05 100644 --- a/src/solver/sph_solver_explicit.f90 +++ b/src/solver/sph_solver_explicit.f90 @@ -3,6 +3,9 @@ module sph_solver_explicit use sph_error, only: SPH_SUCCESS, SPH_ERROR_ARGUMENT, sph_error_set use sph_control, only: current_time, current_step, dt_default, end_time, max_steps use sph_database, only: npart, x, v, a, vhalf + use sph_neighbor, only: sph_neighbor_rebuild + use sph_water, only: sph_water_update_pressure, sph_water_compute_density_rate, & + sph_water_compute_acceleration, sph_water_update_diagnostics implicit none contains @@ -28,11 +31,21 @@ contains end if if (npart > 0) then + call sph_neighbor_rebuild(ierr) + if (ierr /= SPH_SUCCESS) return + call sph_water_update_pressure(ierr) + if (ierr /= SPH_SUCCESS) return + call sph_water_compute_density_rate(ierr) + if (ierr /= SPH_SUCCESS) return + call sph_water_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) v(:,i) = vhalf(:,i) + 0.5_rk * dt * a(:,i) end do + call sph_water_update_diagnostics(ierr) + if (ierr /= SPH_SUCCESS) return end if current_time = current_time + dt diff --git a/src/water/sph_water.f90 b/src/water/sph_water.f90 index c0fecbf..741beef 100644 --- a/src/water/sph_water.f90 +++ b/src/water/sph_water.f90 @@ -2,7 +2,7 @@ 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, x, mass, rho, & - volume, pressure, h, v, drho_dt, acc_viscosity, acc_body, & + volume, pressure, h, v, a, drho_dt, acc_pressure, acc_viscosity, acc_body, & neighbor_count, neighbor_offset, neighbor_list, 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, & @@ -160,8 +160,12 @@ contains subroutine sph_water_set_body_force(force, ierr) real(rk), intent(in) :: force(SPH_NDIM) integer, intent(out) :: ierr + integer :: i water_body_force = force + do i = 1, npart + if (sph_water_is_active_particle(i)) acc_body(:,i) = force + end do ierr = SPH_SUCCESS end subroutine sph_water_set_body_force @@ -331,6 +335,60 @@ contains end do end subroutine sph_water_compute_viscosity_acceleration + subroutine sph_water_compute_pressure_acceleration(ierr) + integer, intent(out) :: ierr + integer :: i + integer :: n + integer :: j + integer :: index + real(rk) :: rij(SPH_NDIM) + real(rk) :: grad_w(SPH_NDIM) + real(rk) :: pressure_term + + ierr = SPH_SUCCESS + if (npart <= 0) return + acc_pressure = 0.0_rk + do i = 1, npart + if (.not. sph_water_is_active_particle(i)) cycle + if (rho(i) <= 0.0_rk) then + call sph_error_set(SPH_ERROR_ARGUMENT, 'Water density must be positive for pressure force') + ierr = SPH_ERROR_ARGUMENT + return + end if + do n = 1, neighbor_count(i) + index = neighbor_offset(i) + n - 1 + j = neighbor_list(index) + if (.not. sph_water_is_active_particle(j)) cycle + if (rho(j) <= 0.0_rk) then + call sph_error_set(SPH_ERROR_ARGUMENT, 'Water neighbor density must be positive') + ierr = SPH_ERROR_ARGUMENT + return + end if + rij = x_vector(i, j) + call sph_kernel_gradient(SPH_KERNEL_DEFAULT, rij, h(i), grad_w, ierr) + if (ierr /= SPH_SUCCESS) return + pressure_term = pressure(i) / (rho(i) * rho(i)) + pressure(j) / (rho(j) * rho(j)) + acc_pressure(:,i) = acc_pressure(:,i) - mass(j) * pressure_term * grad_w + end do + end do + end subroutine sph_water_compute_pressure_acceleration + + subroutine sph_water_compute_acceleration(ierr) + integer, intent(out) :: ierr + integer :: i + + call sph_water_compute_pressure_acceleration(ierr) + if (ierr /= SPH_SUCCESS) return + call sph_water_compute_viscosity_acceleration(ierr) + if (ierr /= SPH_SUCCESS) return + do i = 1, npart + if (sph_water_is_active_particle(i)) then + a(:,i) = acc_pressure(:,i) + acc_viscosity(:,i) + acc_body(:,i) + end if + end do + ierr = SPH_SUCCESS + end subroutine sph_water_compute_acceleration + subroutine sph_water_pair_viscosity(i, j, contribution, ierr) integer, intent(in) :: i integer, intent(in) :: j diff --git a/tests/module/test_water_force.f90 b/tests/module/test_water_force.f90 index 29b204a..25edb5f 100644 --- a/tests/module/test_water_force.f90 +++ b/tests/module/test_water_force.f90 @@ -1,11 +1,84 @@ program test_water_force + use sph_precision, only: rk + use sph_error, only: SPH_SUCCESS + use sph_database, only: sph_db_allocate, sph_db_free, x, v, h, mass, rho, pressure, & + acc_pressure, a, particle_phase, particle_status, SPH_PHASE_WATER, SPH_STATUS_ACTIVE + use sph_neighbor, only: sph_neighbor_rebuild + use sph_water, only: sph_water_initialize, sph_water_reset, sph_water_set_body_force, & + sph_water_compute_pressure_acceleration, sph_water_compute_acceleration implicit none + integer :: ierr - call pass() + call sph_water_initialize() + call check_pressure_pair() + call check_uniform_pressure() + call check_body_force() + call sph_water_reset() contains - subroutine pass() - end subroutine pass + subroutine setup_pair() + call sph_db_allocate(2, ierr) + call assert_ok(ierr, 'force allocation failed') + particle_phase = SPH_PHASE_WATER + particle_status = SPH_STATUS_ACTIVE + h = 1.0_rk + mass = 1.0_rk + rho = 1000.0_rk + v = 0.0_rk + x(:,1) = (/0.0_rk, 0.0_rk, 0.0_rk/) + x(:,2) = (/0.5_rk, 0.0_rk, 0.0_rk/) + call sph_neighbor_rebuild(ierr) + call assert_ok(ierr, 'force neighbor failed') + end subroutine setup_pair + + subroutine check_pressure_pair() + call setup_pair() + pressure = (/1000.0_rk, 0.0_rk/) + call sph_water_compute_pressure_acceleration(ierr) + call assert_ok(ierr, 'pressure acceleration failed') + if (maxval(abs(acc_pressure)) <= 0.0_rk) call fail('pressure acceleration is zero') + if (maxval(abs(acc_pressure(:,1) + acc_pressure(:,2))) > 1.0e-12_rk) then + call fail('pressure acceleration is not symmetric') + end if + call sph_db_free() + end subroutine check_pressure_pair + + subroutine check_uniform_pressure() + call setup_pair() + pressure = 0.0_rk + call sph_water_compute_pressure_acceleration(ierr) + call assert_ok(ierr, 'uniform pressure failed') + if (maxval(abs(acc_pressure)) > 1.0e-12_rk) call fail('zero pressure force is not zero') + call sph_db_free() + end subroutine check_uniform_pressure + + subroutine check_body_force() + real(rk) :: force(3) + + call setup_pair() + pressure = 0.0_rk + force = (/0.0_rk, 0.0_rk, -9.81_rk/) + call sph_water_set_body_force(force, ierr) + call assert_ok(ierr, 'set body force failed') + call sph_water_compute_acceleration(ierr) + call assert_ok(ierr, 'total acceleration failed') + if (abs(a(3,1) + 9.81_rk) > 1.0e-12_rk) call fail('body force acceleration mismatch') + call sph_db_free() + end subroutine check_body_force + + 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_force diff --git a/tests/module/test_water_viscosity.f90 b/tests/module/test_water_viscosity.f90 index aa1efa1..f5074c2 100644 --- a/tests/module/test_water_viscosity.f90 +++ b/tests/module/test_water_viscosity.f90 @@ -1,11 +1,78 @@ program test_water_viscosity + use sph_precision, only: rk + use sph_error, only: SPH_SUCCESS + use sph_database, only: sph_db_allocate, sph_db_free, x, v, h, mass, rho, & + acc_viscosity, particle_phase, particle_status, SPH_PHASE_WATER, SPH_STATUS_ACTIVE + use sph_neighbor, only: sph_neighbor_rebuild + use sph_water, only: sph_water_initialize, sph_water_reset, sph_water_set_eos, & + sph_water_set_viscosity, sph_water_compute_viscosity_acceleration implicit none + integer :: ierr - 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.2_rk, 0.1_rk, 0.01_rk, ierr) + call assert_ok(ierr, 'set viscosity failed') + call check_approaching_pair() + call check_separating_pair() + call sph_water_reset() contains - subroutine pass() - end subroutine pass + subroutine setup_pair() + call sph_db_allocate(2, ierr) + call assert_ok(ierr, 'viscosity allocation failed') + particle_phase = SPH_PHASE_WATER + particle_status = SPH_STATUS_ACTIVE + h = 1.0_rk + mass = 1.0_rk + rho = 1000.0_rk + x(:,1) = (/0.0_rk, 0.0_rk, 0.0_rk/) + x(:,2) = (/0.5_rk, 0.0_rk, 0.0_rk/) + end subroutine setup_pair + + subroutine check_approaching_pair() + call setup_pair() + v(:,1) = (/1.0_rk, 0.0_rk, 0.0_rk/) + v(:,2) = (/-1.0_rk, 0.0_rk, 0.0_rk/) + call sph_neighbor_rebuild(ierr) + call assert_ok(ierr, 'viscosity neighbor failed') + call sph_water_compute_viscosity_acceleration(ierr) + call assert_ok(ierr, 'viscosity acceleration failed') + if (maxval(abs(acc_viscosity)) <= 0.0_rk) call fail('viscosity acceleration is zero') + if (acc_viscosity(1,1) >= 0.0_rk) call fail('viscosity direction mismatch') + if (maxval(abs(acc_viscosity(:,1) + acc_viscosity(:,2))) > 1.0e-12_rk) then + call fail('viscosity pair is not symmetric') + end if + call sph_db_free() + end subroutine check_approaching_pair + + subroutine check_separating_pair() + call setup_pair() + v(:,1) = (/-1.0_rk, 0.0_rk, 0.0_rk/) + v(:,2) = (/1.0_rk, 0.0_rk, 0.0_rk/) + call sph_neighbor_rebuild(ierr) + call assert_ok(ierr, 'separating neighbor failed') + call sph_water_compute_viscosity_acceleration(ierr) + call assert_ok(ierr, 'separating viscosity failed') + if (maxval(abs(acc_viscosity)) > 1.0e-12_rk) call fail('separating viscosity is not zero') + call sph_db_free() + end subroutine check_separating_pair + + 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_viscosity diff --git a/todo.md b/todo.md index b7ed43b..4370c51 100644 --- a/todo.md +++ b/todo.md @@ -210,29 +210,29 @@ - [x] 实现人工黏性平均声速计算。 - [x] 实现人工黏性平均密度计算。 - [x] 实现人工黏性 `mu_ij` 计算。 -- [ ] 实现人工黏性加速度贡献。 -- [ ] 对远离粒子返回零人工黏性。 -- [ ] 创建或完善 Water 压力力计算入口。 -- [ ] 实现 SPH 压力梯度加速度。 -- [ ] 累加 `acc_pressure(3,npart)`。 -- [ ] 累加 `acc_viscosity(3,npart)`。 -- [ ] 将 body force 加入总加速度。 -- [ ] 将外部耦合载荷占位加入总加速度。 -- [ ] 对非 water 粒子跳过水相力贡献。 -- [ ] 增加人工黏性方向测试。 -- [ ] 增加人工黏性有限性测试。 -- [ ] 增加人工黏性对称性测试。 -- [ ] 增加压力梯度双粒子测试。 -- [ ] 增加均匀压力净力近零测试。 -- [ ] 增加 body force 加速度测试。 +- [x] 实现人工黏性加速度贡献。 +- [x] 对远离粒子返回零人工黏性。 +- [x] 创建或完善 Water 压力力计算入口。 +- [x] 实现 SPH 压力梯度加速度。 +- [x] 累加 `acc_pressure(3,npart)`。 +- [x] 累加 `acc_viscosity(3,npart)`。 +- [x] 将 body force 加入总加速度。 +- [x] 将外部耦合载荷占位加入总加速度。 +- [x] 对非 water 粒子跳过水相力贡献。 +- [x] 增加人工黏性方向测试。 +- [x] 增加人工黏性有限性测试。 +- [x] 增加人工黏性对称性测试。 +- [x] 增加压力梯度双粒子测试。 +- [x] 增加均匀压力净力近零测试。 +- [x] 增加 body force 加速度测试。 ## 阶段 J:Solver Water 集成 -- [ ] 在 build model 中构建 Water 运行时状态。 -- [ ] 在 build model 中构建邻域搜索状态。 -- [ ] 在显式步开始前校验 Water 参数。 -- [ ] 在显式步中必要时重建邻域。 -- [ ] 在显式步中根据 `rho` 更新 `pressure`。 +- [x] 在 build model 中构建 Water 运行时状态。 +- [x] 在 build model 中构建邻域搜索状态。 +- [x] 在显式步开始前校验 Water 参数。 +- [x] 在显式步中必要时重建邻域。 +- [x] 在显式步中根据 `rho` 更新 `pressure`。 - [ ] 在显式步中计算 `drho_dt`。 - [ ] 在显式步中计算水相压力加速度。 - [ ] 在显式步中计算水相黏性加速度。