no need for an extra loop
This commit is contained in:
parent
02774a89d9
commit
9a188784e2
|
@ -1513,26 +1513,9 @@ subroutine integrateStateRKCK45
|
||||||
|
|
||||||
enddo
|
enddo
|
||||||
|
|
||||||
endif
|
if(.not. crystallite_todo(g,i,e)) exit
|
||||||
enddo; enddo; enddo
|
|
||||||
!$OMP END PARALLEL DO
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
!--------------------------------------------------------------------------------------------------
|
|
||||||
! --- STATE UPDATE WITH ERROR ESTIMATE FOR STATE ---
|
|
||||||
|
|
||||||
!$OMP PARALLEL DO PRIVATE(sizeDotState,p,c)
|
|
||||||
do e = FEsolving_execElem(1),FEsolving_execElem(2)
|
|
||||||
do i = FEsolving_execIP(1),FEsolving_execIP(2)
|
|
||||||
do g = 1,homogenization_Ngrains(material_homogenizationAt(e))
|
|
||||||
|
|
||||||
if(crystallite_todo(g,i,e) .and. (.not. nonlocalBroken .or. crystallite_localPlasticity(g,i,e)) ) then
|
|
||||||
|
|
||||||
p = material_phaseAt(g,e); c = material_phaseMemberAt(g,i,e)
|
|
||||||
|
|
||||||
sizeDotState = plasticState(p)%sizeDotState
|
sizeDotState = plasticState(p)%sizeDotState
|
||||||
|
|
||||||
plasticState(p)%RKCK45dotState(6,:,c) = plasticState (p)%dotState(:,c)
|
plasticState(p)%RKCK45dotState(6,:,c) = plasticState (p)%dotState(:,c)
|
||||||
|
|
||||||
residuum_plastic(1:sizeDotState,g,i,e) = &
|
residuum_plastic(1:sizeDotState,g,i,e) = &
|
||||||
|
@ -1544,7 +1527,6 @@ subroutine integrateStateRKCK45
|
||||||
|
|
||||||
do s = 1, phase_Nsources(p)
|
do s = 1, phase_Nsources(p)
|
||||||
sizeDotState = sourceState(p)%p(s)%sizeDotState
|
sizeDotState = sourceState(p)%p(s)%sizeDotState
|
||||||
|
|
||||||
sourceState(p)%p(s)%RKCK45dotState(6,:,c) = sourceState(p)%p(s)%dotState(:,c)
|
sourceState(p)%p(s)%RKCK45dotState(6,:,c) = sourceState(p)%p(s)%dotState(:,c)
|
||||||
|
|
||||||
residuum_source(1:sizeDotState,s,g,i,e) = &
|
residuum_source(1:sizeDotState,s,g,i,e) = &
|
||||||
|
@ -1593,6 +1575,7 @@ subroutine integrateStateRKCK45
|
||||||
call update_deltaState
|
call update_deltaState
|
||||||
call update_dependentState
|
call update_dependentState
|
||||||
call update_stress(1.0_pReal)
|
call update_stress(1.0_pReal)
|
||||||
|
|
||||||
call setConvergenceFlag
|
call setConvergenceFlag
|
||||||
if (any(plasticState(:)%nonlocal)) call nonlocalConvergenceCheck
|
if (any(plasticState(:)%nonlocal)) call nonlocalConvergenceCheck
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue