From da3bdc691b3fb4c12d56b82317f64aa0995905e8 Mon Sep 17 00:00:00 2001 From: shenw Date: Mon, 22 Jun 2026 20:53:30 +0800 Subject: [PATCH] Extract element state allocation module --- CMakeLists.txt | 13 ++++ src/base/fem_api.f90 | 4 +- src/element/fem_element_internal.f90 | 52 +--------------- src/element/fem_element_state.f90 | 93 ++++++++++++++++++++++++++++ src/output/fem_output_csv.f90 | 6 +- tests/module/test_element_state.f90 | 80 ++++++++++++++++++++++++ 6 files changed, 192 insertions(+), 56 deletions(-) create mode 100644 src/element/fem_element_state.f90 create mode 100644 tests/module/test_element_state.f90 diff --git a/CMakeLists.txt b/CMakeLists.txt index 781fdb8..fac5dc6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,6 +41,7 @@ add_library(femlite_core STATIC src/mesh/fem_database.f90 src/input/fem_inp_reader.f90 src/material/fem_material_j2.f90 + src/element/fem_element_state.f90 src/element/fem_quadrature.f90 src/element/fem_shape_functions.f90 src/element/fem_element_mass.f90 @@ -103,6 +104,13 @@ add_executable(test_database_topology target_link_libraries(test_database_topology PRIVATE femlite_core) femlite_apply_fortran_options(test_database_topology) +add_executable(test_element_state + tests/module/test_element_state.f90 +) + +target_link_libraries(test_element_state PRIVATE femlite_core) +femlite_apply_fortran_options(test_element_state) + add_executable(perf_p1 tests/performance/perf_p1.f90 ) @@ -134,3 +142,8 @@ add_test(NAME database_topology COMMAND test_database_topology) set_tests_properties(database_topology PROPERTIES WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" ) + +add_test(NAME element_state COMMAND test_element_state) +set_tests_properties(element_state PROPERTIES + WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" +) diff --git a/src/base/fem_api.f90 b/src/base/fem_api.f90 index a5f4fe6..0c83fab 100644 --- a/src/base/fem_api.f90 +++ b/src/base/fem_api.f90 @@ -6,6 +6,7 @@ module fem_api use fem_database use fem_inp_reader use fem_element_topology + use fem_element_state use fem_element_mass use fem_element_internal use fem_coupling @@ -467,8 +468,7 @@ contains call error_set(FEM_ERR_INTERNAL, 'fem_get_element_average_state called before fem_initialize', ierr) return end if - if (.not. allocated(elem_gp_start) .or. .not. allocated(stress) .or. & - .not. allocated(strain)) then + if (.not. element_state_is_available()) then call error_set(FEM_ERR_INTERNAL, 'element state is not available', ierr) return end if diff --git a/src/element/fem_element_internal.f90 b/src/element/fem_element_internal.f90 index 723043e..92b90c5 100644 --- a/src/element/fem_element_internal.f90 +++ b/src/element/fem_element_internal.f90 @@ -3,6 +3,7 @@ module fem_element_internal use fem_error use fem_database use fem_element_topology + use fem_element_state use fem_quadrature use fem_shape_functions use fem_material_j2 @@ -21,7 +22,7 @@ contains return end if - call ensure_element_state(ierr) + call element_state_ensure(ierr) if (ierr .ne. FEM_SUCCESS) return dt_local = ZERO @@ -50,55 +51,6 @@ contains ierr = FEM_SUCCESS end subroutine element_compute_internal_force - subroutine ensure_element_state(ierr) - integer, intent(out) :: ierr - integer :: elem - integer :: gp - integer :: stat - - if (allocated(elem_gp_start)) then - ierr = FEM_SUCCESS - return - end if - - allocate(elem_gp_start(nelem), elem_ngp(nelem), stat=stat) - if (stat .ne. 0) then - call error_set(FEM_ERR_INTERNAL, 'failed to allocate element state map', ierr) - return - end if - - elem_gp_start = 0 - elem_ngp = 0 - ngauss_total = 0 - - do elem = 1, nelem - elem_ngp(elem) = element_num_integration_points(elem_type(elem)) - - if (elem_ngp(elem) .gt. 0) then - elem_gp_start(elem) = ngauss_total + 1 - ngauss_total = ngauss_total + elem_ngp(elem) - end if - end do - - if (ngauss_total .gt. 0) then - allocate(stress(NSTRESS,ngauss_total), strain(NSTRESS,ngauss_total), & - statev(NSTATEV_MAX,ngauss_total), stat=stat) - if (stat .ne. 0) then - call error_set(FEM_ERR_INTERNAL, 'failed to allocate element state arrays', ierr) - return - end if - stress = ZERO - strain = ZERO - statev = ZERO - end if - - do gp = 1, ngauss_total - statev(1,gp) = ZERO - end do - - ierr = FEM_SUCCESS - end subroutine ensure_element_state - subroutine c3d4_internal_force(elem, dt, ierr) integer, intent(in) :: elem real(rk), intent(in) :: dt diff --git a/src/element/fem_element_state.f90 b/src/element/fem_element_state.f90 new file mode 100644 index 0000000..93abaa5 --- /dev/null +++ b/src/element/fem_element_state.f90 @@ -0,0 +1,93 @@ +module fem_element_state + use fem_precision + use fem_error + use fem_database + use fem_element_topology + implicit none + + private + + public :: element_state_ensure + public :: element_state_reset_values + public :: element_state_is_available + +contains + + logical function element_state_is_available() + element_state_is_available = .false. + if (.not. allocated(elem_gp_start)) return + if (.not. allocated(elem_ngp)) return + if (ngauss_total .le. 0) then + element_state_is_available = .true. + return + end if + if (.not. allocated(stress)) return + if (.not. allocated(strain)) return + if (.not. allocated(statev)) return + element_state_is_available = .true. + end function element_state_is_available + + subroutine element_state_ensure(ierr) + integer, intent(out) :: ierr + integer :: elem + integer :: stat + + if (allocated(elem_gp_start)) then + if (.not. element_state_is_available()) then + call error_set(FEM_ERR_INTERNAL, 'element state map exists but arrays are incomplete', ierr) + return + end if + ierr = FEM_SUCCESS + return + end if + + if (nelem .lt. 0) then + call error_set(FEM_ERR_INTERNAL, 'negative element count in state allocation', ierr) + return + end if + + allocate(elem_gp_start(nelem), elem_ngp(nelem), stat=stat) + if (stat .ne. 0) then + call error_set(FEM_ERR_INTERNAL, 'failed to allocate element state map', ierr) + return + end if + + elem_gp_start = 0 + elem_ngp = 0 + ngauss_total = 0 + + do elem = 1, nelem + elem_ngp(elem) = element_num_integration_points(elem_type(elem)) + if (elem_ngp(elem) .le. 0) then + call error_set(FEM_ERR_MESH, 'unsupported element type in state allocation', ierr) + return + end if + + elem_gp_start(elem) = ngauss_total + 1 + ngauss_total = ngauss_total + elem_ngp(elem) + end do + + if (ngauss_total .gt. 0) then + allocate(stress(NSTRESS,ngauss_total), strain(NSTRESS,ngauss_total), & + statev(NSTATEV_MAX,ngauss_total), stat=stat) + if (stat .ne. 0) then + call error_set(FEM_ERR_INTERNAL, 'failed to allocate element state arrays', ierr) + return + end if + call element_state_reset_values(ierr) + if (ierr .ne. FEM_SUCCESS) return + end if + + ierr = FEM_SUCCESS + end subroutine element_state_ensure + + subroutine element_state_reset_values(ierr) + integer, intent(out) :: ierr + + if (allocated(stress)) stress = ZERO + if (allocated(strain)) strain = ZERO + if (allocated(statev)) statev = ZERO + ierr = FEM_SUCCESS + end subroutine element_state_reset_values + +end module fem_element_state diff --git a/src/output/fem_output_csv.f90 b/src/output/fem_output_csv.f90 index 705aa7b..88fd448 100644 --- a/src/output/fem_output_csv.f90 +++ b/src/output/fem_output_csv.f90 @@ -3,6 +3,7 @@ module fem_output_csv use fem_error use fem_control use fem_database + use fem_element_state implicit none character(len=256) :: csv_output_directory = '.' @@ -261,10 +262,7 @@ contains eqps = ZERO damage = ZERO - if (.not. allocated(elem_gp_start)) return - if (.not. allocated(stress)) return - if (.not. allocated(strain)) return - if (.not. allocated(statev)) return + if (.not. element_state_is_available()) return if (elem .lt. 1 .or. elem .gt. nelem) return first_gp = elem_gp_start(elem) diff --git a/tests/module/test_element_state.f90 b/tests/module/test_element_state.f90 new file mode 100644 index 0000000..12b37e5 --- /dev/null +++ b/tests/module/test_element_state.f90 @@ -0,0 +1,80 @@ +program test_element_state + use fem_precision + use fem_error + use fem_database + use fem_element_state + implicit none + + call check_state_map() + call check_unsupported_element() + +contains + + subroutine check_state_map() + integer :: ierr + + call database_allocate_mesh(1, 5, ierr) + if (ierr .ne. FEM_SUCCESS) call fail(1) + + elem_type(1) = 'C3D4' + elem_type(2) = 'C3D8' + elem_type(3) = 'S4' + elem_type(4) = 'C3D10' + elem_type(5) = 'S8' + + call element_state_ensure(ierr) + if (ierr .ne. FEM_SUCCESS) call fail(2) + if (.not. element_state_is_available()) call fail(3) + if (ngauss_total .ne. 26) call fail(4) + if (elem_gp_start(1) .ne. 1) call fail(5) + if (elem_gp_start(2) .ne. 2) call fail(6) + if (elem_gp_start(3) .ne. 10) call fail(7) + if (elem_gp_start(4) .ne. 14) call fail(8) + if (elem_gp_start(5) .ne. 18) call fail(9) + if (elem_ngp(1) .ne. 1) call fail(10) + if (elem_ngp(2) .ne. 8) call fail(11) + if (elem_ngp(3) .ne. 4) call fail(12) + if (elem_ngp(4) .ne. 4) call fail(13) + if (elem_ngp(5) .ne. 9) call fail(14) + if (size(stress,2) .ne. 26) call fail(15) + if (size(strain,2) .ne. 26) call fail(16) + if (size(statev,2) .ne. 26) call fail(17) + + stress = ONE + strain = ONE + statev = ONE + call element_state_reset_values(ierr) + if (ierr .ne. FEM_SUCCESS) call fail(18) + if (maxval(abs(stress)) .gt. ZERO) call fail(19) + if (maxval(abs(strain)) .gt. ZERO) call fail(20) + if (maxval(abs(statev)) .gt. ZERO) call fail(21) + + call element_state_ensure(ierr) + if (ierr .ne. FEM_SUCCESS) call fail(22) + + call database_finalize(ierr) + if (ierr .ne. FEM_SUCCESS) call fail(23) + end subroutine check_state_map + + subroutine check_unsupported_element() + integer :: ierr + + call database_allocate_mesh(1, 1, ierr) + if (ierr .ne. FEM_SUCCESS) call fail(30) + + elem_type(1) = 'B31' + call element_state_ensure(ierr) + if (ierr .eq. FEM_SUCCESS) call fail(31) + + call database_finalize(ierr) + if (ierr .ne. FEM_SUCCESS) call fail(32) + end subroutine check_unsupported_element + + subroutine fail(code) + integer, intent(in) :: code + + write(*,*) 'test_element_state failed:', code + stop 1 + end subroutine fail + +end program test_element_state