Prepare FemLite 0.3.1 contact and shell updates
This commit is contained in:
@@ -146,6 +146,7 @@ module fem_database
|
||||
real(rk), allocatable :: contact_pair_penalty(:)
|
||||
real(rk), allocatable :: contact_pair_damping(:)
|
||||
real(rk), allocatable :: contact_pair_search(:)
|
||||
real(rk), allocatable :: contact_pair_friction(:)
|
||||
|
||||
contains
|
||||
|
||||
@@ -612,13 +613,15 @@ contains
|
||||
if (allocated(contact_pair_penalty)) deallocate(contact_pair_penalty)
|
||||
if (allocated(contact_pair_damping)) deallocate(contact_pair_damping)
|
||||
if (allocated(contact_pair_search)) deallocate(contact_pair_search)
|
||||
if (allocated(contact_pair_friction)) deallocate(contact_pair_friction)
|
||||
|
||||
ncontact_pair = num_pairs
|
||||
|
||||
if (num_pairs .gt. 0) then
|
||||
allocate(contact_pair_slave(num_pairs), contact_pair_master(num_pairs), &
|
||||
contact_pair_penalty(num_pairs), contact_pair_damping(num_pairs), &
|
||||
contact_pair_search(num_pairs), stat=stat)
|
||||
contact_pair_search(num_pairs), contact_pair_friction(num_pairs), &
|
||||
stat=stat)
|
||||
if (stat .ne. 0) then
|
||||
ncontact_pair = 0
|
||||
call error_set(FEM_ERR_INTERNAL, 'failed to allocate contact pair arrays', ierr)
|
||||
@@ -629,6 +632,7 @@ contains
|
||||
contact_pair_penalty = ZERO
|
||||
contact_pair_damping = ZERO
|
||||
contact_pair_search = ZERO
|
||||
contact_pair_friction = ZERO
|
||||
end if
|
||||
|
||||
ierr = FEM_SUCCESS
|
||||
@@ -823,6 +827,7 @@ contains
|
||||
if (allocated(contact_pair_penalty)) contact_pair_penalty = ZERO
|
||||
if (allocated(contact_pair_damping)) contact_pair_damping = ZERO
|
||||
if (allocated(contact_pair_search)) contact_pair_search = ZERO
|
||||
if (allocated(contact_pair_friction)) contact_pair_friction = ZERO
|
||||
|
||||
ierr = FEM_SUCCESS
|
||||
end subroutine database_initialize
|
||||
@@ -1435,6 +1440,12 @@ contains
|
||||
call error_set(FEM_ERR_INPUT, 'contact pair search distance must be non-negative', ierr)
|
||||
return
|
||||
end if
|
||||
if (allocated(contact_pair_friction)) then
|
||||
if (contact_pair_friction(item) .lt. ZERO) then
|
||||
call error_set(FEM_ERR_INPUT, 'contact pair friction must be non-negative', ierr)
|
||||
return
|
||||
end if
|
||||
end if
|
||||
end do
|
||||
|
||||
ierr = FEM_SUCCESS
|
||||
@@ -1608,6 +1619,7 @@ contains
|
||||
if (allocated(contact_pair_penalty)) deallocate(contact_pair_penalty)
|
||||
if (allocated(contact_pair_damping)) deallocate(contact_pair_damping)
|
||||
if (allocated(contact_pair_search)) deallocate(contact_pair_search)
|
||||
if (allocated(contact_pair_friction)) deallocate(contact_pair_friction)
|
||||
|
||||
nnode = 0
|
||||
nelem = 0
|
||||
|
||||
Reference in New Issue
Block a user