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