diff --git a/src/water/sph_water.f90 b/src/water/sph_water.f90 index 89d4f95..350246d 100644 --- a/src/water/sph_water.f90 +++ b/src/water/sph_water.f90 @@ -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 diff --git a/tests/data/water_bad_body_force_field_021.inp b/tests/data/water_bad_body_force_field_021.inp new file mode 100644 index 0000000..4fff257 --- /dev/null +++ b/tests/data/water_bad_body_force_field_021.inp @@ -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 diff --git a/tests/data/water_bad_eos_b_021.inp b/tests/data/water_bad_eos_b_021.inp new file mode 100644 index 0000000..6268499 --- /dev/null +++ b/tests/data/water_bad_eos_b_021.inp @@ -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 diff --git a/tests/data/water_bad_particle_control_value_021.inp b/tests/data/water_bad_particle_control_value_021.inp new file mode 100644 index 0000000..dc92471 --- /dev/null +++ b/tests/data/water_bad_particle_control_value_021.inp @@ -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 diff --git a/tests/data/water_bad_time_control_021.inp b/tests/data/water_bad_time_control_021.inp new file mode 100644 index 0000000..78a273e --- /dev/null +++ b/tests/data/water_bad_time_control_021.inp @@ -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 diff --git a/tests/data/water_bad_viscosity_value_021.inp b/tests/data/water_bad_viscosity_value_021.inp new file mode 100644 index 0000000..deeb286 --- /dev/null +++ b/tests/data/water_bad_viscosity_value_021.inp @@ -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 diff --git a/tests/data/water_duplicate_coordinates_021.inp b/tests/data/water_duplicate_coordinates_021.inp new file mode 100644 index 0000000..240875e --- /dev/null +++ b/tests/data/water_duplicate_coordinates_021.inp @@ -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 diff --git a/tests/data/water_eos_non_tait_021.inp b/tests/data/water_eos_non_tait_021.inp new file mode 100644 index 0000000..f8971c4 --- /dev/null +++ b/tests/data/water_eos_non_tait_021.inp @@ -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 diff --git a/tests/data/water_missing_density_021.inp b/tests/data/water_missing_density_021.inp new file mode 100644 index 0000000..718a674 --- /dev/null +++ b/tests/data/water_missing_density_021.inp @@ -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 diff --git a/tests/data/water_missing_eos_c0_021.inp b/tests/data/water_missing_eos_c0_021.inp new file mode 100644 index 0000000..10fc646 --- /dev/null +++ b/tests/data/water_missing_eos_c0_021.inp @@ -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 diff --git a/tests/data/water_missing_eos_gamma_021.inp b/tests/data/water_missing_eos_gamma_021.inp new file mode 100644 index 0000000..d27b460 --- /dev/null +++ b/tests/data/water_missing_eos_gamma_021.inp @@ -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 diff --git a/tests/data/water_missing_eos_material_021.inp b/tests/data/water_missing_eos_material_021.inp new file mode 100644 index 0000000..a843759 --- /dev/null +++ b/tests/data/water_missing_eos_material_021.inp @@ -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 diff --git a/tests/data/water_missing_eos_rho0_021.inp b/tests/data/water_missing_eos_rho0_021.inp new file mode 100644 index 0000000..7255156 --- /dev/null +++ b/tests/data/water_missing_eos_rho0_021.inp @@ -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 diff --git a/tests/data/water_missing_eos_type_021.inp b/tests/data/water_missing_eos_type_021.inp new file mode 100644 index 0000000..9a434da --- /dev/null +++ b/tests/data/water_missing_eos_type_021.inp @@ -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 diff --git a/tests/data/water_missing_viscosity_field_021.inp b/tests/data/water_missing_viscosity_field_021.inp new file mode 100644 index 0000000..93bee7c --- /dev/null +++ b/tests/data/water_missing_viscosity_field_021.inp @@ -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 diff --git a/tests/data/water_pressure_wave_3d_021.inp b/tests/data/water_pressure_wave_3d_021.inp new file mode 100644 index 0000000..bbb690d --- /dev/null +++ b/tests/data/water_pressure_wave_3d_021.inp @@ -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 diff --git a/tests/data/water_section_unknown_material_021.inp b/tests/data/water_section_unknown_material_021.inp new file mode 100644 index 0000000..950efbe --- /dev/null +++ b/tests/data/water_section_unknown_material_021.inp @@ -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 diff --git a/tests/data/water_sparse_particles_021.inp b/tests/data/water_sparse_particles_021.inp new file mode 100644 index 0000000..1a0ff5f --- /dev/null +++ b/tests/data/water_sparse_particles_021.inp @@ -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 diff --git a/tests/data/water_unknown_sphlite_warning_021.inp b/tests/data/water_unknown_sphlite_warning_021.inp new file mode 100644 index 0000000..e2d9588 --- /dev/null +++ b/tests/data/water_unknown_sphlite_warning_021.inp @@ -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 diff --git a/tests/module/test_input.f90 b/tests/module/test_input.f90 index 0bfa048..5e9ad64 100644 --- a/tests/module/test_input.f90 +++ b/tests/module/test_input.f90 @@ -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 diff --git a/todo.md b/todo.md index 5f72c23..643ac0e 100644 --- a/todo.md +++ b/todo.md @@ -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` 字段校验。