Harden SPHLite 0.2.1 water input parsing
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user