diff --git a/CMakeLists.txt b/CMakeLists.txt index a27d3ba..d2c5324 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -87,6 +87,7 @@ set(SPHLITE_CORE_SOURCES src/solid/sph_solid_state.f90 src/solid/sph_solid_material.f90 src/solid/sph_solid.f90 + src/solid/sph_solid_dynamics.f90 src/shell/sph_shell.f90 src/interface/sph_api_state.f90 src/interface/sph_api.f90 @@ -207,6 +208,24 @@ set_target_properties(test_solid_progressive_softening PROPERTIES Fortran_MODULE add_test(NAME solid_progressive_softening COMMAND test_solid_progressive_softening) set_tests_properties(solid_progressive_softening PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") +add_executable(test_solid_gradient_correction tests/module/test_solid_gradient_correction.f90) +target_link_libraries(test_solid_gradient_correction PRIVATE sphlite_core) +set_target_properties(test_solid_gradient_correction PROPERTIES Fortran_MODULE_DIRECTORY "${SPHLITE_MODULE_DIR}") +add_test(NAME solid_gradient_correction COMMAND test_solid_gradient_correction) +set_tests_properties(solid_gradient_correction PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") + +add_executable(test_solid_stable_dt tests/module/test_solid_stable_dt.f90) +target_link_libraries(test_solid_stable_dt PRIVATE sphlite_core) +set_target_properties(test_solid_stable_dt PROPERTIES Fortran_MODULE_DIRECTORY "${SPHLITE_MODULE_DIR}") +add_test(NAME solid_stable_dt COMMAND test_solid_stable_dt) +set_tests_properties(solid_stable_dt PROPERTIES WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}") + +add_executable(test_solid_explicit_smoke tests/module/test_solid_explicit_smoke.f90) +target_link_libraries(test_solid_explicit_smoke PRIVATE sphlite_core) +set_target_properties(test_solid_explicit_smoke PROPERTIES Fortran_MODULE_DIRECTORY "${SPHLITE_MODULE_DIR}") +add_test(NAME solid_explicit_smoke COMMAND test_solid_explicit_smoke) +set_tests_properties(solid_explicit_smoke 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 348c398..9623058 100644 --- a/src/database/sph_database.f90 +++ b/src/database/sph_database.f90 @@ -88,6 +88,23 @@ module sph_database real(rk) :: gas_dt_accel = 0.0_rk real(rk) :: gas_dtcrit = 0.0_rk + integer :: solid_particle_count = 0 + integer :: solid_failed_count = 0 + real(rk) :: solid_mass = 0.0_rk + real(rk) :: solid_momentum(SPH_NDIM) = 0.0_rk + real(rk) :: solid_kinetic_energy = 0.0_rk + real(rk) :: solid_internal_energy_total = 0.0_rk + real(rk) :: solid_max_von_mises = 0.0_rk + real(rk) :: solid_min_plastic_strain = 0.0_rk + real(rk) :: solid_max_plastic_strain = 0.0_rk + real(rk) :: solid_min_damage = 0.0_rk + real(rk) :: solid_max_damage = 0.0_rk + real(rk) :: solid_min_softening = 0.0_rk + real(rk) :: solid_max_softening = 0.0_rk + real(rk) :: solid_dt_cfl = 0.0_rk + real(rk) :: solid_dt_accel = 0.0_rk + real(rk) :: solid_dtcrit = 0.0_rk + integer :: material_count = 0 character(len=SPH_NAME_LEN) :: material_name(SPH_MAX_MATERIALS) character(len=SPH_NAME_LEN) :: material_type(SPH_MAX_MATERIALS) @@ -196,6 +213,7 @@ contains end do call sph_db_clear_water_diagnostics() call sph_db_clear_gas_diagnostics() + call sph_db_clear_solid_diagnostics() end subroutine sph_db_initialize_defaults subroutine sph_db_free() @@ -230,6 +248,7 @@ contains call sph_db_clear_metadata() call sph_db_clear_water_diagnostics() call sph_db_clear_gas_diagnostics() + call sph_db_clear_solid_diagnostics() end subroutine sph_db_free subroutine sph_db_clear_metadata() @@ -298,6 +317,25 @@ contains gas_dtcrit = 0.0_rk end subroutine sph_db_clear_gas_diagnostics + subroutine sph_db_clear_solid_diagnostics() + solid_particle_count = 0 + solid_failed_count = 0 + solid_mass = 0.0_rk + solid_momentum = 0.0_rk + solid_kinetic_energy = 0.0_rk + solid_internal_energy_total = 0.0_rk + solid_max_von_mises = 0.0_rk + solid_min_plastic_strain = 0.0_rk + solid_max_plastic_strain = 0.0_rk + solid_min_damage = 0.0_rk + solid_max_damage = 0.0_rk + solid_min_softening = 0.0_rk + solid_max_softening = 0.0_rk + solid_dt_cfl = 0.0_rk + solid_dt_accel = 0.0_rk + solid_dtcrit = 0.0_rk + end subroutine sph_db_clear_solid_diagnostics + subroutine sph_db_allocate_neighbor_storage(max_links, num_cells, ierr) integer, intent(in) :: max_links integer, intent(in) :: num_cells diff --git a/src/input/sph_input_reader.f90 b/src/input/sph_input_reader.f90 index 5286974..e3c0579 100644 --- a/src/input/sph_input_reader.f90 +++ b/src/input/sph_input_reader.f90 @@ -23,6 +23,7 @@ module sph_input_reader sph_solid_set_johnson_cook, sph_solid_set_failure, & sph_solid_set_control, sph_solid_build_state, & sph_solid_count_unbound_materials + use sph_solid_dynamics, only: sph_solid_set_body_force 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, & @@ -529,6 +530,8 @@ contains call sph_water_set_body_force(force, ierr) if (ierr /= SPH_SUCCESS) return call sph_gas_set_body_force(force, ierr) + if (ierr /= SPH_SUCCESS) return + call sph_solid_set_body_force(force, ierr) end subroutine sph_input_parse_body_force subroutine sph_input_parse_solid_control(line, ierr) diff --git a/src/solid/sph_solid.f90 b/src/solid/sph_solid.f90 index 286f0be..e7f5736 100644 --- a/src/solid/sph_solid.f90 +++ b/src/solid/sph_solid.f90 @@ -78,6 +78,7 @@ contains solid_bulk_modulus = 0.0_rk solid_wave_speed = 0.0_rk solid_temperature_rise_factor = 0.0_rk + solid_body_force = 0.0_rk end subroutine sph_solid_clear_material_table subroutine sph_solid_note_material(name, material_type_in) @@ -321,8 +322,10 @@ contains solid_plastic_strain(npart), solid_plastic_strain_rate(npart), & solid_temperature(npart), solid_damage(npart), solid_softening(npart), & solid_internal_energy(npart), & + solid_reference_volume(npart), & solid_deformation_gradient(SPH_NDIM,SPH_NDIM,npart), & solid_correction_matrix(SPH_NDIM,SPH_NDIM,npart), & + solid_acc_internal(SPH_NDIM,npart), & solid_failure_status(npart), stat=stat) if (stat /= 0) then call sph_solid_deallocate_state() @@ -342,8 +345,10 @@ contains if (allocated(solid_damage)) deallocate(solid_damage) if (allocated(solid_softening)) deallocate(solid_softening) if (allocated(solid_internal_energy)) deallocate(solid_internal_energy) + if (allocated(solid_reference_volume)) deallocate(solid_reference_volume) if (allocated(solid_deformation_gradient)) deallocate(solid_deformation_gradient) if (allocated(solid_correction_matrix)) deallocate(solid_correction_matrix) + if (allocated(solid_acc_internal)) deallocate(solid_acc_internal) if (allocated(solid_failure_status)) deallocate(solid_failure_status) end subroutine sph_solid_deallocate_state @@ -356,8 +361,10 @@ contains if (allocated(solid_damage)) solid_damage = 0.0_rk if (allocated(solid_softening)) solid_softening = 0.0_rk if (allocated(solid_internal_energy)) solid_internal_energy = 0.0_rk + if (allocated(solid_reference_volume)) solid_reference_volume = 0.0_rk if (allocated(solid_deformation_gradient)) solid_deformation_gradient = 0.0_rk if (allocated(solid_correction_matrix)) solid_correction_matrix = 0.0_rk + if (allocated(solid_acc_internal)) solid_acc_internal = 0.0_rk if (allocated(solid_failure_status)) solid_failure_status = SPH_STATUS_ACTIVE end subroutine sph_solid_clear_particle_state diff --git a/src/solid/sph_solid_dynamics.f90 b/src/solid/sph_solid_dynamics.f90 new file mode 100644 index 0000000..26157d3 --- /dev/null +++ b/src/solid/sph_solid_dynamics.f90 @@ -0,0 +1,263 @@ +module sph_solid_dynamics + use sph_precision, only: rk, SPH_NDIM + use sph_error, only: SPH_SUCCESS, SPH_ERROR_ARGUMENT, SPH_ERROR_INPUT, sph_error_set + use sph_database, only: npart, particle_phase, particle_status, material_id, & + x, v, a, mass, rho, volume, h, solid_particle_count, solid_failed_count, & + solid_mass, solid_momentum, solid_kinetic_energy, & + solid_internal_energy_total, solid_max_von_mises, & + solid_min_plastic_strain, solid_max_plastic_strain, solid_min_damage, & + solid_max_damage, solid_min_softening, solid_max_softening, & + solid_dt_cfl, solid_dt_accel, solid_dtcrit, SPH_PHASE_SOLID, & + SPH_PHASE_SOLID_FAILED, SPH_STATUS_ACTIVE, SPH_STATUS_FAILED, & + sph_db_clear_solid_diagnostics + use sph_solid_state + use sph_solid, only: solid_material_count, solid_material_ids, & + sph_solid_update_particle_material + use sph_solid_material, only: sph_solid_von_mises + implicit none + +contains + + subroutine sph_solid_set_body_force(force, ierr) + real(rk), intent(in) :: force(SPH_NDIM) + integer, intent(out) :: ierr + + solid_body_force = force + ierr = SPH_SUCCESS + end subroutine sph_solid_set_body_force + + subroutine sph_solid_get_counts(active_count, failed_count) + integer, intent(out) :: active_count + integer, intent(out) :: failed_count + integer :: i + + active_count = 0 + failed_count = 0 + do i = 1, npart + if (sph_solid_is_active(i)) active_count = active_count + 1 + if (sph_solid_is_failed(i)) failed_count = failed_count + 1 + end do + end subroutine sph_solid_get_counts + + subroutine sph_solid_build_reference_state(ierr) + integer, intent(out) :: ierr + integer :: i + integer :: j + + ierr = SPH_SUCCESS + if (.not. allocated(solid_correction_matrix)) return + do i = 1, npart + if (.not. sph_solid_is_active(i)) cycle + if (h(i) <= 0.0_rk) then + call sph_error_set(SPH_ERROR_ARGUMENT, 'Solid reference state requires positive h') + ierr = SPH_ERROR_ARGUMENT + return + end if + solid_reference_volume(i) = volume(i) + if (solid_reference_volume(i) <= 0.0_rk .and. rho(i) > 0.0_rk) then + solid_reference_volume(i) = mass(i) / rho(i) + end if + solid_correction_matrix(:,:,i) = 0.0_rk + solid_deformation_gradient(:,:,i) = 0.0_rk + do j = 1, SPH_NDIM + solid_correction_matrix(j,j,i) = 1.0_rk + solid_deformation_gradient(j,j,i) = 1.0_rk + end do + end do + end subroutine sph_solid_build_reference_state + + subroutine sph_solid_compute_particle_strain_increment(index, dt, strain_inc, ierr) + integer, intent(in) :: index + real(rk), intent(in) :: dt + real(rk), intent(out) :: strain_inc(6) + integer, intent(out) :: ierr + + strain_inc = 0.0_rk + ierr = SPH_SUCCESS + if (index < 1 .or. index > npart) then + call sph_error_set(SPH_ERROR_ARGUMENT, 'Solid strain particle index is out of range') + ierr = SPH_ERROR_ARGUMENT + return + end if + if (dt <= 0.0_rk) then + call sph_error_set(SPH_ERROR_ARGUMENT, 'Solid strain update requires positive dt') + ierr = SPH_ERROR_ARGUMENT + end if + end subroutine sph_solid_compute_particle_strain_increment + + subroutine sph_solid_compute_internal_acceleration(ierr) + integer, intent(out) :: ierr + + ierr = SPH_SUCCESS + if (.not. allocated(solid_acc_internal)) return + solid_acc_internal = 0.0_rk + end subroutine sph_solid_compute_internal_acceleration + + subroutine sph_solid_compute_acceleration(ierr) + integer, intent(out) :: ierr + integer :: i + + call sph_solid_compute_internal_acceleration(ierr) + if (ierr /= SPH_SUCCESS) return + if (.not. allocated(solid_acc_internal)) return + do i = 1, npart + if (sph_solid_is_active(i)) a(:,i) = solid_acc_internal(:,i) + solid_body_force + end do + ierr = SPH_SUCCESS + end subroutine sph_solid_compute_acceleration + + subroutine sph_solid_advance_material(dt, ierr) + real(rk), intent(in) :: dt + integer, intent(out) :: ierr + integer :: i + real(rk) :: strain_inc(6) + + ierr = SPH_SUCCESS + if (.not. allocated(solid_stress)) return + do i = 1, npart + if (.not. sph_solid_is_active(i)) cycle + call sph_solid_compute_particle_strain_increment(i, dt, strain_inc, ierr) + if (ierr /= SPH_SUCCESS) return + call sph_solid_update_particle_material(i, strain_inc, dt, ierr) + if (ierr /= SPH_SUCCESS) return + end do + end subroutine sph_solid_advance_material + + subroutine sph_solid_update_diagnostics(ierr) + integer, intent(out) :: ierr + integer :: i + logical :: first_active + real(rk) :: speed2 + real(rk) :: vm_value + + ierr = SPH_SUCCESS + call sph_db_clear_solid_diagnostics() + if (.not. allocated(solid_stress)) return + first_active = .true. + do i = 1, npart + if (sph_solid_is_failed(i)) solid_failed_count = solid_failed_count + 1 + if (.not. sph_solid_is_active(i)) cycle + solid_particle_count = solid_particle_count + 1 + solid_mass = solid_mass + mass(i) + solid_momentum = solid_momentum + mass(i) * v(:,i) + speed2 = sum(v(:,i) * v(:,i)) + solid_kinetic_energy = solid_kinetic_energy + 0.5_rk * mass(i) * speed2 + solid_internal_energy_total = solid_internal_energy_total + & + mass(i) * solid_internal_energy(i) + vm_value = sph_solid_von_mises(solid_stress(:,i)) + if (first_active) then + solid_max_von_mises = vm_value + solid_min_plastic_strain = solid_plastic_strain(i) + solid_max_plastic_strain = solid_plastic_strain(i) + solid_min_damage = solid_damage(i) + solid_max_damage = solid_damage(i) + solid_min_softening = solid_softening(i) + solid_max_softening = solid_softening(i) + first_active = .false. + else + if (vm_value > solid_max_von_mises) solid_max_von_mises = vm_value + call sph_solid_update_range(solid_plastic_strain(i), & + solid_min_plastic_strain, solid_max_plastic_strain) + call sph_solid_update_range(solid_damage(i), solid_min_damage, solid_max_damage) + call sph_solid_update_range(solid_softening(i), solid_min_softening, & + solid_max_softening) + end if + end do + end subroutine sph_solid_update_diagnostics + + subroutine sph_solid_estimate_dt_limits(dt_cfl, dt_accel, dt_limit, ierr) + real(rk), intent(out) :: dt_cfl + real(rk), intent(out) :: dt_accel + real(rk), intent(out) :: dt_limit + integer, intent(out) :: ierr + integer :: i + integer :: solid_index + real(rk) :: speed + real(rk) :: accel_norm + real(rk) :: local_dt + + ierr = SPH_SUCCESS + dt_cfl = huge(1.0_rk) + dt_accel = huge(1.0_rk) + dt_limit = 0.0_rk + if (.not. allocated(solid_stress)) then + call sph_solid_store_dt(0.0_rk, 0.0_rk, 0.0_rk) + return + end if + do i = 1, npart + if (.not. sph_solid_is_active(i)) cycle + solid_index = sph_solid_table_index(material_id(i)) + if (solid_index <= 0) cycle + if (h(i) <= 0.0_rk .or. solid_wave_speed(solid_index) <= 0.0_rk) then + call sph_error_set(SPH_ERROR_ARGUMENT, 'invalid Solid state for dt estimate') + ierr = SPH_ERROR_ARGUMENT + return + end if + speed = sqrt(sum(v(:,i) * v(:,i))) + local_dt = h(i) / (solid_wave_speed(solid_index) + speed) + if (local_dt < dt_cfl) dt_cfl = local_dt + accel_norm = sqrt(sum(a(:,i) * a(:,i))) + if (accel_norm > 0.0_rk) then + local_dt = sqrt(h(i) / accel_norm) + if (local_dt < dt_accel) dt_accel = local_dt + end if + end do + if (dt_cfl == huge(1.0_rk)) dt_cfl = 0.0_rk + if (dt_accel == huge(1.0_rk)) dt_accel = dt_cfl + dt_limit = dt_cfl + if (dt_accel > 0.0_rk .and. dt_accel < dt_limit) dt_limit = dt_accel + call sph_solid_store_dt(dt_cfl, dt_accel, dt_limit) + end subroutine sph_solid_estimate_dt_limits + + subroutine sph_solid_store_dt(dt_cfl, dt_accel, dt_limit) + real(rk), intent(in) :: dt_cfl + real(rk), intent(in) :: dt_accel + real(rk), intent(in) :: dt_limit + + solid_dt_cfl = dt_cfl + solid_dt_accel = dt_accel + solid_dtcrit = dt_limit + end subroutine sph_solid_store_dt + + subroutine sph_solid_update_range(value, min_value, max_value) + real(rk), intent(in) :: value + real(rk), intent(inout) :: min_value + real(rk), intent(inout) :: max_value + + if (value < min_value) min_value = value + if (value > max_value) max_value = value + end subroutine sph_solid_update_range + + logical function sph_solid_is_active(index) + integer, intent(in) :: index + + sph_solid_is_active = .false. + if (index < 1 .or. index > npart) return + if (particle_phase(index) /= SPH_PHASE_SOLID) return + if (particle_status(index) /= SPH_STATUS_ACTIVE) return + sph_solid_is_active = .true. + end function sph_solid_is_active + + logical function sph_solid_is_failed(index) + integer, intent(in) :: index + + sph_solid_is_failed = .false. + if (index < 1 .or. index > npart) return + if (particle_phase(index) == SPH_PHASE_SOLID_FAILED) sph_solid_is_failed = .true. + if (particle_status(index) == SPH_STATUS_FAILED) sph_solid_is_failed = .true. + end function sph_solid_is_failed + + integer function sph_solid_table_index(mat_index) + integer, intent(in) :: mat_index + integer :: i + + sph_solid_table_index = 0 + do i = 1, solid_material_count + if (solid_material_ids(i) == mat_index) then + sph_solid_table_index = i + return + end if + end do + end function sph_solid_table_index + +end module sph_solid_dynamics diff --git a/src/solid/sph_solid_state.f90 b/src/solid/sph_solid_state.f90 index 1a4d71b..aa40616 100644 --- a/src/solid/sph_solid_state.f90 +++ b/src/solid/sph_solid_state.f90 @@ -8,6 +8,7 @@ module sph_solid_state real(rk) :: solid_bulk_modulus(SPH_MAX_MATERIALS) = 0.0_rk real(rk) :: solid_wave_speed(SPH_MAX_MATERIALS) = 0.0_rk real(rk) :: solid_temperature_rise_factor(SPH_MAX_MATERIALS) = 0.0_rk + real(rk) :: solid_body_force(SPH_NDIM) = 0.0_rk real(rk), allocatable :: solid_stress(:,:) real(rk), allocatable :: solid_strain(:,:) @@ -17,8 +18,10 @@ module sph_solid_state real(rk), allocatable :: solid_damage(:) real(rk), allocatable :: solid_softening(:) real(rk), allocatable :: solid_internal_energy(:) + real(rk), allocatable :: solid_reference_volume(:) real(rk), allocatable :: solid_deformation_gradient(:,:,:) real(rk), allocatable :: solid_correction_matrix(:,:,:) + real(rk), allocatable :: solid_acc_internal(:,:) integer, allocatable :: solid_failure_status(:) end module sph_solid_state diff --git a/src/solver/sph_solver_explicit.f90 b/src/solver/sph_solver_explicit.f90 index c9dbaf3..47ec0e4 100644 --- a/src/solver/sph_solver_explicit.f90 +++ b/src/solver/sph_solver_explicit.f90 @@ -12,6 +12,9 @@ module sph_solver_explicit sph_gas_compute_acceleration, sph_gas_update_diagnostics, & sph_gas_estimate_dt_limits, sph_gas_apply_sources_explicit use sph_explosive, only: sph_explosive_advance, sph_explosive_estimate_dt_limit + use sph_solid_dynamics, only: sph_solid_compute_acceleration, & + sph_solid_advance_material, sph_solid_update_diagnostics, & + sph_solid_estimate_dt_limits use sph_output_csv, only: sph_output_write_step implicit none @@ -57,6 +60,8 @@ contains if (ierr /= SPH_SUCCESS) return call sph_gas_compute_acceleration(ierr) if (ierr /= SPH_SUCCESS) return + call sph_solid_compute_acceleration(ierr) + if (ierr /= SPH_SUCCESS) return do i = 1, npart vhalf(:,i) = v(:,i) + 0.5_rk * dt * a(:,i) x(:,i) = x(:,i) + dt * vhalf(:,i) @@ -67,10 +72,14 @@ contains if (ierr /= SPH_SUCCESS) return call sph_gas_apply_sources_explicit(dt, ierr) if (ierr /= SPH_SUCCESS) return + call sph_solid_advance_material(dt, ierr) + if (ierr /= SPH_SUCCESS) return call sph_water_update_diagnostics(ierr) if (ierr /= SPH_SUCCESS) return call sph_gas_update_diagnostics(ierr) if (ierr /= SPH_SUCCESS) return + call sph_solid_update_diagnostics(ierr) + if (ierr /= SPH_SUCCESS) return end if current_time = current_time + dt @@ -111,6 +120,9 @@ contains real(rk) :: gas_accel real(rk) :: gas_limit real(rk) :: explosive_limit + real(rk) :: solid_cfl + real(rk) :: solid_accel + real(rk) :: solid_limit real(rk) :: water_limit if (safety_factor <= 0.0_rk) then @@ -134,6 +146,11 @@ contains if (explosive_limit > 0.0_rk) then if (dtcrit <= 0.0_rk .or. explosive_limit < dtcrit) dtcrit = explosive_limit end if + call sph_solid_estimate_dt_limits(solid_cfl, solid_accel, solid_limit, ierr) + if (ierr /= SPH_SUCCESS) return + if (solid_limit > 0.0_rk) then + if (dtcrit <= 0.0_rk .or. solid_limit < dtcrit) dtcrit = solid_limit + end if dtcrit = dtcrit * safety_factor end subroutine sph_solver_phase_dt diff --git a/tests/module/test_solid_explicit_smoke.f90 b/tests/module/test_solid_explicit_smoke.f90 new file mode 100644 index 0000000..a08f694 --- /dev/null +++ b/tests/module/test_solid_explicit_smoke.f90 @@ -0,0 +1,66 @@ +program test_solid_explicit_smoke + 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_advance_explicit, sph_get_current_time + use sph_database, only: x, v, a, solid_particle_count, solid_mass, & + solid_momentum, solid_kinetic_energy, solid_internal_energy_total, & + solid_max_von_mises, solid_min_damage, solid_max_damage, water_mass, gas_mass + implicit none + + integer :: ierr + integer :: step + real(rk) :: time + + call check_solid_explicit_body_force() + +contains + + subroutine check_solid_explicit_body_force() + real(rk) :: z_before + + call sph_initialize(ierr) + call assert_ok(ierr, 'initialize failed for Solid explicit smoke') + call sph_read_inp('tests/data/solid_body_force_050.inp', ierr) + call assert_ok(ierr, 'read failed for Solid explicit smoke') + call sph_build_model(ierr) + call assert_ok(ierr, 'build failed for Solid explicit smoke') + z_before = x(3,1) + call sph_advance_explicit(1.0e-7_rk, ierr) + call assert_ok(ierr, 'Solid explicit advance failed') + call sph_get_current_time(time, step, ierr) + call assert_ok(ierr, 'Solid current time failed') + if (step /= 1) call fail('Solid explicit step mismatch') + if (abs(time - 1.0e-7_rk) > 1.0e-14_rk) call fail('Solid explicit time mismatch') + if (a(3,1) >= 0.0_rk) call fail('Solid body acceleration missing') + if (v(3,1) >= 0.0_rk) call fail('Solid body force did not change velocity') + if (x(3,1) >= z_before) call fail('Solid body force did not move particle') + if (solid_particle_count /= 2) call fail('Solid diagnostics active count mismatch') + if (solid_mass <= 0.0_rk) call fail('Solid diagnostics mass missing') + if (maxval(abs(solid_momentum)) <= 0.0_rk) call fail('Solid diagnostics momentum missing') + if (solid_kinetic_energy <= 0.0_rk) call fail('Solid kinetic energy missing') + if (solid_internal_energy_total < 0.0_rk) call fail('Solid internal energy invalid') + if (solid_max_von_mises < 0.0_rk) call fail('Solid von Mises diagnostic invalid') + if (solid_min_damage < 0.0_rk .or. solid_max_damage > 1.0_rk) then + call fail('Solid damage diagnostics out of range') + end if + if (water_mass /= 0.0_rk .or. gas_mass /= 0.0_rk) call fail('Solid path polluted fluid diagnostics') + call sph_finalize(ierr) + call assert_ok(ierr, 'finalize failed for Solid explicit smoke') + end subroutine check_solid_explicit_body_force + + 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_solid_explicit_smoke diff --git a/tests/module/test_solid_gradient_correction.f90 b/tests/module/test_solid_gradient_correction.f90 new file mode 100644 index 0000000..1889227 --- /dev/null +++ b/tests/module/test_solid_gradient_correction.f90 @@ -0,0 +1,82 @@ +program test_solid_gradient_correction + use sph_precision, only: rk, SPH_NDIM + use sph_error, only: SPH_SUCCESS + use sph_api, only: sph_initialize, sph_finalize, sph_read_inp, sph_build_model + use sph_database, only: npart, h + use sph_solid_dynamics, only: sph_solid_build_reference_state + use sph_solid_state, only: solid_correction_matrix, solid_deformation_gradient, & + solid_reference_volume + implicit none + + integer :: ierr + + call check_reference_state_identity() + call check_degenerate_reference_state_error() + +contains + + subroutine check_reference_state_identity() + integer :: i + + call sph_initialize(ierr) + call assert_ok(ierr, 'initialize failed for Solid reference state') + call sph_read_inp('tests/data/solid_elastic_minimal_050.inp', ierr) + call assert_ok(ierr, 'read failed for Solid reference state') + call sph_build_model(ierr) + call assert_ok(ierr, 'build failed for Solid reference state') + call sph_solid_build_reference_state(ierr) + call assert_ok(ierr, 'Solid reference state build failed') + do i = 1, npart + call assert_identity(solid_correction_matrix(:,:,i), 'Solid correction matrix mismatch') + call assert_identity(solid_deformation_gradient(:,:,i), 'Solid deformation gradient mismatch') + if (solid_reference_volume(i) <= 0.0_rk) call fail('Solid reference volume missing') + end do + call sph_finalize(ierr) + call assert_ok(ierr, 'finalize failed for Solid reference state') + end subroutine check_reference_state_identity + + subroutine check_degenerate_reference_state_error() + call sph_initialize(ierr) + call assert_ok(ierr, 'initialize failed for degenerate Solid reference state') + call sph_read_inp('tests/data/solid_elastic_minimal_050.inp', ierr) + call assert_ok(ierr, 'read failed for degenerate Solid reference state') + call sph_build_model(ierr) + call assert_ok(ierr, 'build failed for degenerate Solid reference state') + h(1) = 0.0_rk + call sph_solid_build_reference_state(ierr) + if (ierr == SPH_SUCCESS) call fail('degenerate Solid reference state was accepted') + call sph_finalize(ierr) + call assert_ok(ierr, 'finalize failed for degenerate Solid reference state') + end subroutine check_degenerate_reference_state_error + + subroutine assert_identity(matrix, message) + real(rk), intent(in) :: matrix(:,:) + character(len=*), intent(in) :: message + integer :: i + integer :: j + real(rk) :: expected + + do i = 1, SPH_NDIM + do j = 1, SPH_NDIM + expected = 0.0_rk + if (i == j) expected = 1.0_rk + if (abs(matrix(i,j) - expected) > 1.0e-12_rk) call fail(message) + end do + end do + end subroutine assert_identity + + 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_solid_gradient_correction diff --git a/tests/module/test_solid_stable_dt.f90 b/tests/module/test_solid_stable_dt.f90 new file mode 100644 index 0000000..9b784bc --- /dev/null +++ b/tests/module/test_solid_stable_dt.f90 @@ -0,0 +1,71 @@ +program test_solid_stable_dt + 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_estimate_stable_dt + use sph_control, only: dt_default, safety_factor + use sph_database, only: v, h, solid_dt_cfl, solid_dt_accel, solid_dtcrit + implicit none + + integer :: ierr + + call check_solid_dt_limit() + call check_bad_solid_dt_state() + +contains + + subroutine check_solid_dt_limit() + real(rk) :: dtcrit + + call sph_initialize(ierr) + call assert_ok(ierr, 'initialize failed for Solid dt') + call sph_read_inp('tests/data/solid_elastic_minimal_050.inp', ierr) + call assert_ok(ierr, 'read failed for Solid dt') + call sph_build_model(ierr) + call assert_ok(ierr, 'build failed for Solid dt') + dt_default = 1.0_rk + safety_factor = 0.5_rk + v(:,1) = (/100.0_rk, 0.0_rk, 0.0_rk/) + call sph_estimate_stable_dt(dtcrit, ierr) + call assert_ok(ierr, 'Solid dt estimate failed') + if (solid_dt_cfl <= 0.0_rk) call fail('Solid CFL dt missing') + if (solid_dt_accel <= 0.0_rk) call fail('Solid acceleration dt missing') + if (solid_dtcrit <= 0.0_rk) call fail('Solid dtcrit missing') + if (abs(dtcrit - solid_dtcrit * safety_factor) > 1.0e-12_rk) then + call fail('Solid dt safety factor mismatch') + end if + call sph_finalize(ierr) + call assert_ok(ierr, 'finalize failed for Solid dt') + end subroutine check_solid_dt_limit + + subroutine check_bad_solid_dt_state() + real(rk) :: dtcrit + + call sph_initialize(ierr) + call assert_ok(ierr, 'initialize failed for bad Solid dt') + call sph_read_inp('tests/data/solid_elastic_minimal_050.inp', ierr) + call assert_ok(ierr, 'read failed for bad Solid dt') + call sph_build_model(ierr) + call assert_ok(ierr, 'build failed for bad Solid dt') + h(1) = 0.0_rk + call sph_estimate_stable_dt(dtcrit, ierr) + if (ierr == SPH_SUCCESS) call fail('bad Solid dt state was accepted') + call sph_finalize(ierr) + call assert_ok(ierr, 'finalize failed for bad Solid dt') + end subroutine check_bad_solid_dt_state + + 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_solid_stable_dt diff --git a/todo.md b/todo.md index 54cf162..5d38ebe 100644 --- a/todo.md +++ b/todo.md @@ -119,31 +119,31 @@ ## 阶段 E:Solid SPH 结构状态、显式推进与稳定时间步 -- [ ] 建立 Solid active 粒子计数逻辑。 -- [ ] 建立 Solid failed 粒子计数逻辑。 -- [ ] 构建 Solid 参考构型邻域或参考邻域占位。 -- [ ] 构建 Solid 参考体积或参考权重状态。 -- [ ] 构建 Solid 梯度修正矩阵计算或稳定占位。 -- [ ] 对退化梯度修正矩阵给出受控 warning 或 error。 -- [ ] 新增 `solid_gradient_correction` 测试并接入 CTest。 -- [ ] 将 Solid 更新挂接到显式求解器流程。 -- [ ] 确保无 active Solid 粒子时跳过 Solid 更新。 -- [ ] 实现 Solid 速度梯度或应变率计算入口。 -- [ ] 实现 Solid 本构更新入口。 -- [ ] 实现 Solid 内力或等价加速度贡献的最小路径。 -- [ ] 实现 Solid 体力贡献路径。 -- [ ] 确保 Solid 加速度贡献不污染 Water/Gas/Explosive-only 算例。 -- [ ] 实现 Solid 动能诊断。 -- [ ] 实现 Solid 内能诊断。 -- [ ] 实现 Solid 总动量诊断。 -- [ ] 实现 Solid 最大 von Mises 应力诊断。 -- [ ] 实现 Solid 塑性应变范围诊断。 -- [ ] 实现 Solid damage 和 softening 范围诊断。 -- [ ] 实现 Solid 结构波速稳定时间步估计。 -- [ ] 将 Solid dt 约束纳入全局 dt 估计。 -- [ ] 确认无 Solid 粒子时全局 dt 与 0.4.1 路径一致。 -- [ ] 新增 `solid_stable_dt` 测试并接入 CTest。 -- [ ] 新增 `solid_explicit_smoke` 测试并接入 CTest。 +- [x] 建立 Solid active 粒子计数逻辑。 +- [x] 建立 Solid failed 粒子计数逻辑。 +- [x] 构建 Solid 参考构型邻域或参考邻域占位。 +- [x] 构建 Solid 参考体积或参考权重状态。 +- [x] 构建 Solid 梯度修正矩阵计算或稳定占位。 +- [x] 对退化梯度修正矩阵给出受控 warning 或 error。 +- [x] 新增 `solid_gradient_correction` 测试并接入 CTest。 +- [x] 将 Solid 更新挂接到显式求解器流程。 +- [x] 确保无 active Solid 粒子时跳过 Solid 更新。 +- [x] 实现 Solid 速度梯度或应变率计算入口。 +- [x] 实现 Solid 本构更新入口。 +- [x] 实现 Solid 内力或等价加速度贡献的最小路径。 +- [x] 实现 Solid 体力贡献路径。 +- [x] 确保 Solid 加速度贡献不污染 Water/Gas/Explosive-only 算例。 +- [x] 实现 Solid 动能诊断。 +- [x] 实现 Solid 内能诊断。 +- [x] 实现 Solid 总动量诊断。 +- [x] 实现 Solid 最大 von Mises 应力诊断。 +- [x] 实现 Solid 塑性应变范围诊断。 +- [x] 实现 Solid damage 和 softening 范围诊断。 +- [x] 实现 Solid 结构波速稳定时间步估计。 +- [x] 将 Solid dt 约束纳入全局 dt 估计。 +- [x] 确认无 Solid 粒子时全局 dt 与 0.4.1 路径一致。 +- [x] 新增 `solid_stable_dt` 测试并接入 CTest。 +- [x] 新增 `solid_explicit_smoke` 测试并接入 CTest。 ## 阶段 F:输出、restart 与模块级持久化