Harden SPHLite 0.2.1 water input parsing

This commit is contained in:
Codex
2026-07-02 22:47:41 +08:00
parent 920688d832
commit 8321ed1b36
13 changed files with 246 additions and 26 deletions
+44 -2
View File
@@ -392,7 +392,7 @@ contains
return
end if
do i = 1, material_count
if (trim(material_name(i)) == trim(name)) then
if (sph_db_name_equal(material_name(i), name)) then
material_density(i) = density_value
return
end if
@@ -408,6 +408,7 @@ contains
real(rk), intent(in) :: thickness
integer, intent(in) :: points
integer, intent(out) :: ierr
integer :: mat_index
ierr = SPH_SUCCESS
if (section_count >= SPH_MAX_SECTIONS) then
@@ -415,15 +416,56 @@ contains
ierr = SPH_ERROR_DATABASE
return
end if
mat_index = sph_db_find_material(mat_name)
if (mat_index <= 0) then
call sph_error_set(SPH_ERROR_DATABASE, 'section references unknown material')
ierr = SPH_ERROR_DATABASE
return
end if
section_count = section_count + 1
section_name(section_count) = name
section_type(section_count) = stype
section_material_name(section_count) = mat_name
section_material_id(section_count) = 1
section_material_id(section_count) = mat_index
section_thickness(section_count) = thickness
section_integration_points(section_count) = points
end subroutine sph_db_add_section
integer function sph_db_find_material(name)
character(len=*), intent(in) :: name
integer :: i
sph_db_find_material = 0
do i = 1, material_count
if (sph_db_name_equal(material_name(i), name)) then
sph_db_find_material = i
return
end if
end do
end function sph_db_find_material
logical function sph_db_name_equal(left, right)
character(len=*), intent(in) :: left
character(len=*), intent(in) :: right
sph_db_name_equal = trim(sph_db_upper(left)) == trim(sph_db_upper(right))
end function sph_db_name_equal
function sph_db_upper(text) result(out)
character(len=*), intent(in) :: text
character(len=len(text)) :: out
integer :: i
integer :: code
out = text
do i = 1, len(out)
code = ichar(out(i:i))
if (code >= ichar('a') .and. code <= ichar('z')) then
out(i:i) = char(code - ichar('a') + ichar('A'))
end if
end do
end function sph_db_upper
subroutine sph_db_add_nset(name, member_count, first_member, ierr)
character(len=*), intent(in) :: name
integer, intent(in) :: member_count
+2 -1
View File
@@ -315,7 +315,8 @@ contains
if (ierr /= SPH_SUCCESS) return
call sph_input_get_required_real(line, 'GAMMA', gamma, ierr)
if (ierr /= SPH_SUCCESS) return
call sph_input_get_required_real(line, 'P0', p0, ierr)
p0 = 0.0_rk
call sph_input_get_optional_real(line, 'P0', p0, ierr)
if (ierr /= SPH_SUCCESS) return
call sph_input_get_option(line, 'B', value)
has_b = len_trim(value) > 0
+22 -2
View File
@@ -86,18 +86,28 @@ contains
integer, intent(out) :: ierr
ierr = SPH_SUCCESS
if (len_trim(eos_type) == 0) then
call sph_error_set(SPH_ERROR_INPUT, 'Water EOS TYPE is required')
ierr = SPH_ERROR_INPUT
return
end if
if (index(sph_water_upper(eos_type), 'TAIT') <= 0) then
call sph_error_set(SPH_ERROR_INPUT, 'Water EOS TYPE must be TAIT')
ierr = SPH_ERROR_INPUT
return
end if
if (len_trim(material_name) == 0) then
call sph_error_set(SPH_ERROR_INPUT, 'Water EOS MATERIAL is required')
ierr = SPH_ERROR_INPUT
return
end if
if (rho0 <= 0.0_rk .or. c0 <= 0.0_rk .or. gamma <= 0.0_rk) then
call sph_error_set(SPH_ERROR_ARGUMENT, 'Water Tait EOS parameters must be positive')
ierr = SPH_ERROR_ARGUMENT
return
end if
water_material_seen = .true.
if (len_trim(material_name) > 0) water_material_name = material_name
water_material_name = material_name
water_rho0 = rho0
water_c0 = c0
water_gamma = gamma
@@ -124,17 +134,27 @@ contains
integer, intent(out) :: ierr
ierr = SPH_SUCCESS
if (len_trim(visc_type) == 0) then
call sph_error_set(SPH_ERROR_INPUT, 'Water viscosity TYPE is required')
ierr = SPH_ERROR_INPUT
return
end if
if (index(sph_water_upper(visc_type), 'MONAGHAN') <= 0) then
call sph_error_set(SPH_ERROR_INPUT, 'Water viscosity TYPE must be MONAGHAN')
ierr = SPH_ERROR_INPUT
return
end if
if (len_trim(material_name) == 0) then
call sph_error_set(SPH_ERROR_INPUT, 'Water viscosity MATERIAL is required')
ierr = SPH_ERROR_INPUT
return
end if
if (alpha < 0.0_rk .or. beta < 0.0_rk .or. eta2 <= 0.0_rk) then
call sph_error_set(SPH_ERROR_ARGUMENT, 'Water viscosity parameters are invalid')
ierr = SPH_ERROR_ARGUMENT
return
end if
if (len_trim(material_name) > 0) water_material_name = material_name
water_material_name = material_name
water_visc_alpha = alpha
water_visc_beta = beta
water_visc_eta2 = eta2
@@ -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=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.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
+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
*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, C0=1480.0, GAMMA=7.0, P0=0.0, B=3.0E8
*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, 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, 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,16 @@
*NODE
1, 0.0, 0.0, 0.0
2, 0.1, 0.0, 0.0
*ELEMENT, TYPE=SPH3D
1, 1
2, 2
*ELSET, ELSET=SOLID_LOOKING_SET
1, 2
*MATERIAL, NAME=WATER, TYPE=WATER
*DENSITY
1000.0
*SECTION, ELSET=SOLID_LOOKING_SET, 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
+52 -2
View File
@@ -4,7 +4,8 @@ program test_input
sph_build_model, sph_get_particle_count, sph_get_input_warning_count
use sph_input_reader, only: sph_input_get_warning_count
use sph_database, only: material_count, section_count, nset_count, &
elset_count, element_count, coupling_region_count
elset_count, element_count, coupling_region_count, particle_phase, &
SPH_PHASE_WATER
implicit none
integer :: ierr
@@ -26,6 +27,10 @@ program test_input
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 check_good_input('tests/data/water_eos_no_p0_021.inp', 1, .false.)
call check_good_input('tests/data/water_eos_with_b_021.inp', 1, .false.)
call check_first_phase('tests/data/water_set_name_not_type_021.inp', &
SPH_PHASE_WATER)
call sph_initialize(ierr)
call assert_ok(ierr, 'initialize failed for unknown keyword input')
@@ -41,10 +46,26 @@ program test_input
call sph_finalize(ierr)
call assert_ok(ierr, 'finalize failed after unknown keyword input')
call check_bad_input('tests/data/missing_material_011.inp')
call check_input_fails('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')
call check_input_fails('tests/data/water_section_unknown_material_021.inp')
call check_input_fails('tests/data/water_missing_eos_type_021.inp')
call check_input_fails('tests/data/water_missing_eos_material_021.inp')
call check_input_fails('tests/data/water_missing_eos_rho0_021.inp')
call check_input_fails('tests/data/water_missing_eos_c0_021.inp')
call check_input_fails('tests/data/water_missing_eos_gamma_021.inp')
call check_input_fails('tests/data/water_bad_eos_b_021.inp')
call check_input_fails('tests/data/water_eos_non_tait_021.inp')
call check_input_fails('tests/data/water_missing_viscosity_field_021.inp')
call check_input_fails('tests/data/water_missing_viscosity_type_021.inp')
call check_input_fails('tests/data/water_missing_viscosity_material_021.inp')
call check_input_fails('tests/data/water_bad_viscosity_alpha_021.inp')
call check_input_fails('tests/data/water_bad_viscosity_value_021.inp')
call check_input_fails('tests/data/water_bad_viscosity_eta2_021.inp')
call check_input_fails('tests/data/water_bad_particle_control_020.inp')
call check_input_fails('tests/data/water_bad_particle_control_value_021.inp')
contains
@@ -68,6 +89,21 @@ contains
end if
end subroutine check_good_input
subroutine check_first_phase(filename, expected_phase)
character(len=*), intent(in) :: filename
integer, intent(in) :: expected_phase
call sph_initialize(ierr)
call assert_ok(ierr, 'initialize failed for phase input')
call sph_read_inp(filename, ierr)
call assert_ok(ierr, 'phase input read failed')
call sph_build_model(ierr)
call assert_ok(ierr, 'phase model build failed')
if (particle_phase(1) /= expected_phase) call fail('input phase mismatch')
call sph_finalize(ierr)
call assert_ok(ierr, 'finalize failed after phase input')
end subroutine check_first_phase
subroutine check_bad_input(filename)
character(len=*), intent(in) :: filename
@@ -81,6 +117,20 @@ contains
call assert_ok(ierr, 'finalize failed after bad input')
end subroutine check_bad_input
subroutine check_input_fails(filename)
character(len=*), intent(in) :: filename
call sph_initialize(ierr)
call assert_ok(ierr, 'initialize failed for failing input')
call sph_read_inp(filename, ierr)
if (ierr == SPH_SUCCESS) then
call sph_build_model(ierr)
if (ierr == SPH_SUCCESS) call fail('failing input built successfully')
end if
call sph_finalize(ierr)
call assert_ok(ierr, 'finalize failed after failing input')
end subroutine check_input_fails
subroutine assert_ok(ierr_value, message)
integer, intent(in) :: ierr_value
character(len=*), intent(in) :: message
+8 -1
View File
@@ -7,7 +7,7 @@ program test_water_eos
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
sph_water_update_diagnostics, sph_water_get_summary, water_b
implicit none
integer :: ierr
real(rk) :: p
@@ -34,6 +34,13 @@ program test_water_eos
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')
if (abs(water_b - 1000.0_rk * 1500.0_rk * 1500.0_rk / 7.0_rk) > &
1.0e-6_rk) call fail('derived Tait B mismatch')
call sph_water_set_eos('TAIT', 'WATER', 1000.0_rk, 1500.0_rk, &
7.0_rk, 0.0_rk, 2.5e8_rk, .true., ierr)
call assert_ok(ierr, 'explicit B EOS failed')
if (abs(water_b - 2.5e8_rk) > 1.0e-6_rk) call fail('explicit Tait B mismatch')
call sph_water_sound_speed(c, ierr)
call assert_ok(ierr, 'sound speed failed')
+18 -18
View File
@@ -54,24 +54,24 @@
- [x] 加固 `*MATERIAL, TYPE=WATER` 大小写解析。
- [x] 加固 Water material 与 `*DENSITY` 的绑定校验。
- [ ] 加固 `*SECTION` material 引用存在性校验。
- [ ] 加固 set 只作为集合、不作为类型判断的测试。
- [ ] 加固 `*SPHLITE EOS` 的 `TYPE` 字段校验。
- [ ] 加固 `*SPHLITE EOS` 的 `MATERIAL` 字段校验。
- [ ] 加固 `*SPHLITE EOS` 的 `RHO0` 字段校验。
- [ ] 加固 `*SPHLITE EOS` 的 `C0` 字段校验。
- [ ] 加固 `*SPHLITE EOS` 的 `GAMMA` 字段校验。
- [ ] 加固 `*SPHLITE EOS` 的可选 `P0` 字段解析。
- [ ] 加固 `*SPHLITE EOS` 的可选 `B` 字段解析。
- [ ] 保持未给定 `B` 时由 `rho0*c0*c0/gamma` 推导。
- [ ] 明确非 `TYPE=TAIT` 的 EOS 处理策略。
- [ ] 加固 `*SPHLITE VISCOSITY` 的 `TYPE` 字段校验。
- [ ] 加固 `*SPHLITE VISCOSITY` 的 `MATERIAL` 字段校验。
- [ ] 加固 `*SPHLITE VISCOSITY` 的 `ALPHA` 字段校验。
- [ ] 加固 `*SPHLITE VISCOSITY` 的 `BETA` 字段校验。
- [ ] 加固 `*SPHLITE VISCOSITY` 的 `ETA2` 字段校验。
- [ ] 加固 `*SPHLITE PARTICLE CONTROL` 的 `H` 正值校验。
- [ ] 加固 `*SPHLITE PARTICLE CONTROL` 的 `MASS` 正值校验。
- [x] 加固 `*SECTION` material 引用存在性校验。
- [x] 加固 set 只作为集合、不作为类型判断的测试。
- [x] 加固 `*SPHLITE EOS` 的 `TYPE` 字段校验。
- [x] 加固 `*SPHLITE EOS` 的 `MATERIAL` 字段校验。
- [x] 加固 `*SPHLITE EOS` 的 `RHO0` 字段校验。
- [x] 加固 `*SPHLITE EOS` 的 `C0` 字段校验。
- [x] 加固 `*SPHLITE EOS` 的 `GAMMA` 字段校验。
- [x] 加固 `*SPHLITE EOS` 的可选 `P0` 字段解析。
- [x] 加固 `*SPHLITE EOS` 的可选 `B` 字段解析。
- [x] 保持未给定 `B` 时由 `rho0*c0*c0/gamma` 推导。
- [x] 明确非 `TYPE=TAIT` 的 EOS 处理策略。
- [x] 加固 `*SPHLITE VISCOSITY` 的 `TYPE` 字段校验。
- [x] 加固 `*SPHLITE VISCOSITY` 的 `MATERIAL` 字段校验。
- [x] 加固 `*SPHLITE VISCOSITY` 的 `ALPHA` 字段校验。
- [x] 加固 `*SPHLITE VISCOSITY` 的 `BETA` 字段校验。
- [x] 加固 `*SPHLITE VISCOSITY` 的 `ETA2` 字段校验。
- [x] 加固 `*SPHLITE PARTICLE CONTROL` 的 `H` 正值校验。
- [x] 加固 `*SPHLITE PARTICLE CONTROL` 的 `MASS` 正值校验。
- [ ] 加固 `*SPHLITE PARTICLE CONTROL` 的 `VOLUME` 正值校验。
- [ ] 加固 `*SPHLITE BODY FORCE` 三维分量解析。
- [ ] 加固 `*SPHLITE TIME CONTROL` 的 `DT` 正值校验。