Merge branch 'state-integration-one-loop' into memory-efficient-state-storage
This commit is contained in:
commit
20a3ebecea
|
@ -1329,7 +1329,6 @@ end subroutine integrateStateAdaptiveEuler
|
|||
|
||||
!--------------------------------------------------------------------------------------------------
|
||||
!> @brief integrate stress, state with 4th order explicit Runge Kutta method
|
||||
! ToDo: This is totally BROKEN: RK4dotState is never used!!!
|
||||
!--------------------------------------------------------------------------------------------------
|
||||
subroutine integrateStateRK4
|
||||
|
||||
|
@ -1636,10 +1635,6 @@ subroutine integrateStateRKCK45
|
|||
crystallite_Fp(1:3,1:3,g,i,e), &
|
||||
g, i, e)
|
||||
|
||||
if(.not. (crystallite_todo(g,i,e) .or. crystallite_localPlasticity(g,i,e))) &
|
||||
nonlocalBroken = .true.
|
||||
if(.not. crystallite_todo(g,i,e)) cycle
|
||||
|
||||
crystallite_todo(g,i,e) = integrateStress(g,i,e)
|
||||
if(.not. (crystallite_todo(g,i,e) .or. crystallite_localPlasticity(g,i,e))) &
|
||||
nonlocalBroken = .true.
|
||||
|
|
Loading…
Reference in New Issue