no need to repeat the same code
This commit is contained in:
parent
cbeb3dcff0
commit
aabd98bee9
|
@ -1726,23 +1726,6 @@ subroutine integrateStateFPI()
|
||||||
|
|
||||||
end function damper
|
end function damper
|
||||||
|
|
||||||
!--------------------------------------------------------------------------------------------------
|
|
||||||
!> @brief determines whether a point is converged
|
|
||||||
!--------------------------------------------------------------------------------------------------
|
|
||||||
logical pure function converged(residuum,state,aTol)
|
|
||||||
use prec, only: &
|
|
||||||
dEq0
|
|
||||||
use numerics, only: &
|
|
||||||
rTol => rTol_crystalliteState
|
|
||||||
|
|
||||||
implicit none
|
|
||||||
real(pReal), intent(in), dimension(:) ::&
|
|
||||||
residuum, state, aTol
|
|
||||||
|
|
||||||
converged = all(abs(residuum) <= max(aTol, rTol*abs(state)))
|
|
||||||
|
|
||||||
end function converged
|
|
||||||
|
|
||||||
end subroutine integrateStateFPI
|
end subroutine integrateStateFPI
|
||||||
|
|
||||||
|
|
||||||
|
@ -1870,25 +1853,6 @@ subroutine integrateStateAdaptiveEuler()
|
||||||
|
|
||||||
if (any(plasticState(:)%nonlocal)) call nonlocalConvergenceCheck
|
if (any(plasticState(:)%nonlocal)) call nonlocalConvergenceCheck
|
||||||
|
|
||||||
contains
|
|
||||||
|
|
||||||
!--------------------------------------------------------------------------------------------------
|
|
||||||
!> @brief determines whether a point is converged
|
|
||||||
!--------------------------------------------------------------------------------------------------
|
|
||||||
logical pure function converged(residuum,state,aTol)
|
|
||||||
use prec, only: &
|
|
||||||
dEq0
|
|
||||||
use numerics, only: &
|
|
||||||
rTol => rTol_crystalliteState
|
|
||||||
|
|
||||||
implicit none
|
|
||||||
real(pReal), intent(in), dimension(:) ::&
|
|
||||||
residuum, state, aTol
|
|
||||||
|
|
||||||
converged = all(abs(residuum) <= max(aTol, rTol*abs(state)))
|
|
||||||
|
|
||||||
end function converged
|
|
||||||
|
|
||||||
end subroutine integrateStateAdaptiveEuler
|
end subroutine integrateStateAdaptiveEuler
|
||||||
|
|
||||||
|
|
||||||
|
@ -2141,25 +2105,6 @@ subroutine integrateStateRKCK45()
|
||||||
call setConvergenceFlag
|
call setConvergenceFlag
|
||||||
if (any(plasticState(:)%nonlocal)) call nonlocalConvergenceCheck
|
if (any(plasticState(:)%nonlocal)) call nonlocalConvergenceCheck
|
||||||
|
|
||||||
contains
|
|
||||||
|
|
||||||
!--------------------------------------------------------------------------------------------------
|
|
||||||
!> @brief determines whether a point is converged
|
|
||||||
!--------------------------------------------------------------------------------------------------
|
|
||||||
logical pure function converged(residuum,state,aTol)
|
|
||||||
use prec, only: &
|
|
||||||
dEq0
|
|
||||||
use numerics, only: &
|
|
||||||
rTol => rTol_crystalliteState
|
|
||||||
|
|
||||||
implicit none
|
|
||||||
real(pReal), intent(in), dimension(:) ::&
|
|
||||||
residuum, state, aTol
|
|
||||||
|
|
||||||
converged = all(abs(residuum) <= max(aTol, rTol*abs(state)))
|
|
||||||
|
|
||||||
end function converged
|
|
||||||
|
|
||||||
end subroutine integrateStateRKCK45
|
end subroutine integrateStateRKCK45
|
||||||
|
|
||||||
|
|
||||||
|
@ -2201,6 +2146,24 @@ subroutine setConvergenceFlag()
|
||||||
end subroutine setConvergenceFlag
|
end subroutine setConvergenceFlag
|
||||||
|
|
||||||
|
|
||||||
|
!--------------------------------------------------------------------------------------------------
|
||||||
|
!> @brief determines whether a point is converged
|
||||||
|
!--------------------------------------------------------------------------------------------------
|
||||||
|
logical pure function converged(residuum,state,aTol)
|
||||||
|
use prec, only: &
|
||||||
|
dEq0
|
||||||
|
use numerics, only: &
|
||||||
|
rTol => rTol_crystalliteState
|
||||||
|
|
||||||
|
implicit none
|
||||||
|
real(pReal), intent(in), dimension(:) ::&
|
||||||
|
residuum, state, aTol
|
||||||
|
|
||||||
|
converged = all(abs(residuum) <= max(aTol, rTol*abs(state)))
|
||||||
|
|
||||||
|
end function converged
|
||||||
|
|
||||||
|
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
!> @brief Standard forwarding of state as state = state0 + dotState * (delta t)
|
!> @brief Standard forwarding of state as state = state0 + dotState * (delta t)
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
|
|
Loading…
Reference in New Issue