diff --git a/CMakeLists.txt b/CMakeLists.txt index 697d823..158d113 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -163,6 +163,18 @@ set_target_properties(test_input_explosive_multimaterial PROPERTIES Fortran_MODU add_test(NAME input_explosive_multimaterial COMMAND test_input_explosive_multimaterial) set_tests_properties(input_explosive_multimaterial PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") +add_executable(test_input_solid_material tests/module/test_input_solid_material.f90) +target_link_libraries(test_input_solid_material PRIVATE sphlite_core) +set_target_properties(test_input_solid_material PROPERTIES Fortran_MODULE_DIRECTORY "${SPHLITE_MODULE_DIR}") +add_test(NAME input_solid_material COMMAND test_input_solid_material) +set_tests_properties(input_solid_material PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") + +add_executable(test_input_solid_errors tests/module/test_input_solid_errors.f90) +target_link_libraries(test_input_solid_errors PRIVATE sphlite_core) +set_target_properties(test_input_solid_errors PROPERTIES Fortran_MODULE_DIRECTORY "${SPHLITE_MODULE_DIR}") +add_test(NAME input_solid_errors COMMAND test_input_solid_errors) +set_tests_properties(input_solid_errors PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") + add_executable(test_c_api tests/interface/test_c_api.c) target_include_directories(test_c_api PRIVATE include) target_compile_definitions(test_c_api PRIVATE diff --git a/src/database/sph_database.f90 b/src/database/sph_database.f90 index a186e49..348c398 100644 --- a/src/database/sph_database.f90 +++ b/src/database/sph_database.f90 @@ -452,6 +452,7 @@ contains integer, intent(in) :: points integer, intent(out) :: ierr integer :: mat_index + integer :: set_index ierr = SPH_SUCCESS if (section_count >= SPH_MAX_SECTIONS) then @@ -465,6 +466,13 @@ contains ierr = SPH_ERROR_DATABASE return end if + set_index = sph_db_find_elset(name) + if (set_index <= 0) set_index = sph_db_find_nset(name) + if (set_index <= 0) then + call sph_error_set(SPH_ERROR_DATABASE, 'section references unknown set') + ierr = SPH_ERROR_DATABASE + return + end if section_count = section_count + 1 section_name(section_count) = name section_type(section_count) = stype diff --git a/src/input/sph_inp_defs.f90 b/src/input/sph_inp_defs.f90 index 5bae68c..f01ee9a 100644 --- a/src/input/sph_inp_defs.f90 +++ b/src/input/sph_inp_defs.f90 @@ -14,6 +14,9 @@ module sph_inp_defs integer, parameter :: SPH_KEY_SECTION = 6 integer, parameter :: SPH_KEY_SPHLITE = 7 integer, parameter :: SPH_KEY_DENSITY = 8 + integer, parameter :: SPH_KEY_ELASTIC = 9 + integer, parameter :: SPH_KEY_PLASTIC = 10 + integer, parameter :: SPH_KEY_DAMAGE_INITIATION = 11 integer, parameter :: SPH_KEY_UNKNOWN = 99 end module sph_inp_defs diff --git a/src/input/sph_inp_helpers.f90 b/src/input/sph_inp_helpers.f90 index 84e2930..1ea4edb 100644 --- a/src/input/sph_inp_helpers.f90 +++ b/src/input/sph_inp_helpers.f90 @@ -1,7 +1,8 @@ module sph_inp_helpers use sph_inp_defs, only: SPH_INPUT_LINE_LEN, SPH_KEY_NODE, SPH_KEY_ELEMENT, & SPH_KEY_NSET, SPH_KEY_ELSET, SPH_KEY_MATERIAL, SPH_KEY_SECTION, & - SPH_KEY_SPHLITE, SPH_KEY_DENSITY, SPH_KEY_UNKNOWN + SPH_KEY_SPHLITE, SPH_KEY_DENSITY, SPH_KEY_ELASTIC, & + SPH_KEY_PLASTIC, SPH_KEY_DAMAGE_INITIATION, SPH_KEY_UNKNOWN implicit none contains @@ -85,6 +86,12 @@ contains key_id = SPH_KEY_SPHLITE else if (index(upper, '*DENSITY') == 1) then key_id = SPH_KEY_DENSITY + else if (index(upper, '*ELASTIC') == 1) then + key_id = SPH_KEY_ELASTIC + else if (index(upper, '*PLASTIC') == 1) then + key_id = SPH_KEY_PLASTIC + else if (index(upper, '*DAMAGE INITIATION') == 1) then + key_id = SPH_KEY_DAMAGE_INITIATION else if (index(upper, 'SECTION') > 0 .and. upper(1:1) == '*') then key_id = SPH_KEY_SECTION end if diff --git a/src/input/sph_input_reader.f90 b/src/input/sph_input_reader.f90 index 02a8e3a..d05862d 100644 --- a/src/input/sph_input_reader.f90 +++ b/src/input/sph_input_reader.f90 @@ -19,11 +19,16 @@ module sph_input_reader use sph_explosive, only: sph_explosive_note_material, & sph_explosive_set_control, sph_explosive_set_ignition, & sph_explosive_build, sph_explosive_count_unbound_materials + use sph_solid, only: sph_solid_note_material, sph_solid_set_elastic, & + sph_solid_set_johnson_cook, sph_solid_set_failure, & + sph_solid_set_control, sph_solid_validate_input, & + sph_solid_count_unbound_materials use sph_neighbor, only: sph_neighbor_rebuild use sph_inp_defs, only: SPH_INPUT_LINE_LEN, SPH_INPUT_FIELD_LEN, & SPH_INPUT_MAX_FIELDS, SPH_KEY_NODE, SPH_KEY_ELEMENT, SPH_KEY_NSET, & SPH_KEY_ELSET, SPH_KEY_MATERIAL, SPH_KEY_SECTION, SPH_KEY_SPHLITE, & - SPH_KEY_DENSITY, SPH_KEY_UNKNOWN + SPH_KEY_DENSITY, SPH_KEY_ELASTIC, SPH_KEY_PLASTIC, & + SPH_KEY_DAMAGE_INITIATION, SPH_KEY_UNKNOWN use sph_inp_helpers, only: sph_inp_clean_line, sph_inp_split_csv, & sph_inp_keyword_id, sph_inp_upper implicit none @@ -79,6 +84,7 @@ contains integer, intent(out) :: ierr integer :: gas_unbound_count integer :: explosive_unbound_count + integer :: solid_unbound_count ierr = SPH_SUCCESS if (npart <= 0) then @@ -103,6 +109,8 @@ contains end if call sph_db_apply_sections_to_particles(ierr) if (ierr /= SPH_SUCCESS) return + call sph_solid_validate_input(ierr) + if (ierr /= SPH_SUCCESS) return call sph_water_apply_initial_conditions(ierr) if (ierr /= SPH_SUCCESS) return call sph_gas_apply_initial_conditions(ierr) @@ -113,6 +121,8 @@ contains input_warning_count = input_warning_count + gas_unbound_count call sph_explosive_count_unbound_materials(explosive_unbound_count) input_warning_count = input_warning_count + explosive_unbound_count + call sph_solid_count_unbound_materials(solid_unbound_count) + input_warning_count = input_warning_count + solid_unbound_count call sph_neighbor_rebuild(ierr) end subroutine sph_input_build_model @@ -233,6 +243,24 @@ contains close(unit=SPH_INPUT_UNIT) return end if + else if (active_key == SPH_KEY_ELASTIC) then + call sph_input_parse_elastic(line, ierr) + if (ierr /= SPH_SUCCESS) then + close(unit=SPH_INPUT_UNIT) + return + end if + else if (active_key == SPH_KEY_PLASTIC) then + call sph_input_parse_plastic(line, ierr) + if (ierr /= SPH_SUCCESS) then + close(unit=SPH_INPUT_UNIT) + return + end if + else if (active_key == SPH_KEY_DAMAGE_INITIATION) then + call sph_input_parse_damage_initiation(line, ierr) + if (ierr /= SPH_SUCCESS) then + close(unit=SPH_INPUT_UNIT) + return + end if end if end do @@ -246,6 +274,7 @@ contains character(len=SPH_INPUT_FIELD_LEN) :: value character(len=SPH_INPUT_FIELD_LEN) :: material_value character(len=SPH_INPUT_FIELD_LEN) :: section_value + character(len=SPH_INPUT_FIELD_LEN) :: section_type_value character(len=SPH_INPUT_FIELD_LEN) :: type_value real(rk) :: thickness integer :: points @@ -266,6 +295,7 @@ contains call sph_water_note_material(value, type_value) call sph_gas_note_material(value, type_value) call sph_explosive_note_material(value, type_value) + call sph_solid_note_material(value, type_value) else if (key_id == SPH_KEY_SECTION) then input_has_section = .true. call sph_input_get_option(line, 'ELSET', section_value) @@ -279,7 +309,9 @@ contains if (len_trim(value) > 0) read(value, *, iostat=ios) thickness call sph_input_get_option(line, 'POINTS', value) if (len_trim(value) > 0) read(value, *, iostat=ios) points - call sph_db_add_section(section_value, 'SECTION', material_value, & + section_type_value = 'SECTION' + if (index(upper_line, '*SOLID SECTION') == 1) section_type_value = 'SOLID' + call sph_db_add_section(section_value, section_type_value, material_value, & thickness, points, ierr) else if (key_id == SPH_KEY_SPHLITE) then if (index(upper_line, 'TIME CONTROL') > 0) then @@ -302,6 +334,8 @@ contains call sph_input_parse_explosive_control(line, ierr) else if (index(upper_line, 'IGNITION') > 0) then call sph_input_parse_ignition(line, ierr) + else if (index(upper_line, 'SOLID CONTROL') > 0) then + call sph_input_parse_solid_control(line, ierr) else input_warning_count = input_warning_count + 1 end if @@ -497,6 +531,22 @@ contains call sph_gas_set_body_force(force, ierr) end subroutine sph_input_parse_body_force + subroutine sph_input_parse_solid_control(line, ierr) + character(len=*), intent(in) :: line + integer, intent(out) :: ierr + character(len=SPH_INPUT_FIELD_LEN) :: material_name + character(len=SPH_INPUT_FIELD_LEN) :: softening_name + real(rk) :: width + + ierr = SPH_SUCCESS + width = 1.0_rk + call sph_input_get_option(line, 'MATERIAL', material_name) + call sph_input_get_option(line, 'SOFTENING', softening_name) + call sph_input_get_optional_real(line, 'WIDTH', width, ierr) + if (ierr /= SPH_SUCCESS) return + call sph_solid_set_control(material_name, softening_name, width, ierr) + end subroutine sph_input_parse_solid_control + subroutine sph_input_parse_explosive_control(line, ierr) character(len=*), intent(in) :: line integer, intent(out) :: ierr @@ -572,6 +622,94 @@ contains call sph_db_set_material_density(active_material_name, density_value, ierr) end subroutine sph_input_parse_density + subroutine sph_input_parse_elastic(line, ierr) + character(len=*), intent(in) :: line + integer, intent(out) :: ierr + character(len=SPH_INPUT_FIELD_LEN) :: fields(SPH_INPUT_MAX_FIELDS) + integer :: nfields + integer :: ios + real(rk) :: e_value + real(rk) :: nu_value + + ierr = SPH_SUCCESS + call sph_inp_split_csv(line, fields, nfields) + if (nfields < 2) then + call sph_input_set_error('invalid *ELASTIC record') + ierr = SPH_ERROR_INPUT + return + end if + read(fields(1), *, iostat=ios) e_value + if (ios /= 0) then + call sph_input_set_error('invalid elastic modulus') + ierr = SPH_ERROR_INPUT + return + end if + read(fields(2), *, iostat=ios) nu_value + if (ios /= 0) then + call sph_input_set_error('invalid Poisson ratio') + ierr = SPH_ERROR_INPUT + return + end if + call sph_solid_set_elastic(active_material_name, e_value, nu_value, ierr) + end subroutine sph_input_parse_elastic + + subroutine sph_input_parse_plastic(line, ierr) + character(len=*), intent(in) :: line + integer, intent(out) :: ierr + character(len=SPH_INPUT_FIELD_LEN) :: fields(SPH_INPUT_MAX_FIELDS) + integer :: nfields + integer :: i + integer :: ios + real(rk) :: values(8) + + ierr = SPH_SUCCESS + values = 0.0_rk + call sph_inp_split_csv(line, fields, nfields) + if (nfields < 8) then + call sph_input_set_error('invalid Johnson-Cook plastic record') + ierr = SPH_ERROR_INPUT + return + end if + do i = 1, 8 + read(fields(i), *, iostat=ios) values(i) + if (ios /= 0) then + call sph_input_set_error('invalid Johnson-Cook plastic value') + ierr = SPH_ERROR_INPUT + return + end if + end do + call sph_solid_set_johnson_cook(active_material_name, values(1), values(2), & + values(3), values(4), values(5), values(6), values(7), values(8), ierr) + end subroutine sph_input_parse_plastic + + subroutine sph_input_parse_damage_initiation(line, ierr) + character(len=*), intent(in) :: line + integer, intent(out) :: ierr + character(len=SPH_INPUT_FIELD_LEN) :: fields(SPH_INPUT_MAX_FIELDS) + integer :: nfields + integer :: i + integer :: ios + real(rk) :: d_values(5) + + ierr = SPH_SUCCESS + d_values = 0.0_rk + call sph_inp_split_csv(line, fields, nfields) + if (nfields < 5) then + call sph_input_set_error('invalid Johnson-Cook damage record') + ierr = SPH_ERROR_INPUT + return + end if + do i = 1, 5 + read(fields(i), *, iostat=ios) d_values(i) + if (ios /= 0) then + call sph_input_set_error('invalid Johnson-Cook damage value') + ierr = SPH_ERROR_INPUT + return + end if + end do + call sph_solid_set_failure(active_material_name, d_values, ierr) + end subroutine sph_input_parse_damage_initiation + subroutine sph_input_parse_output_control(line, ierr) character(len=*), intent(in) :: line integer, intent(out) :: ierr diff --git a/src/solid/sph_solid.f90 b/src/solid/sph_solid.f90 index da4acc6..bb73357 100644 --- a/src/solid/sph_solid.f90 +++ b/src/solid/sph_solid.f90 @@ -1,15 +1,364 @@ module sph_solid + use sph_precision, only: rk + use sph_error, only: SPH_SUCCESS, SPH_ERROR_ARGUMENT, SPH_ERROR_INPUT, & + sph_error_set + use sph_database, only: SPH_MAX_MATERIALS, SPH_NAME_LEN, material_count, & + material_name, material_type, material_density, npart, particle_phase, & + particle_status, material_id, SPH_PHASE_SOLID, SPH_STATUS_ACTIVE implicit none + logical :: solid_module_initialized = .false. + logical :: solid_material_seen = .false. + integer :: solid_material_count = 0 + integer :: solid_material_ids(SPH_MAX_MATERIALS) = 0 + character(len=SPH_NAME_LEN) :: solid_material_names(SPH_MAX_MATERIALS) = ' ' + logical :: solid_elastic_defined(SPH_MAX_MATERIALS) = .false. + logical :: solid_johnson_cook_defined(SPH_MAX_MATERIALS) = .false. + logical :: solid_failure_defined(SPH_MAX_MATERIALS) = .false. + logical :: solid_control_defined(SPH_MAX_MATERIALS) = .false. + real(rk) :: solid_elastic_e(SPH_MAX_MATERIALS) = 0.0_rk + real(rk) :: solid_elastic_nu(SPH_MAX_MATERIALS) = 0.0_rk + real(rk) :: solid_jc_a(SPH_MAX_MATERIALS) = 0.0_rk + real(rk) :: solid_jc_b(SPH_MAX_MATERIALS) = 0.0_rk + real(rk) :: solid_jc_n(SPH_MAX_MATERIALS) = 0.0_rk + real(rk) :: solid_jc_c(SPH_MAX_MATERIALS) = 0.0_rk + real(rk) :: solid_jc_m(SPH_MAX_MATERIALS) = 0.0_rk + real(rk) :: solid_jc_epsdot0(SPH_MAX_MATERIALS) = 1.0_rk + real(rk) :: solid_jc_troom(SPH_MAX_MATERIALS) = 293.15_rk + real(rk) :: solid_jc_tmelt(SPH_MAX_MATERIALS) = 1793.0_rk + real(rk) :: solid_failure_d(5,SPH_MAX_MATERIALS) = 0.0_rk + character(len=SPH_NAME_LEN) :: solid_softening_type(SPH_MAX_MATERIALS) = ' ' + real(rk) :: solid_softening_width(SPH_MAX_MATERIALS) = 0.0_rk contains subroutine sph_solid_initialize() solid_module_initialized = .true. + call sph_solid_clear_material_table() end subroutine sph_solid_initialize subroutine sph_solid_reset() solid_module_initialized = .false. + call sph_solid_clear_material_table() end subroutine sph_solid_reset + subroutine sph_solid_clear_material_table() + solid_material_seen = .false. + solid_material_count = 0 + solid_material_ids = 0 + solid_material_names = ' ' + solid_elastic_defined = .false. + solid_johnson_cook_defined = .false. + solid_failure_defined = .false. + solid_control_defined = .false. + solid_elastic_e = 0.0_rk + solid_elastic_nu = 0.0_rk + solid_jc_a = 0.0_rk + solid_jc_b = 0.0_rk + solid_jc_n = 0.0_rk + solid_jc_c = 0.0_rk + solid_jc_m = 0.0_rk + solid_jc_epsdot0 = 1.0_rk + solid_jc_troom = 293.15_rk + solid_jc_tmelt = 1793.0_rk + solid_failure_d = 0.0_rk + solid_softening_type = ' ' + solid_softening_width = 0.0_rk + end subroutine sph_solid_clear_material_table + + subroutine sph_solid_note_material(name, material_type_in) + character(len=*), intent(in) :: name + character(len=*), intent(in) :: material_type_in + integer :: solid_index + + if (index(sph_solid_upper(material_type_in), 'SOLID') > 0) then + solid_material_seen = .true. + solid_index = sph_solid_register_material(name) + end if + end subroutine sph_solid_note_material + + subroutine sph_solid_set_elastic(material_name_in, e_value, nu_value, ierr) + character(len=*), intent(in) :: material_name_in + real(rk), intent(in) :: e_value + real(rk), intent(in) :: nu_value + integer, intent(out) :: ierr + integer :: solid_index + + ierr = SPH_SUCCESS + if (e_value <= 0.0_rk) then + call sph_error_set(SPH_ERROR_ARGUMENT, 'Solid elastic modulus must be positive') + ierr = SPH_ERROR_ARGUMENT + return + end if + if (nu_value <= -1.0_rk .or. nu_value >= 0.5_rk) then + call sph_error_set(SPH_ERROR_ARGUMENT, 'Solid Poisson ratio is invalid') + ierr = SPH_ERROR_ARGUMENT + return + end if + call sph_solid_prepare_material(material_name_in, solid_index, ierr) + if (ierr /= SPH_SUCCESS) return + solid_elastic_defined(solid_index) = .true. + solid_elastic_e(solid_index) = e_value + solid_elastic_nu(solid_index) = nu_value + end subroutine sph_solid_set_elastic + + subroutine sph_solid_set_johnson_cook(material_name_in, a_value, b_value, & + n_value, c_value, m_value, epsdot0_value, troom_value, tmelt_value, ierr) + character(len=*), intent(in) :: material_name_in + real(rk), intent(in) :: a_value + real(rk), intent(in) :: b_value + real(rk), intent(in) :: n_value + real(rk), intent(in) :: c_value + real(rk), intent(in) :: m_value + real(rk), intent(in) :: epsdot0_value + real(rk), intent(in) :: troom_value + real(rk), intent(in) :: tmelt_value + integer, intent(out) :: ierr + integer :: solid_index + + ierr = SPH_SUCCESS + if (a_value < 0.0_rk .or. b_value < 0.0_rk .or. n_value < 0.0_rk) then + call sph_error_set(SPH_ERROR_ARGUMENT, 'Solid Johnson-Cook strength is invalid') + ierr = SPH_ERROR_ARGUMENT + return + end if + if (c_value < 0.0_rk .or. m_value < 0.0_rk) then + call sph_error_set(SPH_ERROR_ARGUMENT, 'Solid Johnson-Cook rate or thermal exponent is invalid') + ierr = SPH_ERROR_ARGUMENT + return + end if + if (epsdot0_value <= 0.0_rk) then + call sph_error_set(SPH_ERROR_ARGUMENT, 'Solid Johnson-Cook reference strain rate must be positive') + ierr = SPH_ERROR_ARGUMENT + return + end if + if (tmelt_value <= troom_value) then + call sph_error_set(SPH_ERROR_ARGUMENT, 'Solid Johnson-Cook melt temperature must exceed room temperature') + ierr = SPH_ERROR_ARGUMENT + return + end if + call sph_solid_prepare_material(material_name_in, solid_index, ierr) + if (ierr /= SPH_SUCCESS) return + solid_johnson_cook_defined(solid_index) = .true. + solid_jc_a(solid_index) = a_value + solid_jc_b(solid_index) = b_value + solid_jc_n(solid_index) = n_value + solid_jc_c(solid_index) = c_value + solid_jc_m(solid_index) = m_value + solid_jc_epsdot0(solid_index) = epsdot0_value + solid_jc_troom(solid_index) = troom_value + solid_jc_tmelt(solid_index) = tmelt_value + end subroutine sph_solid_set_johnson_cook + + subroutine sph_solid_set_failure(material_name_in, d_values, ierr) + character(len=*), intent(in) :: material_name_in + real(rk), intent(in) :: d_values(5) + integer, intent(out) :: ierr + integer :: solid_index + + ierr = SPH_SUCCESS + if (.not. sph_solid_vector_is_finite(d_values)) then + call sph_error_set(SPH_ERROR_ARGUMENT, 'Solid Johnson-Cook failure parameter is not finite') + ierr = SPH_ERROR_ARGUMENT + return + end if + call sph_solid_prepare_material(material_name_in, solid_index, ierr) + if (ierr /= SPH_SUCCESS) return + solid_failure_defined(solid_index) = .true. + solid_failure_d(:,solid_index) = d_values(:) + end subroutine sph_solid_set_failure + + subroutine sph_solid_set_control(material_name_in, softening_name, & + softening_width_value, ierr) + character(len=*), intent(in) :: material_name_in + character(len=*), intent(in) :: softening_name + real(rk), intent(in) :: softening_width_value + integer, intent(out) :: ierr + integer :: solid_index + character(len=SPH_NAME_LEN) :: upper_softening + + ierr = SPH_SUCCESS + upper_softening = sph_solid_upper(softening_name) + if (len_trim(upper_softening) == 0) upper_softening = 'LINEAR' + if (index(upper_softening, 'LINEAR') <= 0) then + call sph_error_set(SPH_ERROR_INPUT, 'Solid SOFTENING must be LINEAR') + ierr = SPH_ERROR_INPUT + return + end if + if (softening_width_value <= 0.0_rk) then + call sph_error_set(SPH_ERROR_ARGUMENT, 'Solid softening WIDTH must be positive') + ierr = SPH_ERROR_ARGUMENT + return + end if + call sph_solid_prepare_material(material_name_in, solid_index, ierr) + if (ierr /= SPH_SUCCESS) return + solid_control_defined(solid_index) = .true. + solid_softening_type(solid_index) = upper_softening + solid_softening_width(solid_index) = softening_width_value + end subroutine sph_solid_set_control + + subroutine sph_solid_validate_input(ierr) + integer, intent(out) :: ierr + integer :: solid_index + integer :: mat_index + + ierr = SPH_SUCCESS + if (.not. solid_material_seen) return + do solid_index = 1, solid_material_count + mat_index = solid_material_ids(solid_index) + if (.not. sph_solid_has_active_particle(mat_index)) cycle + if (material_density(mat_index) <= 0.0_rk) then + call sph_error_set(SPH_ERROR_INPUT, 'active Solid material is missing density') + ierr = SPH_ERROR_INPUT + return + end if + if (.not. solid_elastic_defined(solid_index)) then + call sph_error_set(SPH_ERROR_INPUT, 'active Solid material is missing elastic data') + ierr = SPH_ERROR_INPUT + return + end if + if (solid_failure_defined(solid_index) .and. & + .not. solid_johnson_cook_defined(solid_index)) then + call sph_error_set(SPH_ERROR_INPUT, 'Solid failure requires Johnson-Cook flow data') + ierr = SPH_ERROR_INPUT + return + end if + end do + end subroutine sph_solid_validate_input + + subroutine sph_solid_count_unbound_materials(count) + integer, intent(out) :: count + integer :: solid_index + + count = 0 + do solid_index = 1, solid_material_count + if (.not. sph_solid_has_active_particle(solid_material_ids(solid_index))) then + count = count + 1 + end if + end do + end subroutine sph_solid_count_unbound_materials + + integer function sph_solid_register_material(name) + character(len=*), intent(in) :: name + integer :: existing + integer :: mat_index + + existing = sph_solid_find_solid_material(name) + if (existing > 0) then + sph_solid_register_material = existing + return + end if + if (solid_material_count >= SPH_MAX_MATERIALS) then + sph_solid_register_material = 0 + return + end if + mat_index = sph_solid_find_material(name) + if (mat_index <= 0) then + sph_solid_register_material = 0 + return + end if + solid_material_count = solid_material_count + 1 + solid_material_ids(solid_material_count) = mat_index + solid_material_names(solid_material_count) = material_name(mat_index) + sph_solid_register_material = solid_material_count + end function sph_solid_register_material + + subroutine sph_solid_prepare_material(name, solid_index, ierr) + character(len=*), intent(in) :: name + integer, intent(out) :: solid_index + integer, intent(out) :: ierr + integer :: mat_index + + ierr = SPH_SUCCESS + solid_index = sph_solid_find_solid_material(name) + if (solid_index <= 0) then + mat_index = sph_solid_find_material(name) + if (mat_index <= 0) then + call sph_error_set(SPH_ERROR_INPUT, 'Solid material is unknown') + ierr = SPH_ERROR_INPUT + return + end if + if (index(sph_solid_upper(material_type(mat_index)), 'SOLID') <= 0) then + call sph_error_set(SPH_ERROR_INPUT, 'Solid data references non-Solid material') + ierr = SPH_ERROR_INPUT + return + end if + solid_index = sph_solid_register_material(name) + end if + if (solid_index <= 0) then + call sph_error_set(SPH_ERROR_INPUT, 'failed to register Solid material') + ierr = SPH_ERROR_INPUT + end if + end subroutine sph_solid_prepare_material + + integer function sph_solid_find_solid_material(name) + character(len=*), intent(in) :: name + integer :: i + + sph_solid_find_solid_material = 0 + do i = 1, solid_material_count + if (trim(sph_solid_upper(solid_material_names(i))) == & + trim(sph_solid_upper(name))) then + sph_solid_find_solid_material = i + return + end if + end do + end function sph_solid_find_solid_material + + integer function sph_solid_find_material(name) + character(len=*), intent(in) :: name + integer :: i + + sph_solid_find_material = 0 + do i = 1, material_count + if (trim(sph_solid_upper(material_name(i))) == trim(sph_solid_upper(name))) then + sph_solid_find_material = i + return + end if + end do + end function sph_solid_find_material + + logical function sph_solid_has_active_particle(mat_index) + integer, intent(in) :: mat_index + integer :: i + + sph_solid_has_active_particle = .false. + if (mat_index <= 0) return + do i = 1, npart + if (material_id(i) /= mat_index) cycle + if (particle_status(i) /= SPH_STATUS_ACTIVE) cycle + if (particle_phase(i) /= SPH_PHASE_SOLID) cycle + sph_solid_has_active_particle = .true. + return + end do + end function sph_solid_has_active_particle + + logical function sph_solid_vector_is_finite(values) + real(rk), intent(in) :: values(:) + integer :: i + + sph_solid_vector_is_finite = .true. + do i = 1, size(values) + if (values(i) /= values(i)) sph_solid_vector_is_finite = .false. + if (abs(values(i)) > huge(values(i)) * 0.5_rk) then + sph_solid_vector_is_finite = .false. + end if + end do + end function sph_solid_vector_is_finite + + function sph_solid_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_solid_upper + end module sph_solid diff --git a/tests/data/coupling_region_011.inp b/tests/data/coupling_region_011.inp index d845a86..bc18fb0 100644 --- a/tests/data/coupling_region_011.inp +++ b/tests/data/coupling_region_011.inp @@ -4,6 +4,10 @@ *NSET, NSET=COUPLED 1, 2 *MATERIAL, NAME=SOLID_PLACEHOLDER, TYPE=SOLID +*DENSITY +1000.0 +*ELASTIC +1.0E6, 0.30 *SOLID SECTION, NSET=COUPLED, MATERIAL=SOLID_PLACEHOLDER *SPHLITE TIME CONTROL, DT=1.0E-6, TIME=1.0E-6, STEPS=1 *SPHLITE COUPLING REGION, NAME=CONTINUUM_SIDE, SET=COUPLED, TYPE=CONTINUUM diff --git a/tests/data/minimal_particles.inp b/tests/data/minimal_particles.inp index c60bee3..7cb56e9 100644 --- a/tests/data/minimal_particles.inp +++ b/tests/data/minimal_particles.inp @@ -3,6 +3,8 @@ 2, 1.0, 0.0, 0.0 3, 0.0, 1.0, 0.0 4, 0.0, 0.0, 1.0 +*NSET, NSET=ALL +1, 2, 3, 4 *MATERIAL, NAME=WATER_PLACEHOLDER -*SOLID SECTION, ELSET=ALL, MATERIAL=WATER_PLACEHOLDER +*SOLID SECTION, NSET=ALL, MATERIAL=WATER_PLACEHOLDER *SPHLITE TIME CONTROL, DT=1.0E-6, TIME=1.0E-6, STEPS=1 diff --git a/tests/data/minimal_particles_011.inp b/tests/data/minimal_particles_011.inp index efb85cd..7a744c6 100644 --- a/tests/data/minimal_particles_011.inp +++ b/tests/data/minimal_particles_011.inp @@ -10,6 +10,10 @@ *ELSET, ELSET=ALLELEMENTS 1 *MATERIAL, NAME=WATER_PLACEHOLDER, TYPE=SOLID +*DENSITY +1000.0 +*ELASTIC +1.0E6, 0.30 *SOLID SECTION, ELSET=ALLELEMENTS, MATERIAL=WATER_PLACEHOLDER, THICKNESS=0.0, POINTS=3 *SPHLITE TIME CONTROL, DT=1.0E-6, TIME=1.0E-6, STEPS=1, SAFETY=0.8 *SPHLITE OUTPUT, DIRECTORY=., INTERVAL=1 diff --git a/tests/data/missing_time_control_011.inp b/tests/data/missing_time_control_011.inp index a274081..b643399 100644 --- a/tests/data/missing_time_control_011.inp +++ b/tests/data/missing_time_control_011.inp @@ -1,4 +1,10 @@ *NODE 1, 0.0, 0.0, 0.0 +*NSET, NSET=ALL +1 *MATERIAL, NAME=SOLID_PLACEHOLDER, TYPE=SOLID -*SOLID SECTION, ELSET=ALL, MATERIAL=SOLID_PLACEHOLDER +*DENSITY +1000.0 +*ELASTIC +1.0E6, 0.30 +*SOLID SECTION, NSET=ALL, MATERIAL=SOLID_PLACEHOLDER diff --git a/tests/data/mixed_case_011.inp b/tests/data/mixed_case_011.inp index 6887fa6..fc9f74f 100644 --- a/tests/data/mixed_case_011.inp +++ b/tests/data/mixed_case_011.inp @@ -10,6 +10,10 @@ *Elset, Elset=MixedElements 1 *Material, Name=MixedMaterial, Type=Solid +*Density +1000.0 +*Elastic +1.0E6, 0.30 *Solid Section, Elset=MixedElements, Material=MixedMaterial *SphLite Time Control, DT=1.0E-6, TIME=1.0E-6, STEPS=1 *SphLite Output, Directory=., Interval=1 diff --git a/tests/data/output_control_011.inp b/tests/data/output_control_011.inp index 145849d..72254b0 100644 --- a/tests/data/output_control_011.inp +++ b/tests/data/output_control_011.inp @@ -1,7 +1,13 @@ *NODE 1, 0.0, 0.0, 0.0 2, 1.0, 0.0, 0.0 +*NSET, NSET=ALL +1, 2 *MATERIAL, NAME=SOLID_PLACEHOLDER, TYPE=SOLID -*SOLID SECTION, ELSET=ALL, MATERIAL=SOLID_PLACEHOLDER +*DENSITY +1000.0 +*ELASTIC +1.0E6, 0.30 +*SOLID SECTION, NSET=ALL, MATERIAL=SOLID_PLACEHOLDER *SPHLITE TIME CONTROL, DT=1.0E-6, TIME=1.0E-6, STEPS=1 *SPHLITE OUTPUT, DIRECTORY=., INTERVAL=1 diff --git a/tests/data/solid_bad_elastic_050.inp b/tests/data/solid_bad_elastic_050.inp new file mode 100644 index 0000000..033be08 --- /dev/null +++ b/tests/data/solid_bad_elastic_050.inp @@ -0,0 +1,14 @@ +*NODE +1, 0.0, 0.0, 0.0 +*ELEMENT, TYPE=SPH3D +1, 1 +*ELSET, ELSET=SOLID_PARTICLES +1 +*MATERIAL, NAME=STEEL_BAD_ELASTIC, TYPE=SOLID +*DENSITY +7850.0 +*ELASTIC +-210.0E9, 0.30 +*SOLID SECTION, ELSET=SOLID_PARTICLES, MATERIAL=STEEL_BAD_ELASTIC +*SPHLITE PARTICLE CONTROL, H=0.15, MASS=7.85, VOLUME=0.001 +*SPHLITE TIME CONTROL, DT=1.0E-7, TIME=1.0E-7, STEPS=1, SAFETY=0.5 diff --git a/tests/data/solid_bad_failure_050.inp b/tests/data/solid_bad_failure_050.inp new file mode 100644 index 0000000..b528561 --- /dev/null +++ b/tests/data/solid_bad_failure_050.inp @@ -0,0 +1,18 @@ +*NODE +1, 0.0, 0.0, 0.0 +*ELEMENT, TYPE=SPH3D +1, 1 +*ELSET, ELSET=SOLID_PARTICLES +1 +*MATERIAL, NAME=STEEL_BAD_FAILURE, TYPE=SOLID +*DENSITY +7850.0 +*ELASTIC +210.0E9, 0.30 +*PLASTIC, HARDENING=JOHNSON COOK +792.0E6, 510.0E6, 0.26, 0.014, 1.03, 1.0, 293.0, 1793.0 +*DAMAGE INITIATION, CRITERION=JOHNSON COOK +0.05, 3.44, -2.12, 0.002 +*SOLID SECTION, ELSET=SOLID_PARTICLES, MATERIAL=STEEL_BAD_FAILURE +*SPHLITE PARTICLE CONTROL, H=0.15, MASS=7.85, VOLUME=0.001 +*SPHLITE TIME CONTROL, DT=1.0E-7, TIME=1.0E-7, STEPS=1, SAFETY=0.5 diff --git a/tests/data/solid_unbound_material_warning_050.inp b/tests/data/solid_unbound_material_warning_050.inp new file mode 100644 index 0000000..6892d2e --- /dev/null +++ b/tests/data/solid_unbound_material_warning_050.inp @@ -0,0 +1,21 @@ +*NODE +1, 0.0, 0.0, 0.0 +2, 0.1, 0.0, 0.0 +*ELEMENT, TYPE=SPH3D +1, 1 +2, 2 +*ELSET, ELSET=ACTIVE_SOLID +1, 2 +*MATERIAL, NAME=ACTIVE_STEEL, TYPE=SOLID +*DENSITY +7850.0 +*ELASTIC +210.0E9, 0.30 +*MATERIAL, NAME=UNUSED_STEEL, TYPE=SOLID +*DENSITY +7850.0 +*ELASTIC +210.0E9, 0.30 +*SOLID SECTION, ELSET=ACTIVE_SOLID, MATERIAL=ACTIVE_STEEL +*SPHLITE PARTICLE CONTROL, H=0.15, MASS=7.85, VOLUME=0.001 +*SPHLITE TIME CONTROL, DT=1.0E-7, TIME=1.0E-7, STEPS=1, SAFETY=0.5 diff --git a/tests/data/unknown_keyword.inp b/tests/data/unknown_keyword.inp index 7b61b59..378323a 100644 --- a/tests/data/unknown_keyword.inp +++ b/tests/data/unknown_keyword.inp @@ -5,6 +5,8 @@ 4, 0.0, 0.0, 1.0 *UNSUPPORTED KEYWORD 1, 2, 3 +*NSET, NSET=ALL +1, 2, 3, 4 *MATERIAL, NAME=WATER_PLACEHOLDER -*SOLID SECTION, ELSET=ALL, MATERIAL=WATER_PLACEHOLDER +*SOLID SECTION, NSET=ALL, MATERIAL=WATER_PLACEHOLDER *SPHLITE TIME CONTROL, DT=1.0E-6, TIME=1.0E-6, STEPS=1 diff --git a/tests/module/test_input_solid_errors.f90 b/tests/module/test_input_solid_errors.f90 new file mode 100644 index 0000000..340117f --- /dev/null +++ b/tests/module/test_input_solid_errors.f90 @@ -0,0 +1,45 @@ +program test_input_solid_errors + use sph_error, only: SPH_SUCCESS + use sph_api, only: sph_initialize, sph_finalize, sph_read_inp, sph_build_model + implicit none + + integer :: ierr + + call check_bad_input('tests/data/solid_missing_density_050.inp') + call check_bad_input('tests/data/solid_missing_elastic_050.inp') + call check_bad_input('tests/data/solid_bad_elastic_050.inp') + call check_bad_input('tests/data/solid_bad_johnson_cook_050.inp') + call check_bad_input('tests/data/solid_bad_failure_050.inp') + call check_bad_input('tests/data/solid_bad_section_050.inp') + +contains + + subroutine check_bad_input(filename) + character(len=*), intent(in) :: filename + + call sph_initialize(ierr) + call assert_ok(ierr, 'initialize failed for bad Solid input') + call sph_read_inp(filename, ierr) + if (ierr == SPH_SUCCESS) then + call sph_build_model(ierr) + if (ierr == SPH_SUCCESS) call fail('bad Solid input built successfully') + end if + call sph_finalize(ierr) + call assert_ok(ierr, 'finalize failed after bad Solid input') + end subroutine check_bad_input + + subroutine assert_ok(ierr_value, message) + integer, intent(in) :: ierr_value + character(len=*), intent(in) :: message + + if (ierr_value /= SPH_SUCCESS) call fail(message) + end subroutine assert_ok + + subroutine fail(message) + character(len=*), intent(in) :: message + + write(*, '(A)') trim(message) + stop 1 + end subroutine fail + +end program test_input_solid_errors diff --git a/tests/module/test_input_solid_material.f90 b/tests/module/test_input_solid_material.f90 new file mode 100644 index 0000000..37e145f --- /dev/null +++ b/tests/module/test_input_solid_material.f90 @@ -0,0 +1,105 @@ +program test_input_solid_material + use sph_precision, only: rk + use sph_error, only: SPH_SUCCESS + use sph_api, only: sph_initialize, sph_finalize, sph_read_inp, & + sph_build_model, sph_get_input_warning_count + use sph_database, only: material_count, section_count, particle_phase, & + material_id, SPH_PHASE_SOLID + use sph_solid, only: solid_material_count, solid_material_ids, & + solid_elastic_defined, solid_johnson_cook_defined, & + solid_failure_defined, solid_control_defined, solid_elastic_e, & + solid_elastic_nu, solid_jc_a, solid_jc_epsdot0, & + solid_failure_d, solid_softening_width + implicit none + + integer :: ierr + integer :: warnings + + call check_elastic_input() + call check_johnson_cook_input() + call check_multisection_input() + call check_unbound_warning() + +contains + + subroutine check_elastic_input() + call sph_initialize(ierr) + call assert_ok(ierr, 'initialize failed for elastic Solid input') + call sph_read_inp('tests/data/solid_elastic_minimal_050.inp', ierr) + call assert_ok(ierr, 'read failed for elastic Solid input') + call sph_build_model(ierr) + call assert_ok(ierr, 'build failed for elastic Solid input') + if (solid_material_count /= 1) call fail('elastic Solid material count mismatch') + if (section_count /= 1) call fail('elastic Solid section count mismatch') + if (.not. solid_elastic_defined(1)) call fail('elastic Solid data missing') + if (abs(solid_elastic_e(1) - 210.0e9_rk) > 1.0e3_rk) call fail('elastic modulus mismatch') + if (abs(solid_elastic_nu(1) - 0.30_rk) > 1.0e-12_rk) call fail('Poisson ratio mismatch') + if (any(particle_phase(1:4) /= SPH_PHASE_SOLID)) call fail('Solid phase mismatch') + call sph_finalize(ierr) + call assert_ok(ierr, 'finalize failed for elastic Solid input') + end subroutine check_elastic_input + + subroutine check_johnson_cook_input() + call sph_initialize(ierr) + call assert_ok(ierr, 'initialize failed for Johnson-Cook Solid input') + call sph_read_inp('tests/data/solid_johnson_cook_failure_050.inp', ierr) + call assert_ok(ierr, 'read failed for Johnson-Cook Solid input') + call sph_build_model(ierr) + call assert_ok(ierr, 'build failed for Johnson-Cook Solid input') + if (solid_material_count /= 1) call fail('Johnson-Cook Solid material count mismatch') + if (.not. solid_johnson_cook_defined(1)) call fail('Johnson-Cook flow missing') + if (.not. solid_failure_defined(1)) call fail('Johnson-Cook failure missing') + if (.not. solid_control_defined(1)) call fail('Solid control missing') + if (solid_jc_a(1) <= 0.0_rk) call fail('Johnson-Cook A mismatch') + if (solid_jc_epsdot0(1) <= 0.0_rk) call fail('Johnson-Cook epsdot0 mismatch') + if (abs(solid_failure_d(1,1) - 0.05_rk) > 1.0e-12_rk) call fail('failure D1 mismatch') + if (abs(solid_softening_width(1) - 0.25_rk) > 1.0e-12_rk) call fail('softening mismatch') + call sph_finalize(ierr) + call assert_ok(ierr, 'finalize failed for Johnson-Cook Solid input') + end subroutine check_johnson_cook_input + + subroutine check_multisection_input() + call sph_initialize(ierr) + call assert_ok(ierr, 'initialize failed for Solid multisection input') + call sph_read_inp('tests/data/solid_section_050.inp', ierr) + call assert_ok(ierr, 'read failed for Solid multisection input') + call sph_build_model(ierr) + call assert_ok(ierr, 'build failed for Solid multisection input') + if (material_count /= 2) call fail('Solid material metadata count mismatch') + if (section_count /= 2) call fail('Solid section metadata count mismatch') + if (solid_material_count /= 2) call fail('Solid table count mismatch') + if (material_id(1) /= solid_material_ids(1)) call fail('first Solid material mapping mismatch') + if (material_id(4) /= solid_material_ids(2)) call fail('second Solid material mapping mismatch') + call sph_finalize(ierr) + call assert_ok(ierr, 'finalize failed for Solid multisection input') + end subroutine check_multisection_input + + subroutine check_unbound_warning() + call sph_initialize(ierr) + call assert_ok(ierr, 'initialize failed for unbound Solid input') + call sph_read_inp('tests/data/solid_unbound_material_warning_050.inp', ierr) + call assert_ok(ierr, 'read failed for unbound Solid input') + call sph_build_model(ierr) + call assert_ok(ierr, 'build failed for unbound Solid input') + call sph_get_input_warning_count(warnings, ierr) + call assert_ok(ierr, 'warning count failed for unbound Solid input') + if (warnings <= 0) call fail('unbound Solid material warning missing') + call sph_finalize(ierr) + call assert_ok(ierr, 'finalize failed for unbound Solid input') + end subroutine check_unbound_warning + + subroutine assert_ok(ierr_value, message) + integer, intent(in) :: ierr_value + character(len=*), intent(in) :: message + + if (ierr_value /= SPH_SUCCESS) call fail(message) + end subroutine assert_ok + + subroutine fail(message) + character(len=*), intent(in) :: message + + write(*, '(A)') trim(message) + stop 1 + end subroutine fail + +end program test_input_solid_material diff --git a/todo.md b/todo.md index 78fc1e0..2ced558 100644 --- a/todo.md +++ b/todo.md @@ -35,28 +35,28 @@ ## 阶段 B:Solid 输入解析、material 表与 section 识别 -- [ ] 复核现有 material 类型枚举是否包含 `Solid`。 -- [ ] 复核 phase 常量是否包含 `PHASE_SOLID` 和 `PHASE_SOLID_FAILED`。 -- [ ] 复核 C 头文件和 Python 常量中的 Solid phase/status 命名。 -- [ ] 新增或加固 `TYPE=SOLID` material 识别。 -- [ ] 支持 Solid material 的 `*DENSITY` 读取。 -- [ ] 支持 Solid material 的 `*ELASTIC` 读取。 -- [ ] 支持 Johnson-Cook flow 参数读取。 -- [ ] 支持 Johnson-Cook failure 参数读取。 -- [ ] 支持 Solid control 中的 softening 类型读取。 -- [ ] 支持 Solid control 中的 softening 参数读取。 -- [ ] 支持 `*SOLID SECTION` 或既有等价 section 关键词。 -- [ ] 将 Solid section 与 material 映射到内部 section/material id。 -- [ ] 确认 set 仍只表示集合,不参与 Solid 类型判断。 -- [ ] 对缺失密度的 Solid material 报 error。 -- [ ] 对缺失弹性参数的 Solid material 报 error。 -- [ ] 对非法弹性参数报 error。 -- [ ] 对非法 Johnson-Cook flow 参数报 error。 -- [ ] 对非法 Johnson-Cook failure 参数报 error。 -- [ ] 对非法 Solid section 或缺失 material 的 section 报 error。 -- [ ] 对无 active Solid 粒子的 Solid material 报 warning 而不阻止其他路径运行。 -- [ ] 新增 `input_solid_material` 测试并接入 CTest。 -- [ ] 新增 `input_solid_errors` 测试并接入 CTest。 +- [x] 复核现有 material 类型枚举是否包含 `Solid`。 +- [x] 复核 phase 常量是否包含 `PHASE_SOLID` 和 `PHASE_SOLID_FAILED`。 +- [x] 复核 C 头文件和 Python 常量中的 Solid phase/status 命名。 +- [x] 新增或加固 `TYPE=SOLID` material 识别。 +- [x] 支持 Solid material 的 `*DENSITY` 读取。 +- [x] 支持 Solid material 的 `*ELASTIC` 读取。 +- [x] 支持 Johnson-Cook flow 参数读取。 +- [x] 支持 Johnson-Cook failure 参数读取。 +- [x] 支持 Solid control 中的 softening 类型读取。 +- [x] 支持 Solid control 中的 softening 参数读取。 +- [x] 支持 `*SOLID SECTION` 或既有等价 section 关键词。 +- [x] 将 Solid section 与 material 映射到内部 section/material id。 +- [x] 确认 set 仍只表示集合,不参与 Solid 类型判断。 +- [x] 对缺失密度的 Solid material 报 error。 +- [x] 对缺失弹性参数的 Solid material 报 error。 +- [x] 对非法弹性参数报 error。 +- [x] 对非法 Johnson-Cook flow 参数报 error。 +- [x] 对非法 Johnson-Cook failure 参数报 error。 +- [x] 对非法 Solid section 或缺失 material 的 section 报 error。 +- [x] 对无 active Solid 粒子的 Solid material 报 warning 而不阻止其他路径运行。 +- [x] 新增 `input_solid_material` 测试并接入 CTest。 +- [x] 新增 `input_solid_errors` 测试并接入 CTest。 ## 阶段 C:Solid 状态、生命周期与数据库集成