Add SPHLite 0.2.1 water input hardening cases

This commit is contained in:
Codex
2026-07-02 22:40:54 +08:00
parent 000209cc7d
commit 920688d832
21 changed files with 318 additions and 21 deletions
+20 -1
View File
@@ -6,7 +6,8 @@ module sph_water
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, water_dt_cfl, water_dt_accel, water_dt_viscous, &
SPH_PHASE_WATER, SPH_STATUS_ACTIVE, &
SPH_PHASE_WATER, SPH_STATUS_ACTIVE, material_count, material_name, &
material_density, &
sph_db_clear_water_diagnostics
use sph_particle, only: SPH_KERNEL_DEFAULT, sph_kernel_gradient
implicit none
@@ -188,9 +189,27 @@ contains
if (.not. water_particle_control_defined) then
call sph_error_set(SPH_ERROR_INPUT, 'input is missing *SPHLITE PARTICLE CONTROL for Water')
ierr = SPH_ERROR_INPUT
return
end if
if (.not. sph_water_has_material_density()) then
call sph_error_set(SPH_ERROR_INPUT, 'input is missing *DENSITY for Water material')
ierr = SPH_ERROR_INPUT
end if
end subroutine sph_water_validate_input
logical function sph_water_has_material_density()
integer :: i
sph_water_has_material_density = .false.
do i = 1, material_count
if (trim(sph_water_upper(material_name(i))) == &
trim(sph_water_upper(water_material_name))) then
sph_water_has_material_density = material_density(i) > 0.0_rk
return
end if
end do
end function sph_water_has_material_density
subroutine sph_water_apply_initial_conditions(ierr)
integer, intent(out) :: ierr
integer :: i
@@ -0,0 +1,17 @@
*NODE
1, 0.0, 0.0, 0.0
2, 0.1, 0.0, 0.0
*ELEMENT, TYPE=SPH3D
1, 1
2, 2
*ELSET, ELSET=WATER_PARTICLES
1, 2
*MATERIAL, NAME=WATER, TYPE=WATER
*DENSITY
1000.0
*SECTION, ELSET=WATER_PARTICLES, MATERIAL=WATER
*SPHLITE EOS, TYPE=TAIT, MATERIAL=WATER, RHO0=1000.0, C0=1480.0, GAMMA=7.0, P0=0.0
*SPHLITE VISCOSITY, TYPE=MONAGHAN, MATERIAL=WATER, ALPHA=0.1, BETA=0.0, ETA2=0.01
*SPHLITE PARTICLE CONTROL, H=0.15, MASS=1.0, VOLUME=0.001
*SPHLITE BODY FORCE, X=0.0, Y=bad, Z=-9.81
*SPHLITE TIME CONTROL, DT=1.0E-6, TIME=1.0E-6, STEPS=1, SAFETY=0.5
+14
View File
@@ -0,0 +1,14 @@
*NODE
1, 0.0, 0.0, 0.0
*ELEMENT, TYPE=SPH3D
1, 1
*ELSET, ELSET=WATER_PARTICLES
1
*MATERIAL, NAME=WATER, TYPE=WATER
*DENSITY
1000.0
*SECTION, ELSET=WATER_PARTICLES, MATERIAL=WATER
*SPHLITE EOS, TYPE=TAIT, MATERIAL=WATER, RHO0=1000.0, C0=1480.0, GAMMA=7.0, P0=0.0, B=-1.0
*SPHLITE VISCOSITY, TYPE=MONAGHAN, MATERIAL=WATER, ALPHA=0.1, BETA=0.0, ETA2=0.01
*SPHLITE PARTICLE CONTROL, H=0.15, MASS=1.0, VOLUME=0.001
*SPHLITE TIME CONTROL, DT=1.0E-6, TIME=1.0E-6, STEPS=1, SAFETY=0.5
@@ -0,0 +1,14 @@
*NODE
1, 0.0, 0.0, 0.0
*ELEMENT, TYPE=SPH3D
1, 1
*ELSET, ELSET=WATER_PARTICLES
1
*MATERIAL, NAME=WATER, TYPE=WATER
*DENSITY
1000.0
*SECTION, ELSET=WATER_PARTICLES, MATERIAL=WATER
*SPHLITE EOS, TYPE=TAIT, MATERIAL=WATER, RHO0=1000.0, C0=1480.0, GAMMA=7.0, P0=0.0
*SPHLITE VISCOSITY, TYPE=MONAGHAN, MATERIAL=WATER, ALPHA=0.1, BETA=0.0, ETA2=0.01
*SPHLITE PARTICLE CONTROL, H=0.15, MASS=0.0, VOLUME=0.001
*SPHLITE TIME CONTROL, DT=1.0E-6, TIME=1.0E-6, STEPS=1, SAFETY=0.5
+14
View File
@@ -0,0 +1,14 @@
*NODE
1, 0.0, 0.0, 0.0
*ELEMENT, TYPE=SPH3D
1, 1
*ELSET, ELSET=WATER_PARTICLES
1
*MATERIAL, NAME=WATER, TYPE=WATER
*DENSITY
1000.0
*SECTION, ELSET=WATER_PARTICLES, MATERIAL=WATER
*SPHLITE EOS, TYPE=TAIT, MATERIAL=WATER, RHO0=1000.0, C0=1480.0, GAMMA=7.0, P0=0.0
*SPHLITE VISCOSITY, TYPE=MONAGHAN, MATERIAL=WATER, ALPHA=0.1, BETA=0.0, ETA2=0.01
*SPHLITE PARTICLE CONTROL, H=0.15, MASS=1.0, VOLUME=0.001
*SPHLITE TIME CONTROL, DT=0.0, TIME=-1.0E-6, STEPS=0, SAFETY=0.0
@@ -0,0 +1,14 @@
*NODE
1, 0.0, 0.0, 0.0
*ELEMENT, TYPE=SPH3D
1, 1
*ELSET, ELSET=WATER_PARTICLES
1
*MATERIAL, NAME=WATER, TYPE=WATER
*DENSITY
1000.0
*SECTION, ELSET=WATER_PARTICLES, MATERIAL=WATER
*SPHLITE EOS, TYPE=TAIT, MATERIAL=WATER, RHO0=1000.0, C0=1480.0, GAMMA=7.0, P0=0.0
*SPHLITE VISCOSITY, TYPE=MONAGHAN, MATERIAL=WATER, ALPHA=0.1, BETA=-0.1, ETA2=0.01
*SPHLITE PARTICLE CONTROL, H=0.15, MASS=1.0, VOLUME=0.001
*SPHLITE TIME CONTROL, DT=1.0E-6, TIME=1.0E-6, STEPS=1, SAFETY=0.5
@@ -0,0 +1,20 @@
*NODE
1, 0.0, 0.0, 0.0
2, 0.0, 0.0, 0.0
3, 0.1, 0.0, 0.0
4, 0.0, 0.1, 0.0
*ELEMENT, TYPE=SPH3D
1, 1
2, 2
3, 3
4, 4
*ELSET, ELSET=WATER_PARTICLES
1, 2, 3, 4
*MATERIAL, NAME=WATER, TYPE=WATER
*DENSITY
1000.0
*SECTION, ELSET=WATER_PARTICLES, MATERIAL=WATER
*SPHLITE EOS, TYPE=TAIT, MATERIAL=WATER, RHO0=1000.0, C0=1480.0, GAMMA=7.0, P0=0.0
*SPHLITE VISCOSITY, TYPE=MONAGHAN, MATERIAL=WATER, ALPHA=0.1, BETA=0.0, ETA2=0.01
*SPHLITE PARTICLE CONTROL, H=0.15, MASS=1.0, VOLUME=0.001
*SPHLITE TIME CONTROL, DT=1.0E-6, TIME=1.0E-6, STEPS=1, SAFETY=0.5
+14
View File
@@ -0,0 +1,14 @@
*NODE
1, 0.0, 0.0, 0.0
*ELEMENT, TYPE=SPH3D
1, 1
*ELSET, ELSET=WATER_PARTICLES
1
*MATERIAL, NAME=WATER, TYPE=WATER
*DENSITY
1000.0
*SECTION, ELSET=WATER_PARTICLES, MATERIAL=WATER
*SPHLITE EOS, TYPE=STIFFENED_GAS, MATERIAL=WATER, RHO0=1000.0, C0=1480.0, GAMMA=7.0, P0=0.0
*SPHLITE VISCOSITY, TYPE=MONAGHAN, MATERIAL=WATER, ALPHA=0.1, BETA=0.0, ETA2=0.01
*SPHLITE PARTICLE CONTROL, H=0.15, MASS=1.0, VOLUME=0.001
*SPHLITE TIME CONTROL, DT=1.0E-6, TIME=1.0E-6, STEPS=1, SAFETY=0.5
+12
View File
@@ -0,0 +1,12 @@
*NODE
1, 0.0, 0.0, 0.0
*ELEMENT, TYPE=SPH3D
1, 1
*ELSET, ELSET=WATER_PARTICLES
1
*MATERIAL, NAME=WATER, TYPE=WATER
*SECTION, ELSET=WATER_PARTICLES, MATERIAL=WATER
*SPHLITE EOS, TYPE=TAIT, MATERIAL=WATER, RHO0=1000.0, C0=1480.0, GAMMA=7.0, P0=0.0
*SPHLITE VISCOSITY, TYPE=MONAGHAN, MATERIAL=WATER, ALPHA=0.1, BETA=0.0, ETA2=0.01
*SPHLITE PARTICLE CONTROL, H=0.15, MASS=1.0, VOLUME=0.001
*SPHLITE TIME CONTROL, DT=1.0E-6, TIME=1.0E-6, STEPS=1, SAFETY=0.5
+14
View File
@@ -0,0 +1,14 @@
*NODE
1, 0.0, 0.0, 0.0
*ELEMENT, TYPE=SPH3D
1, 1
*ELSET, ELSET=WATER_PARTICLES
1
*MATERIAL, NAME=WATER, TYPE=WATER
*DENSITY
1000.0
*SECTION, ELSET=WATER_PARTICLES, MATERIAL=WATER
*SPHLITE EOS, TYPE=TAIT, MATERIAL=WATER, RHO0=1000.0, GAMMA=7.0, P0=0.0
*SPHLITE VISCOSITY, TYPE=MONAGHAN, MATERIAL=WATER, ALPHA=0.1, BETA=0.0, ETA2=0.01
*SPHLITE PARTICLE CONTROL, H=0.15, MASS=1.0, VOLUME=0.001
*SPHLITE TIME CONTROL, DT=1.0E-6, TIME=1.0E-6, STEPS=1, SAFETY=0.5
@@ -0,0 +1,14 @@
*NODE
1, 0.0, 0.0, 0.0
*ELEMENT, TYPE=SPH3D
1, 1
*ELSET, ELSET=WATER_PARTICLES
1
*MATERIAL, NAME=WATER, TYPE=WATER
*DENSITY
1000.0
*SECTION, ELSET=WATER_PARTICLES, MATERIAL=WATER
*SPHLITE EOS, TYPE=TAIT, MATERIAL=WATER, RHO0=1000.0, C0=1480.0, P0=0.0
*SPHLITE VISCOSITY, TYPE=MONAGHAN, MATERIAL=WATER, ALPHA=0.1, BETA=0.0, ETA2=0.01
*SPHLITE PARTICLE CONTROL, H=0.15, MASS=1.0, VOLUME=0.001
*SPHLITE TIME CONTROL, DT=1.0E-6, TIME=1.0E-6, STEPS=1, SAFETY=0.5
@@ -0,0 +1,14 @@
*NODE
1, 0.0, 0.0, 0.0
*ELEMENT, TYPE=SPH3D
1, 1
*ELSET, ELSET=WATER_PARTICLES
1
*MATERIAL, NAME=WATER, TYPE=WATER
*DENSITY
1000.0
*SECTION, ELSET=WATER_PARTICLES, MATERIAL=WATER
*SPHLITE EOS, TYPE=TAIT, RHO0=1000.0, C0=1480.0, GAMMA=7.0, P0=0.0
*SPHLITE VISCOSITY, TYPE=MONAGHAN, MATERIAL=WATER, ALPHA=0.1, BETA=0.0, ETA2=0.01
*SPHLITE PARTICLE CONTROL, H=0.15, MASS=1.0, VOLUME=0.001
*SPHLITE TIME CONTROL, DT=1.0E-6, TIME=1.0E-6, STEPS=1, SAFETY=0.5
+14
View File
@@ -0,0 +1,14 @@
*NODE
1, 0.0, 0.0, 0.0
*ELEMENT, TYPE=SPH3D
1, 1
*ELSET, ELSET=WATER_PARTICLES
1
*MATERIAL, NAME=WATER, TYPE=WATER
*DENSITY
1000.0
*SECTION, ELSET=WATER_PARTICLES, MATERIAL=WATER
*SPHLITE EOS, TYPE=TAIT, MATERIAL=WATER, C0=1480.0, GAMMA=7.0, P0=0.0
*SPHLITE VISCOSITY, TYPE=MONAGHAN, MATERIAL=WATER, ALPHA=0.1, BETA=0.0, ETA2=0.01
*SPHLITE PARTICLE CONTROL, H=0.15, MASS=1.0, VOLUME=0.001
*SPHLITE TIME CONTROL, DT=1.0E-6, TIME=1.0E-6, STEPS=1, SAFETY=0.5
+14
View File
@@ -0,0 +1,14 @@
*NODE
1, 0.0, 0.0, 0.0
*ELEMENT, TYPE=SPH3D
1, 1
*ELSET, ELSET=WATER_PARTICLES
1
*MATERIAL, NAME=WATER, TYPE=WATER
*DENSITY
1000.0
*SECTION, ELSET=WATER_PARTICLES, MATERIAL=WATER
*SPHLITE EOS, MATERIAL=WATER, RHO0=1000.0, C0=1480.0, GAMMA=7.0, P0=0.0
*SPHLITE VISCOSITY, TYPE=MONAGHAN, MATERIAL=WATER, ALPHA=0.1, BETA=0.0, ETA2=0.01
*SPHLITE PARTICLE CONTROL, H=0.15, MASS=1.0, VOLUME=0.001
*SPHLITE TIME CONTROL, DT=1.0E-6, TIME=1.0E-6, STEPS=1, SAFETY=0.5
@@ -0,0 +1,14 @@
*NODE
1, 0.0, 0.0, 0.0
*ELEMENT, TYPE=SPH3D
1, 1
*ELSET, ELSET=WATER_PARTICLES
1
*MATERIAL, NAME=WATER, TYPE=WATER
*DENSITY
1000.0
*SECTION, ELSET=WATER_PARTICLES, MATERIAL=WATER
*SPHLITE EOS, TYPE=TAIT, MATERIAL=WATER, RHO0=1000.0, C0=1480.0, GAMMA=7.0, P0=0.0
*SPHLITE VISCOSITY, TYPE=MONAGHAN, MATERIAL=WATER, ALPHA=0.1, BETA=0.0
*SPHLITE PARTICLE CONTROL, H=0.15, MASS=1.0, VOLUME=0.001
*SPHLITE TIME CONTROL, DT=1.0E-6, TIME=1.0E-6, STEPS=1, SAFETY=0.5
+22
View File
@@ -0,0 +1,22 @@
*NODE
1, 0.0, 0.0, 0.0
2, 0.1, 0.0, 0.0
3, 0.0, 0.1, 0.0
4, 0.0, 0.0, 0.1
5, 0.1, 0.1, 0.1
*ELEMENT, TYPE=SPH3D
1, 1
2, 2
3, 3
4, 4
5, 5
*ELSET, ELSET=WATER_PARTICLES
1, 2, 3, 4, 5
*MATERIAL, NAME=WATER, TYPE=WATER
*DENSITY
1000.0
*SECTION, ELSET=WATER_PARTICLES, MATERIAL=WATER
*SPHLITE EOS, TYPE=TAIT, MATERIAL=WATER, RHO0=1000.0, C0=1480.0, GAMMA=7.0, P0=0.0
*SPHLITE VISCOSITY, TYPE=MONAGHAN, MATERIAL=WATER, ALPHA=0.1, BETA=0.0, ETA2=0.01
*SPHLITE PARTICLE CONTROL, H=0.15, MASS=1.0, VOLUME=0.001
*SPHLITE TIME CONTROL, DT=1.0E-7, TIME=3.0E-7, STEPS=3, SAFETY=0.5
@@ -0,0 +1,14 @@
*NODE
1, 0.0, 0.0, 0.0
*ELEMENT, TYPE=SPH3D
1, 1
*ELSET, ELSET=WATER_PARTICLES
1
*MATERIAL, NAME=WATER, TYPE=WATER
*DENSITY
1000.0
*SECTION, ELSET=WATER_PARTICLES, MATERIAL=UNKNOWN_WATER
*SPHLITE EOS, TYPE=TAIT, MATERIAL=WATER, RHO0=1000.0, C0=1480.0, GAMMA=7.0, P0=0.0
*SPHLITE VISCOSITY, TYPE=MONAGHAN, MATERIAL=WATER, ALPHA=0.1, BETA=0.0, ETA2=0.01
*SPHLITE PARTICLE CONTROL, H=0.15, MASS=1.0, VOLUME=0.001
*SPHLITE TIME CONTROL, DT=1.0E-6, TIME=1.0E-6, STEPS=1, SAFETY=0.5
+20
View File
@@ -0,0 +1,20 @@
*NODE
1, -10.0, 0.0, 0.0
2, 0.0, 12.0, 0.0
3, 0.0, 0.0, -14.0
4, 15.0, 15.0, 15.0
*ELEMENT, TYPE=SPH3D
1, 1
2, 2
3, 3
4, 4
*ELSET, ELSET=WATER_PARTICLES
1, 2, 3, 4
*MATERIAL, NAME=WATER, TYPE=WATER
*DENSITY
1000.0
*SECTION, ELSET=WATER_PARTICLES, MATERIAL=WATER
*SPHLITE EOS, TYPE=TAIT, MATERIAL=WATER, RHO0=1000.0, C0=1480.0, GAMMA=7.0, P0=0.0
*SPHLITE VISCOSITY, TYPE=MONAGHAN, MATERIAL=WATER, ALPHA=0.1, BETA=0.0, ETA2=0.01
*SPHLITE PARTICLE CONTROL, H=0.15, MASS=1.0, VOLUME=0.001
*SPHLITE TIME CONTROL, DT=1.0E-6, TIME=1.0E-6, STEPS=1, SAFETY=0.5
@@ -0,0 +1,17 @@
*NODE
1, 0.0, 0.0, 0.0
2, 0.1, 0.0, 0.0
*ELEMENT, TYPE=SPH3D
1, 1
2, 2
*ELSET, ELSET=WATER_PARTICLES
1, 2
*MATERIAL, NAME=WATER, TYPE=WATER
*DENSITY
1000.0
*SECTION, ELSET=WATER_PARTICLES, MATERIAL=WATER
*SPHLITE EOS, TYPE=TAIT, MATERIAL=WATER, RHO0=1000.0, C0=1480.0, GAMMA=7.0, P0=0.0
*SPHLITE VISCOSITY, TYPE=MONAGHAN, MATERIAL=WATER, ALPHA=0.1, BETA=0.0, ETA2=0.01
*SPHLITE PARTICLE CONTROL, H=0.15, MASS=1.0, VOLUME=0.001
*SPHLITE SAFE UNKNOWN, FIELD=IGNORED
*SPHLITE TIME CONTROL, DT=1.0E-6, TIME=1.0E-6, STEPS=1, SAFETY=0.5
+2
View File
@@ -25,6 +25,7 @@ program test_input
call check_good_input('tests/data/mixed_case_011.inp', 2, .false.)
call check_good_input('tests/data/output_control_011.inp', 2, .false.)
call check_good_input('tests/data/coupling_region_011.inp', 2, .false.)
call check_good_input('tests/data/water_material_case_021.inp', 4, .false.)
call sph_initialize(ierr)
call assert_ok(ierr, 'initialize failed for unknown keyword input')
@@ -43,6 +44,7 @@ program test_input
call check_bad_input('tests/data/missing_material_011.inp')
call check_bad_input('tests/data/missing_section_011.inp')
call check_bad_input('tests/data/missing_time_control_011.inp')
call check_bad_input('tests/data/water_missing_density_021.inp')
contains
+20 -20
View File
@@ -31,29 +31,29 @@
- [x] 创建 0.2.1 Water 最小合法输入文件。
- [x] 创建 Water material 大小写兼容测试输入文件。
- [ ] 创建 Water material 缺少 `*DENSITY` 的错误输入文件。
- [ ] 创建 `*SECTION` 指向不存在 material 的错误输入文件。
- [ ] 创建缺失 `*SPHLITE EOS, TYPE` 的错误输入文件。
- [ ] 创建缺失 `*SPHLITE EOS, MATERIAL` 的错误输入文件。
- [ ] 创建缺失 `*SPHLITE EOS, RHO0` 的错误输入文件。
- [ ] 创建缺失 `*SPHLITE EOS, C0` 的错误输入文件。
- [ ] 创建缺失 `*SPHLITE EOS, GAMMA` 的错误输入文件。
- [ ] 创建非法 `*SPHLITE EOS, B` 的错误输入文件。
- [ ] 创建非 `TYPE=TAIT` 的 EOS 类型测试输入文件。
- [ ] 创建缺失 `*SPHLITE VISCOSITY` 字段的错误输入文件。
- [ ] 创建非法 `*SPHLITE VISCOSITY` 数值的错误输入文件。
- [ ] 创建非法 `*SPHLITE PARTICLE CONTROL` 数值的错误输入文件。
- [ ] 创建非法 `*SPHLITE BODY FORCE` 字段的错误输入文件。
- [ ] 创建非法 `*SPHLITE TIME CONTROL` 数值的错误输入文件。
- [ ] 创建未知但不影响运行的 `*SPHLITE` warning 输入文件。
- [ ] 创建重复坐标 Water 粒子输入文件。
- [ ] 创建稀疏 Water 粒子输入文件。
- [ ] 创建非共线 3D pressure wave 输入文件。
- [x] 创建 Water material 缺少 `*DENSITY` 的错误输入文件。
- [x] 创建 `*SECTION` 指向不存在 material 的错误输入文件。
- [x] 创建缺失 `*SPHLITE EOS, TYPE` 的错误输入文件。
- [x] 创建缺失 `*SPHLITE EOS, MATERIAL` 的错误输入文件。
- [x] 创建缺失 `*SPHLITE EOS, RHO0` 的错误输入文件。
- [x] 创建缺失 `*SPHLITE EOS, C0` 的错误输入文件。
- [x] 创建缺失 `*SPHLITE EOS, GAMMA` 的错误输入文件。
- [x] 创建非法 `*SPHLITE EOS, B` 的错误输入文件。
- [x] 创建非 `TYPE=TAIT` 的 EOS 类型测试输入文件。
- [x] 创建缺失 `*SPHLITE VISCOSITY` 字段的错误输入文件。
- [x] 创建非法 `*SPHLITE VISCOSITY` 数值的错误输入文件。
- [x] 创建非法 `*SPHLITE PARTICLE CONTROL` 数值的错误输入文件。
- [x] 创建非法 `*SPHLITE BODY FORCE` 字段的错误输入文件。
- [x] 创建非法 `*SPHLITE TIME CONTROL` 数值的错误输入文件。
- [x] 创建未知但不影响运行的 `*SPHLITE` warning 输入文件。
- [x] 创建重复坐标 Water 粒子输入文件。
- [x] 创建稀疏 Water 粒子输入文件。
- [x] 创建非共线 3D pressure wave 输入文件。
## 阶段 C:输入解析加固
- [ ] 加固 `*MATERIAL, TYPE=WATER` 大小写解析。
- [ ] 加固 Water material 与 `*DENSITY` 的绑定校验。
- [x] 加固 `*MATERIAL, TYPE=WATER` 大小写解析。
- [x] 加固 Water material 与 `*DENSITY` 的绑定校验。
- [ ] 加固 `*SECTION` material 引用存在性校验。
- [ ] 加固 set 只作为集合、不作为类型判断的测试。
- [ ] 加固 `*SPHLITE EOS` 的 `TYPE` 字段校验。