This commit is contained in:
Martin Diehl 2020-09-29 13:36:15 +02:00
parent 587d5ee445
commit d0df748fc1
1 changed files with 238 additions and 236 deletions

View File

@ -1129,11 +1129,12 @@ end function integrateStress
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
subroutine integrateStateFPI(g,i,e) subroutine integrateStateFPI(g,i,e)
integer :: & integer, intent(in) :: &
NiterationState, & !< number of iterations in state loop
e, & !< element index in element loop e, & !< element index in element loop
i, & !< integration point index in ip loop i, & !< integration point index in ip loop
g, & !< grain index in grain loop g !< grain index in grain loop
integer :: &
NiterationState, & !< number of iterations in state loop
p, & p, &
c, & c, &
s, & s, &
@ -1150,7 +1151,6 @@ subroutine integrateStateFPI(g,i,e)
logical :: & logical :: &
broken broken
p = material_phaseAt(g,e) p = material_phaseAt(g,e)
c = material_phaseMemberAt(g,i,e) c = material_phaseMemberAt(g,i,e)
@ -1262,10 +1262,11 @@ end subroutine integrateStateFPI
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
subroutine integrateStateEuler(g,i,e) subroutine integrateStateEuler(g,i,e)
integer :: & integer, intent(in) :: &
e, & !< element index in element loop e, & !< element index in element loop
i, & !< integration point index in ip loop i, & !< integration point index in ip loop
g, & !< grain index in grain loop g !< grain index in grain loop
integer :: &
p, & p, &
c, & c, &
s, & s, &
@ -1273,7 +1274,6 @@ subroutine integrateStateEuler(g,i,e)
logical :: & logical :: &
broken broken
p = material_phaseAt(g,e) p = material_phaseAt(g,e)
c = material_phaseMemberAt(g,i,e) c = material_phaseMemberAt(g,i,e)
@ -1311,10 +1311,11 @@ end subroutine integrateStateEuler
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
subroutine integrateStateAdaptiveEuler(g,i,e) subroutine integrateStateAdaptiveEuler(g,i,e)
integer, intent(in) :: &
e, & !< element index in element loop
i, & !< integration point index in ip loop
g !< grain index in grain loop
integer :: & integer :: &
e, & ! element index in element loop
i, & ! integration point index in ip loop
g, & ! grain index in grain loop
p, & p, &
c, & c, &
s, & s, &
@ -1389,7 +1390,7 @@ end subroutine integrateStateAdaptiveEuler
!--------------------------------------------------------------------------------------------------- !---------------------------------------------------------------------------------------------------
subroutine integrateStateRK4(g,i,e) subroutine integrateStateRK4(g,i,e)
integer :: g,i,e integer, intent(in) :: g,i,e
real(pReal), dimension(3,3), parameter :: & real(pReal), dimension(3,3), parameter :: &
A = reshape([& A = reshape([&
@ -1412,7 +1413,7 @@ end subroutine integrateStateRK4
!--------------------------------------------------------------------------------------------------- !---------------------------------------------------------------------------------------------------
subroutine integrateStateRKCK45(g,i,e) subroutine integrateStateRKCK45(g,i,e)
integer :: g,i,e integer, intent(in) :: g,i,e
real(pReal), dimension(5,5), parameter :: & real(pReal), dimension(5,5), parameter :: &
A = reshape([& A = reshape([&
@ -1448,10 +1449,11 @@ subroutine integrateStateRK(g,i,e,A,B,CC,DB)
real(pReal), dimension(:), intent(in) :: B, CC real(pReal), dimension(:), intent(in) :: B, CC
real(pReal), dimension(:), intent(in), optional :: DB real(pReal), dimension(:), intent(in), optional :: DB
integer, intent(in) :: &
e, & !< element index in element loop
i, & !< integration point index in ip loop
g !< grain index in grain loop
integer :: & integer :: &
e, & ! element index in element loop
i, & ! integration point index in ip loop
g, & ! grain index in grain loop
stage, & ! stage index in integration stage loop stage, & ! stage index in integration stage loop
n, & n, &
p, & p, &