diff --git a/CMakeLists.txt b/CMakeLists.txt index 6d4f4c4..781fdb8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,10 +37,10 @@ add_library(femlite_core STATIC src/base/fem_error.f90 src/base/fem_log.f90 src/base/fem_control.f90 + src/element/fem_element_topology.f90 src/mesh/fem_database.f90 src/input/fem_inp_reader.f90 src/material/fem_material_j2.f90 - src/element/fem_element_topology.f90 src/element/fem_quadrature.f90 src/element/fem_shape_functions.f90 src/element/fem_element_mass.f90 @@ -96,6 +96,13 @@ add_executable(test_facet_topology target_link_libraries(test_facet_topology PRIVATE femlite_core) femlite_apply_fortran_options(test_facet_topology) +add_executable(test_database_topology + tests/module/test_database_topology.f90 +) + +target_link_libraries(test_database_topology PRIVATE femlite_core) +femlite_apply_fortran_options(test_database_topology) + add_executable(perf_p1 tests/performance/perf_p1.f90 ) @@ -122,3 +129,8 @@ add_test(NAME facet_topology COMMAND test_facet_topology) set_tests_properties(facet_topology PROPERTIES WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" ) + +add_test(NAME database_topology COMMAND test_database_topology) +set_tests_properties(database_topology PROPERTIES + WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" +) diff --git a/src/base/fem_api.f90 b/src/base/fem_api.f90 index 2ec40ed..a5f4fe6 100644 --- a/src/base/fem_api.f90 +++ b/src/base/fem_api.f90 @@ -5,6 +5,7 @@ module fem_api use fem_control use fem_database use fem_inp_reader + use fem_element_topology use fem_element_mass use fem_element_internal use fem_coupling @@ -657,41 +658,28 @@ contains integer, intent(in) :: elem real(rk), intent(out) :: hchar integer, intent(out) :: ierr - character(len=ELEM_TYPE_LEN) :: etype + integer :: edge + integer :: nedge + integer :: num_edge_nodes + integer :: edge_nodes(MAX_FACE_NODES) hchar = huge(ONE) - etype = adjustl(elem_type(elem)) - select case (trim(etype)) - case ('C3D4') - call update_min_edge(elem, 1, 2, hchar) - call update_min_edge(elem, 1, 3, hchar) - call update_min_edge(elem, 1, 4, hchar) - call update_min_edge(elem, 2, 3, hchar) - call update_min_edge(elem, 2, 4, hchar) - call update_min_edge(elem, 3, 4, hchar) - case ('C3D8') - call update_min_edge(elem, 1, 2, hchar) - call update_min_edge(elem, 2, 3, hchar) - call update_min_edge(elem, 3, 4, hchar) - call update_min_edge(elem, 4, 1, hchar) - call update_min_edge(elem, 5, 6, hchar) - call update_min_edge(elem, 6, 7, hchar) - call update_min_edge(elem, 7, 8, hchar) - call update_min_edge(elem, 8, 5, hchar) - call update_min_edge(elem, 1, 5, hchar) - call update_min_edge(elem, 2, 6, hchar) - call update_min_edge(elem, 3, 7, hchar) - call update_min_edge(elem, 4, 8, hchar) - case ('S4') - call update_min_edge(elem, 1, 2, hchar) - call update_min_edge(elem, 2, 3, hchar) - call update_min_edge(elem, 3, 4, hchar) - call update_min_edge(elem, 4, 1, hchar) - case default + nedge = element_num_edges(elem_type(elem)) + if (nedge .le. 0) then call error_set(FEM_ERR_MESH, 'unsupported element type for stable time step', ierr) return - end select + end if + + do edge = 1, nedge + call element_edge_nodes(elem_type(elem), edge, num_edge_nodes, edge_nodes, ierr) + if (ierr .ne. FEM_SUCCESS) return + if (num_edge_nodes .lt. 2) then + call error_set(FEM_ERR_MESH, 'element edge has fewer than two nodes', ierr) + return + end if + call update_min_edge(elem, edge_nodes(1), edge_nodes(2), hchar) + end do if (hchar .le. ZERO .or. hchar .gt. 0.5_rk * huge(ONE)) then call error_set(FEM_ERR_MESH, 'element has non-positive characteristic length', ierr) diff --git a/src/element/fem_element_topology.f90 b/src/element/fem_element_topology.f90 index 9121b35..25328c3 100644 --- a/src/element/fem_element_topology.f90 +++ b/src/element/fem_element_topology.f90 @@ -17,9 +17,11 @@ module fem_element_topology public :: element_is_solid public :: element_is_shell public :: element_num_nodes + public :: element_num_edges public :: element_num_faces public :: element_num_integration_points public :: element_validate_node_count + public :: element_edge_nodes public :: element_face_nodes contains @@ -84,6 +86,25 @@ contains end select end function element_num_nodes + integer function element_num_edges(type_name) + character(len=*), intent(in) :: type_name + character(len=ELEM_TYPE_LEN) :: etype + + etype = adjustl(type_name) + select case (trim(etype)) + case ('C3D4', 'C3D10') + element_num_edges = 6 + case ('C3D8', 'C3D20') + element_num_edges = 12 + case ('S3', 'S6') + element_num_edges = 3 + case ('S4', 'S8') + element_num_edges = 4 + case default + element_num_edges = 0 + end select + end function element_num_edges + integer function element_num_faces(type_name) character(len=*), intent(in) :: type_name character(len=ELEM_TYPE_LEN) :: etype @@ -147,6 +168,40 @@ contains ierr = FEM_SUCCESS end subroutine element_validate_node_count + subroutine element_edge_nodes(type_name, edge_id, num_edge_nodes, local_nodes, ierr) + character(len=*), intent(in) :: type_name + integer, intent(in) :: edge_id + integer, intent(out) :: num_edge_nodes + integer, intent(out) :: local_nodes(MAX_FACE_NODES) + integer, intent(out) :: ierr + character(len=ELEM_TYPE_LEN) :: etype + + etype = adjustl(type_name) + local_nodes = 0 + num_edge_nodes = 0 + + select case (trim(etype)) + case ('C3D4') + call linear_tet_edge(edge_id, num_edge_nodes, local_nodes, ierr) + case ('C3D8') + call linear_hex_edge(edge_id, num_edge_nodes, local_nodes, ierr) + case ('C3D10') + call quad_tet_edge(edge_id, num_edge_nodes, local_nodes, ierr) + case ('C3D20') + call quad_hex_edge(edge_id, num_edge_nodes, local_nodes, ierr) + case ('S3') + call linear_tri_edge(edge_id, num_edge_nodes, local_nodes, ierr) + case ('S4') + call linear_quad_edge(edge_id, num_edge_nodes, local_nodes, ierr) + case ('S6') + call quad_tri_edge(edge_id, num_edge_nodes, local_nodes, ierr) + case ('S8') + call quad_quad_edge(edge_id, num_edge_nodes, local_nodes, ierr) + case default + call error_set(FEM_ERR_MESH, 'unsupported element type for edge topology', ierr) + end select + end subroutine element_edge_nodes + subroutine element_face_nodes(type_name, face_id, num_face_nodes, local_nodes, ierr) character(len=*), intent(in) :: type_name integer, intent(in) :: face_id @@ -205,6 +260,158 @@ contains end select end subroutine element_face_nodes + subroutine set_edge2(edge_id, max_edge, a, b, num_edge_nodes, local_nodes, ierr) + integer, intent(in) :: edge_id + integer, intent(in) :: max_edge + integer, intent(in) :: a(max_edge) + integer, intent(in) :: b(max_edge) + integer, intent(out) :: num_edge_nodes + integer, intent(out) :: local_nodes(MAX_FACE_NODES) + integer, intent(out) :: ierr + + if (edge_id .lt. 1 .or. edge_id .gt. max_edge) then + call error_set(FEM_ERR_MESH, 'invalid linear edge id', ierr) + return + end if + num_edge_nodes = 2 + local_nodes(1) = a(edge_id) + local_nodes(2) = b(edge_id) + ierr = FEM_SUCCESS + end subroutine set_edge2 + + subroutine set_edge3(edge_id, max_edge, a, b, c, num_edge_nodes, local_nodes, ierr) + integer, intent(in) :: edge_id + integer, intent(in) :: max_edge + integer, intent(in) :: a(max_edge) + integer, intent(in) :: b(max_edge) + integer, intent(in) :: c(max_edge) + integer, intent(out) :: num_edge_nodes + integer, intent(out) :: local_nodes(MAX_FACE_NODES) + integer, intent(out) :: ierr + + if (edge_id .lt. 1 .or. edge_id .gt. max_edge) then + call error_set(FEM_ERR_MESH, 'invalid quadratic edge id', ierr) + return + end if + num_edge_nodes = 3 + local_nodes(1) = a(edge_id) + local_nodes(2) = b(edge_id) + local_nodes(3) = c(edge_id) + ierr = FEM_SUCCESS + end subroutine set_edge3 + + subroutine linear_tet_edge(edge_id, num_edge_nodes, local_nodes, ierr) + integer, intent(in) :: edge_id + integer, intent(out) :: num_edge_nodes + integer, intent(out) :: local_nodes(MAX_FACE_NODES) + integer, intent(out) :: ierr + integer :: a(6) + integer :: b(6) + + a = (/ 1, 2, 3, 1, 2, 3 /) + b = (/ 2, 3, 1, 4, 4, 4 /) + call set_edge2(edge_id, 6, a, b, num_edge_nodes, local_nodes, ierr) + end subroutine linear_tet_edge + + subroutine quad_tet_edge(edge_id, num_edge_nodes, local_nodes, ierr) + integer, intent(in) :: edge_id + integer, intent(out) :: num_edge_nodes + integer, intent(out) :: local_nodes(MAX_FACE_NODES) + integer, intent(out) :: ierr + integer :: a(6) + integer :: b(6) + integer :: c(6) + + a = (/ 1, 2, 3, 1, 2, 3 /) + b = (/ 2, 3, 1, 4, 4, 4 /) + c = (/ 5, 6, 7, 8, 9, 10 /) + call set_edge3(edge_id, 6, a, b, c, num_edge_nodes, local_nodes, ierr) + end subroutine quad_tet_edge + + subroutine linear_hex_edge(edge_id, num_edge_nodes, local_nodes, ierr) + integer, intent(in) :: edge_id + integer, intent(out) :: num_edge_nodes + integer, intent(out) :: local_nodes(MAX_FACE_NODES) + integer, intent(out) :: ierr + integer :: a(12) + integer :: b(12) + + a = (/ 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 3, 4 /) + b = (/ 2, 3, 4, 1, 6, 7, 8, 5, 5, 6, 7, 8 /) + call set_edge2(edge_id, 12, a, b, num_edge_nodes, local_nodes, ierr) + end subroutine linear_hex_edge + + subroutine quad_hex_edge(edge_id, num_edge_nodes, local_nodes, ierr) + integer, intent(in) :: edge_id + integer, intent(out) :: num_edge_nodes + integer, intent(out) :: local_nodes(MAX_FACE_NODES) + integer, intent(out) :: ierr + integer :: a(12) + integer :: b(12) + integer :: c(12) + + a = (/ 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 3, 4 /) + b = (/ 2, 3, 4, 1, 6, 7, 8, 5, 5, 6, 7, 8 /) + c = (/ 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20 /) + call set_edge3(edge_id, 12, a, b, c, num_edge_nodes, local_nodes, ierr) + end subroutine quad_hex_edge + + subroutine linear_tri_edge(edge_id, num_edge_nodes, local_nodes, ierr) + integer, intent(in) :: edge_id + integer, intent(out) :: num_edge_nodes + integer, intent(out) :: local_nodes(MAX_FACE_NODES) + integer, intent(out) :: ierr + integer :: a(3) + integer :: b(3) + + a = (/ 1, 2, 3 /) + b = (/ 2, 3, 1 /) + call set_edge2(edge_id, 3, a, b, num_edge_nodes, local_nodes, ierr) + end subroutine linear_tri_edge + + subroutine quad_tri_edge(edge_id, num_edge_nodes, local_nodes, ierr) + integer, intent(in) :: edge_id + integer, intent(out) :: num_edge_nodes + integer, intent(out) :: local_nodes(MAX_FACE_NODES) + integer, intent(out) :: ierr + integer :: a(3) + integer :: b(3) + integer :: c(3) + + a = (/ 1, 2, 3 /) + b = (/ 2, 3, 1 /) + c = (/ 4, 5, 6 /) + call set_edge3(edge_id, 3, a, b, c, num_edge_nodes, local_nodes, ierr) + end subroutine quad_tri_edge + + subroutine linear_quad_edge(edge_id, num_edge_nodes, local_nodes, ierr) + integer, intent(in) :: edge_id + integer, intent(out) :: num_edge_nodes + integer, intent(out) :: local_nodes(MAX_FACE_NODES) + integer, intent(out) :: ierr + integer :: a(4) + integer :: b(4) + + a = (/ 1, 2, 3, 4 /) + b = (/ 2, 3, 4, 1 /) + call set_edge2(edge_id, 4, a, b, num_edge_nodes, local_nodes, ierr) + end subroutine linear_quad_edge + + subroutine quad_quad_edge(edge_id, num_edge_nodes, local_nodes, ierr) + integer, intent(in) :: edge_id + integer, intent(out) :: num_edge_nodes + integer, intent(out) :: local_nodes(MAX_FACE_NODES) + integer, intent(out) :: ierr + integer :: a(4) + integer :: b(4) + integer :: c(4) + + a = (/ 1, 2, 3, 4 /) + b = (/ 2, 3, 4, 1 /) + c = (/ 5, 6, 7, 8 /) + call set_edge3(edge_id, 4, a, b, c, num_edge_nodes, local_nodes, ierr) + end subroutine quad_quad_edge + subroutine c3d4_face(face_id, num_face_nodes, local_nodes, ierr) integer, intent(in) :: face_id integer, intent(out) :: num_face_nodes diff --git a/src/mesh/fem_database.f90 b/src/mesh/fem_database.f90 index f8c0919..d38db24 100644 --- a/src/mesh/fem_database.f90 +++ b/src/mesh/fem_database.f90 @@ -1,6 +1,7 @@ module fem_database use fem_precision use fem_error + use fem_element_topology implicit none integer :: nnode = 0 @@ -621,7 +622,7 @@ contains node = elem_conn(local_node, elem) if (node .ge. 1 .and. node .le. nnode) then has_translation(node) = .true. - if (is_shell_element(elem_type(elem))) has_rotation(node) = .true. + if (element_is_shell(elem_type(elem))) has_rotation(node) = .true. end if end do end do @@ -975,6 +976,12 @@ contains integer :: elem do elem = 1, nelem + if (.not. element_is_supported(elem_type(elem))) then + call error_set(FEM_ERR_MESH, 'unsupported element type', ierr) + return + end if + call element_validate_node_count(elem_type(elem), elem_nnode(elem), ierr) + if (ierr .ne. FEM_SUCCESS) return if (elem_mat(elem) .le. 0) then call error_set(FEM_ERR_INPUT, 'element has no material assignment', ierr) return @@ -1085,17 +1092,6 @@ contains end if end function elem_or_elset_exists - logical function is_shell_element(type_name) - character(len=*), intent(in) :: type_name - character(len=ELEM_TYPE_LEN) :: local_type - - local_type = adjustl(type_name) - is_shell_element = .false. - if (len_trim(local_type) .ge. 1) then - is_shell_element = local_type(1:1) .eq. 'S' - end if - end function is_shell_element - subroutine database_finalize(ierr) integer, intent(out) :: ierr diff --git a/tests/module/test_database_topology.f90 b/tests/module/test_database_topology.f90 new file mode 100644 index 0000000..1628672 --- /dev/null +++ b/tests/module/test_database_topology.f90 @@ -0,0 +1,108 @@ +program test_database_topology + use fem_precision + use fem_error + use fem_database + implicit none + + call check_validate_node_count() + call check_shell_dofs() + +contains + + subroutine check_validate_node_count() + integer :: ierr + + call setup_c3d4_model(ierr) + if (ierr .ne. FEM_SUCCESS) call fail(1) + + call database_validate_model(ierr) + if (ierr .ne. FEM_SUCCESS) call fail(2) + + elem_nnode(1) = 3 + call database_validate_model(ierr) + if (ierr .eq. FEM_SUCCESS) call fail(3) + + call database_finalize(ierr) + if (ierr .ne. FEM_SUCCESS) call fail(4) + end subroutine check_validate_node_count + + subroutine check_shell_dofs() + integer :: ierr + integer :: i + + call database_allocate_mesh(6, 1, ierr) + if (ierr .ne. FEM_SUCCESS) call fail(10) + + do i = 1, 6 + node_id_ext(i) = i + coord0(:,i) = ZERO + end do + elem_id_ext(1) = 1 + elem_type(1) = 'S6' + elem_nnode(1) = 6 + elem_conn(:,1) = 0 + do i = 1, 6 + elem_conn(i,1) = i + end do + + call database_assign_dofs(ierr) + if (ierr .ne. FEM_SUCCESS) call fail(11) + if (ndof .ne. 36) call fail(12) + do i = 1, 6 + if (minval(dof_id(:,i)) .le. 0) call fail(13) + end do + + call database_finalize(ierr) + if (ierr .ne. FEM_SUCCESS) call fail(14) + end subroutine check_shell_dofs + + subroutine setup_c3d4_model(ierr) + integer, intent(out) :: ierr + integer :: i + + call database_allocate_model(4, 1, 0, 1, 0, 1, 1, 0, 1, & + 0, 0, 0, 0, 0, ierr) + if (ierr .ne. FEM_SUCCESS) return + + do i = 1, 4 + node_id_ext(i) = i + coord0(:,i) = ZERO + end do + coord0(:,2) = (/ ONE, ZERO, ZERO /) + coord0(:,3) = (/ ZERO, ONE, ZERO /) + coord0(:,4) = (/ ZERO, ZERO, ONE /) + + elem_id_ext(1) = 1 + elem_type(1) = 'C3D4' + elem_nnode(1) = 4 + elem_conn(:,1) = 0 + do i = 1, 4 + elem_conn(i,1) = i + end do + elem_mat(1) = 1 + elem_sec(1) = 1 + + elset_name(1) = 'EALL' + elset_start(1) = 1 + elset_count(1) = 1 + elset_items(1) = 1 + + mat_name(1) = 'MAT' + mat_density(1) = 7850.0_rk + mat_e(1) = 2.10e11_rk + mat_nu(1) = 0.30_rk + + section_type(1) = 'SOLID' + section_elset_name(1) = 'EALL' + section_material_name(1) = 'MAT' + ierr = FEM_SUCCESS + end subroutine setup_c3d4_model + + subroutine fail(code) + integer, intent(in) :: code + + write(*,*) 'test_database_topology failed:', code + stop 1 + end subroutine fail + +end program test_database_topology diff --git a/tests/module/test_element_infrastructure.f90 b/tests/module/test_element_infrastructure.f90 index b27a640..55f9c67 100644 --- a/tests/module/test_element_infrastructure.f90 +++ b/tests/module/test_element_infrastructure.f90 @@ -17,8 +17,11 @@ contains subroutine test_topology() integer :: ierr integer :: nface + integer :: nedge integer :: nfn + integer :: nen integer :: face_nodes(MAX_FACE_NODES) + integer :: edge_nodes(MAX_FACE_NODES) if (element_num_nodes('C3D4') .ne. 4) stop 1 if (element_num_nodes('C3D8') .ne. 8) stop 2 @@ -40,6 +43,15 @@ contains if (element_num_faces('C3D20') .ne. 6) stop 16 if (element_num_faces('S4') .ne. 1) stop 17 + if (element_num_edges('C3D4') .ne. 6) stop 71 + if (element_num_edges('C3D8') .ne. 12) stop 72 + if (element_num_edges('C3D10') .ne. 6) stop 73 + if (element_num_edges('C3D20') .ne. 12) stop 74 + if (element_num_edges('S3') .ne. 3) stop 75 + if (element_num_edges('S4') .ne. 4) stop 76 + if (element_num_edges('S6') .ne. 3) stop 77 + if (element_num_edges('S8') .ne. 4) stop 78 + if (element_num_integration_points('C3D4') .ne. 1) stop 18 if (element_num_integration_points('C3D8') .ne. 8) stop 19 if (element_num_integration_points('C3D10') .ne. 4) stop 20 @@ -67,6 +79,22 @@ contains nface = element_num_faces('S8') if (nface .ne. 1) stop 35 + + nedge = element_num_edges('C3D20') + if (nedge .ne. 12) stop 79 + call element_edge_nodes('C3D20', 12, nen, edge_nodes, ierr) + if (ierr .ne. FEM_SUCCESS) stop 80 + if (nen .ne. 3) stop 81 + if (edge_nodes(1) .ne. 4) stop 82 + if (edge_nodes(2) .ne. 8) stop 83 + if (edge_nodes(3) .ne. 20) stop 84 + + call element_edge_nodes('S8', 4, nen, edge_nodes, ierr) + if (ierr .ne. FEM_SUCCESS) stop 85 + if (nen .ne. 3) stop 86 + if (edge_nodes(1) .ne. 4) stop 87 + if (edge_nodes(2) .ne. 1) stop 88 + if (edge_nodes(3) .ne. 8) stop 89 end subroutine test_topology subroutine test_quadrature()