From 594af0784fa2c50a62764cbed1e9aa7a38baf3f3 Mon Sep 17 00:00:00 2001 From: shenw Date: Mon, 22 Jun 2026 21:36:25 +0800 Subject: [PATCH] Add CSR assembly infrastructure --- CMakeLists.txt | 13 ++ src/solver/fem_assembly_csr.f90 | 319 +++++++++++++++++++++++++++++ tests/module/test_assembly_csr.f90 | 165 +++++++++++++++ 3 files changed, 497 insertions(+) create mode 100644 src/solver/fem_assembly_csr.f90 create mode 100644 tests/module/test_assembly_csr.f90 diff --git a/CMakeLists.txt b/CMakeLists.txt index f53ddc0..9ff4ec5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,6 +48,7 @@ add_library(femlite_core STATIC src/element/fem_element_internal.f90 src/solver/fem_sparse_csr.f90 src/solver/fem_linear_solver_cg.f90 + src/solver/fem_assembly_csr.f90 src/coupling/fem_coupling.f90 src/boundary/fem_boundary.f90 src/output/fem_output_csv.f90 @@ -127,6 +128,13 @@ add_executable(test_linear_solver_cg target_link_libraries(test_linear_solver_cg PRIVATE femlite_core) femlite_apply_fortran_options(test_linear_solver_cg) +add_executable(test_assembly_csr + tests/module/test_assembly_csr.f90 +) + +target_link_libraries(test_assembly_csr PRIVATE femlite_core) +femlite_apply_fortran_options(test_assembly_csr) + add_executable(perf_p1 tests/performance/perf_p1.f90 ) @@ -173,3 +181,8 @@ add_test(NAME linear_solver_cg COMMAND test_linear_solver_cg) set_tests_properties(linear_solver_cg PROPERTIES WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" ) + +add_test(NAME assembly_csr COMMAND test_assembly_csr) +set_tests_properties(assembly_csr PROPERTIES + WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" +) diff --git a/src/solver/fem_assembly_csr.f90 b/src/solver/fem_assembly_csr.f90 new file mode 100644 index 0000000..e844f40 --- /dev/null +++ b/src/solver/fem_assembly_csr.f90 @@ -0,0 +1,319 @@ +module fem_assembly_csr + use fem_precision + use fem_error + use fem_database + use fem_sparse_csr + implicit none + + private + + integer, parameter :: MAX_ELEM_DOF = MAX_NEN * NDOF_NODE + + public :: MAX_ELEM_DOF + public :: assembly_get_element_dofs + public :: assembly_build_csr_pattern + public :: assembly_add_element_matrix + public :: assembly_add_element_vector + +contains + + subroutine assembly_get_element_dofs(elem, elem_dofs, n_elem_dof, ierr) + integer, intent(in) :: elem + integer, intent(out) :: elem_dofs(:) + integer, intent(out) :: n_elem_dof + integer, intent(out) :: ierr + integer :: local_node + integer :: node + integer :: dof_num + integer :: dof + + n_elem_dof = 0 + elem_dofs = 0 + + if (elem .lt. 1 .or. elem .gt. nelem) then + call error_set(FEM_ERR_MESH, 'assembly element index is out of range', ierr) + return + end if + if (.not. allocated(dof_id)) then + call error_set(FEM_ERR_INTERNAL, 'assembly requires assigned dof_id table', ierr) + return + end if + if (.not. allocated(elem_conn) .or. .not. allocated(elem_nnode)) then + call error_set(FEM_ERR_INTERNAL, 'assembly requires allocated element connectivity', ierr) + return + end if + + do local_node = 1, elem_nnode(elem) + node = elem_conn(local_node, elem) + if (node .lt. 1 .or. node .gt. nnode) then + call error_set(FEM_ERR_MESH, 'assembly element references invalid node', ierr) + return + end if + do dof_num = 1, NDOF_NODE + dof = dof_id(dof_num, node) + if (dof .gt. 0) then + if (n_elem_dof .ge. size(elem_dofs)) then + call error_set(FEM_ERR_INTERNAL, 'assembly element dof buffer is too small', ierr) + return + end if + n_elem_dof = n_elem_dof + 1 + elem_dofs(n_elem_dof) = dof + end if + end do + end do + + ierr = FEM_SUCCESS + end subroutine assembly_get_element_dofs + + subroutine assembly_build_csr_pattern(kmat, ierr) + type(csr_matrix), intent(inout) :: kmat + integer, intent(out) :: ierr + integer, allocatable :: raw_count(:) + integer, allocatable :: row_count(:) + integer, allocatable :: row_cols(:,:) + integer, allocatable :: row_ptr(:) + integer, allocatable :: col_ind(:) + integer :: elem + integer :: i + integer :: j + integer :: pos + integer :: row + integer :: col + integer :: stat + integer :: max_raw + integer :: n_elem_dof + integer :: elem_dofs(MAX_ELEM_DOF) + + if (ndof .le. 0) then + call error_set(FEM_ERR_SOLVER, 'CSR assembly requires positive ndof', ierr) + return + end if + if (.not. allocated(dof_id)) then + call error_set(FEM_ERR_INTERNAL, 'CSR assembly requires assigned dof_id table', ierr) + return + end if + + allocate(raw_count(ndof), row_count(ndof), stat=stat) + if (stat .ne. 0) then + call error_set(FEM_ERR_SOLVER, 'failed to allocate CSR assembly row counts', ierr) + return + end if + raw_count = 1 + row_count = 0 + + do elem = 1, nelem + if (allocated(elem_status)) then + if (elem_status(elem) .ne. 0) cycle + end if + + call assembly_get_element_dofs(elem, elem_dofs, n_elem_dof, ierr) + if (ierr .ne. FEM_SUCCESS) go to 900 + + do i = 1, n_elem_dof + row = elem_dofs(i) + raw_count(row) = raw_count(row) + n_elem_dof + end do + end do + + max_raw = maxval(raw_count) + allocate(row_cols(max_raw, ndof), stat=stat) + if (stat .ne. 0) then + call error_set(FEM_ERR_SOLVER, 'failed to allocate CSR assembly row columns', ierr) + go to 900 + end if + row_cols = 0 + + do row = 1, ndof + call append_unique_column(row_cols, row_count, max_raw, row, row, ierr) + if (ierr .ne. FEM_SUCCESS) go to 900 + end do + + do elem = 1, nelem + if (allocated(elem_status)) then + if (elem_status(elem) .ne. 0) cycle + end if + + call assembly_get_element_dofs(elem, elem_dofs, n_elem_dof, ierr) + if (ierr .ne. FEM_SUCCESS) go to 900 + + do i = 1, n_elem_dof + row = elem_dofs(i) + do j = 1, n_elem_dof + col = elem_dofs(j) + call append_unique_column(row_cols, row_count, max_raw, row, col, ierr) + if (ierr .ne. FEM_SUCCESS) go to 900 + end do + end do + end do + + do row = 1, ndof + call sort_row_columns(row_cols, row_count(row), row) + end do + + allocate(row_ptr(ndof+1), stat=stat) + if (stat .ne. 0) then + call error_set(FEM_ERR_SOLVER, 'failed to allocate CSR row_ptr', ierr) + go to 900 + end if + + row_ptr(1) = 1 + do row = 1, ndof + row_ptr(row+1) = row_ptr(row) + row_count(row) + end do + + allocate(col_ind(row_ptr(ndof+1)-1), stat=stat) + if (stat .ne. 0) then + call error_set(FEM_ERR_SOLVER, 'failed to allocate CSR col_ind', ierr) + go to 900 + end if + + pos = 1 + do row = 1, ndof + do i = 1, row_count(row) + col_ind(pos) = row_cols(i,row) + pos = pos + 1 + end do + end do + + call csr_create_pattern(kmat, ndof, ndof, row_ptr, col_ind, ierr) + +900 continue + if (allocated(raw_count)) deallocate(raw_count) + if (allocated(row_count)) deallocate(row_count) + if (allocated(row_cols)) deallocate(row_cols) + if (allocated(row_ptr)) deallocate(row_ptr) + if (allocated(col_ind)) deallocate(col_ind) + end subroutine assembly_build_csr_pattern + + subroutine assembly_add_element_matrix(kmat, elem_dofs, n_elem_dof, ke, ierr) + type(csr_matrix), intent(inout) :: kmat + integer, intent(in) :: elem_dofs(:) + integer, intent(in) :: n_elem_dof + real(rk), intent(in) :: ke(:,:) + integer, intent(out) :: ierr + integer :: i + integer :: j + + if (n_elem_dof .le. 0) then + call error_set(FEM_ERR_SOLVER, 'element matrix assembly received no dofs', ierr) + return + end if + if (size(elem_dofs) .lt. n_elem_dof) then + call error_set(FEM_ERR_SOLVER, 'element matrix dof list is too small', ierr) + return + end if + if (size(ke,1) .lt. n_elem_dof .or. size(ke,2) .lt. n_elem_dof) then + call error_set(FEM_ERR_SOLVER, 'element matrix size is inconsistent with dofs', ierr) + return + end if + + do i = 1, n_elem_dof + call validate_global_dof(elem_dofs(i), ierr) + if (ierr .ne. FEM_SUCCESS) return + do j = 1, n_elem_dof + call validate_global_dof(elem_dofs(j), ierr) + if (ierr .ne. FEM_SUCCESS) return + call csr_add_value(kmat, elem_dofs(i), elem_dofs(j), ke(i,j), ierr) + if (ierr .ne. FEM_SUCCESS) return + end do + end do + + ierr = FEM_SUCCESS + end subroutine assembly_add_element_matrix + + subroutine assembly_add_element_vector(rhs, elem_dofs, n_elem_dof, fe, ierr) + real(rk), intent(inout) :: rhs(:) + integer, intent(in) :: elem_dofs(:) + integer, intent(in) :: n_elem_dof + real(rk), intent(in) :: fe(:) + integer, intent(out) :: ierr + integer :: i + integer :: dof + + if (n_elem_dof .le. 0) then + call error_set(FEM_ERR_SOLVER, 'element vector assembly received no dofs', ierr) + return + end if + if (size(elem_dofs) .lt. n_elem_dof .or. size(fe) .lt. n_elem_dof) then + call error_set(FEM_ERR_SOLVER, 'element vector size is inconsistent with dofs', ierr) + return + end if + if (size(rhs) .ne. ndof) then + call error_set(FEM_ERR_SOLVER, 'global RHS size is inconsistent with ndof', ierr) + return + end if + + do i = 1, n_elem_dof + dof = elem_dofs(i) + call validate_global_dof(dof, ierr) + if (ierr .ne. FEM_SUCCESS) return + rhs(dof) = rhs(dof) + fe(i) + end do + + ierr = FEM_SUCCESS + end subroutine assembly_add_element_vector + + subroutine append_unique_column(row_cols, row_count, max_raw, row, col, ierr) + integer, intent(inout) :: row_cols(:,:) + integer, intent(inout) :: row_count(:) + integer, intent(in) :: max_raw + integer, intent(in) :: row + integer, intent(in) :: col + integer, intent(out) :: ierr + integer :: i + + if (row .lt. 1 .or. row .gt. size(row_count)) then + call error_set(FEM_ERR_SOLVER, 'CSR assembly row is out of range', ierr) + return + end if + + do i = 1, row_count(row) + if (row_cols(i,row) .eq. col) then + ierr = FEM_SUCCESS + return + end if + end do + + if (row_count(row) .ge. max_raw) then + call error_set(FEM_ERR_SOLVER, 'CSR assembly row capacity exceeded', ierr) + return + end if + + row_count(row) = row_count(row) + 1 + row_cols(row_count(row),row) = col + ierr = FEM_SUCCESS + end subroutine append_unique_column + + subroutine sort_row_columns(row_cols, count, row) + integer, intent(inout) :: row_cols(:,:) + integer, intent(in) :: count + integer, intent(in) :: row + integer :: i + integer :: j + integer :: key + + do i = 2, count + key = row_cols(i,row) + j = i - 1 + do while (j .ge. 1) + if (row_cols(j,row) .le. key) exit + row_cols(j+1,row) = row_cols(j,row) + j = j - 1 + end do + row_cols(j+1,row) = key + end do + end subroutine sort_row_columns + + subroutine validate_global_dof(dof, ierr) + integer, intent(in) :: dof + integer, intent(out) :: ierr + + if (dof .lt. 1 .or. dof .gt. ndof) then + call error_set(FEM_ERR_SOLVER, 'global dof is out of range during assembly', ierr) + return + end if + + ierr = FEM_SUCCESS + end subroutine validate_global_dof + +end module fem_assembly_csr diff --git a/tests/module/test_assembly_csr.f90 b/tests/module/test_assembly_csr.f90 new file mode 100644 index 0000000..0c3cb29 --- /dev/null +++ b/tests/module/test_assembly_csr.f90 @@ -0,0 +1,165 @@ +program test_assembly_csr + use fem_precision + use fem_error + use fem_database + use fem_sparse_csr + use fem_assembly_csr + implicit none + + real(rk), parameter :: TOL = 1.0e-10_rk + + call check_solid_assembly() + call check_shell_dof_list() + +contains + + subroutine check_solid_assembly() + type(csr_matrix) :: kmat + integer :: ierr + integer :: elem_dofs(MAX_ELEM_DOF) + integer :: n_elem_dof + real(rk) :: ke(12,12) + real(rk) :: fe(12) + real(rk) :: rhs(15) + real(rk) :: value + + call setup_two_tet_mesh(ierr) + if (ierr .ne. FEM_SUCCESS) call fail(1) + + call csr_init(kmat) + call assembly_build_csr_pattern(kmat, ierr) + if (ierr .ne. FEM_SUCCESS) call fail(2) + if (kmat%nrow .ne. 15 .or. kmat%ncol .ne. 15) call fail(3) + + call csr_get_value(kmat, 1, 12, value, ierr) + if (ierr .ne. FEM_SUCCESS) call fail(4) + call check_close(value, ZERO, 5) + + call csr_set_value(kmat, 1, 13, ONE, ierr) + if (ierr .eq. FEM_SUCCESS) call fail(6) + + call csr_set_value(kmat, 4, 15, ONE, ierr) + if (ierr .ne. FEM_SUCCESS) call fail(7) + call csr_zero(kmat, ierr) + if (ierr .ne. FEM_SUCCESS) call fail(8) + + call assembly_get_element_dofs(1, elem_dofs, n_elem_dof, ierr) + if (ierr .ne. FEM_SUCCESS) call fail(9) + if (n_elem_dof .ne. 12) call fail(10) + if (elem_dofs(1) .ne. 1 .or. elem_dofs(12) .ne. 12) call fail(11) + + ke = ZERO + ke(4,7) = 3.0_rk + call assembly_add_element_matrix(kmat, elem_dofs, n_elem_dof, ke, ierr) + if (ierr .ne. FEM_SUCCESS) call fail(12) + + fe = ZERO + fe(4) = 2.0_rk + rhs = ZERO + call assembly_add_element_vector(rhs, elem_dofs, n_elem_dof, fe, ierr) + if (ierr .ne. FEM_SUCCESS) call fail(13) + + call assembly_get_element_dofs(2, elem_dofs, n_elem_dof, ierr) + if (ierr .ne. FEM_SUCCESS) call fail(14) + if (n_elem_dof .ne. 12) call fail(15) + if (elem_dofs(1) .ne. 4 .or. elem_dofs(12) .ne. 15) call fail(16) + + ke = ZERO + ke(1,4) = 5.0_rk + call assembly_add_element_matrix(kmat, elem_dofs, n_elem_dof, ke, ierr) + if (ierr .ne. FEM_SUCCESS) call fail(17) + + fe = ZERO + fe(1) = 6.0_rk + call assembly_add_element_vector(rhs, elem_dofs, n_elem_dof, fe, ierr) + if (ierr .ne. FEM_SUCCESS) call fail(18) + + call csr_get_value(kmat, 4, 7, value, ierr) + if (ierr .ne. FEM_SUCCESS) call fail(19) + call check_close(value, 8.0_rk, 20) + call check_close(rhs(4), 8.0_rk, 21) + + call csr_free(kmat, ierr) + if (ierr .ne. FEM_SUCCESS) call fail(22) + call database_finalize(ierr) + if (ierr .ne. FEM_SUCCESS) call fail(23) + end subroutine check_solid_assembly + + subroutine check_shell_dof_list() + integer :: ierr + integer :: elem_dofs(MAX_ELEM_DOF) + integer :: n_elem_dof + + call database_allocate_mesh(4, 1, ierr) + if (ierr .ne. FEM_SUCCESS) call fail(30) + + call fill_node_ids(4) + elem_id_ext(1) = 1 + elem_type(1) = 'S4' + elem_nnode(1) = 4 + elem_conn(:,1) = 0 + elem_conn(1:4,1) = (/ 1, 2, 3, 4 /) + + call database_assign_dofs(ierr) + if (ierr .ne. FEM_SUCCESS) call fail(31) + if (ndof .ne. 24) call fail(32) + + call assembly_get_element_dofs(1, elem_dofs, n_elem_dof, ierr) + if (ierr .ne. FEM_SUCCESS) call fail(33) + if (n_elem_dof .ne. 24) call fail(34) + if (elem_dofs(1) .ne. 1 .or. elem_dofs(6) .ne. 6) call fail(35) + if (elem_dofs(19) .ne. 19 .or. elem_dofs(24) .ne. 24) call fail(36) + + call database_finalize(ierr) + if (ierr .ne. FEM_SUCCESS) call fail(37) + end subroutine check_shell_dof_list + + subroutine setup_two_tet_mesh(ierr) + integer, intent(out) :: ierr + + call database_allocate_mesh(5, 2, ierr) + if (ierr .ne. FEM_SUCCESS) return + + call fill_node_ids(5) + elem_id_ext(1) = 1 + elem_type(1) = 'C3D4' + elem_nnode(1) = 4 + elem_conn(:,1) = 0 + elem_conn(1:4,1) = (/ 1, 2, 3, 4 /) + + elem_id_ext(2) = 2 + elem_type(2) = 'C3D4' + elem_nnode(2) = 4 + elem_conn(:,2) = 0 + elem_conn(1:4,2) = (/ 2, 3, 4, 5 /) + + call database_assign_dofs(ierr) + end subroutine setup_two_tet_mesh + + subroutine fill_node_ids(count) + integer, intent(in) :: count + integer :: i + + do i = 1, count + node_id_ext(i) = i + coord0(:,i) = ZERO + coord(:,i) = ZERO + end do + end subroutine fill_node_ids + + subroutine check_close(actual, expected, code) + real(rk), intent(in) :: actual + real(rk), intent(in) :: expected + integer, intent(in) :: code + + if (abs(actual - expected) .gt. TOL) call fail(code) + end subroutine check_close + + subroutine fail(code) + integer, intent(in) :: code + + write(*,*) 'test_assembly_csr failed:', code + stop 1 + end subroutine fail + +end program test_assembly_csr