223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

better use one loop

This commit is contained in:
Martin Diehl 2020-12-23 11:37:00 +01:00
parent 73523c8f62
commit 026ac07c9e
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/homogenization.f90
View File

@ -220,7 +220,7 @@ subroutine materialpoint_stressAndItsTangent(dt)
any(subStep(FEsolving_execIP(1):FEsolving_execIP(2),& any(subStep(FEsolving_execIP(1):FEsolving_execIP(2),&
FEsolving_execElem(1):FEsolving_execElem(2)) > num%subStepMinHomog)) FEsolving_execElem(1):FEsolving_execElem(2)) > num%subStepMinHomog))
!$OMP PARALLEL DO PRIVATE(m,myNgrains) !$OMP PARALLEL DO PRIVATE(m,myNgrains,NiterationMPstate)
elementLooping1: do e = FEsolving_execElem(1),FEsolving_execElem(2) elementLooping1: do e = FEsolving_execElem(1),FEsolving_execElem(2)
myNgrains = homogenization_Nconstituents(material_homogenizationAt(e)) myNgrains = homogenization_Nconstituents(material_homogenizationAt(e))
IpLooping1: do i = FEsolving_execIP(1),FEsolving_execIP(2) IpLooping1: do i = FEsolving_execIP(1),FEsolving_execIP(2)
@ -270,25 +270,18 @@ subroutine materialpoint_stressAndItsTangent(dt)
requested(i,e) = .true. requested(i,e) = .true.
doneAndHappy(1:2,i,e) = [.false.,.true.] doneAndHappy(1:2,i,e) = [.false.,.true.]
endif endif
enddo IpLooping1
enddo elementLooping1
!$OMP END PARALLEL DO
NiterationMPstate = 0 NiterationMPstate = 0
convergenceLooping: do while (.not. terminallyIll .and. & convergenceLooping: do while (.not. terminallyIll .and. requested(i,e) &
any( requested(:,FEsolving_execELem(1):FEsolving_execElem(2)) & .and. .not. doneAndHappy(1,i,e) &
.and. .not. doneAndHappy(1,:,FEsolving_execELem(1):FEsolving_execElem(2)) & .and. NiterationMPstate < num%nMPstate)
) .and. &
NiterationMPstate < num%nMPstate)
NiterationMPstate = NiterationMPstate + 1 NiterationMPstate = NiterationMPstate + 1
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
! deformation partitioning ! deformation partitioning
!$OMP PARALLEL DO PRIVATE(myNgrains,m,co)
elementLooping2: do e = FEsolving_execElem(1),FEsolving_execElem(2)
myNgrains = homogenization_Nconstituents(material_homogenizationAt(e))
IpLooping2: do i = FEsolving_execIP(1),FEsolving_execIP(2)
if(requested(i,e) .and. .not. doneAndHappy(1,i,e)) then ! requested but not yet done if(requested(i,e) .and. .not. doneAndHappy(1,i,e)) then ! requested but not yet done
m = (e-1)*discretization_nIPs + i m = (e-1)*discretization_nIPs + i
call mech_partition(homogenization_F0(1:3,1:3,m) & call mech_partition(homogenization_F0(1:3,1:3,m) &
@ -319,11 +312,11 @@ subroutine materialpoint_stressAndItsTangent(dt)
converged(i,e) = all(doneAndHappy(1:2,i,e)) ! converged if done and happy converged(i,e) = all(doneAndHappy(1:2,i,e)) ! converged if done and happy
endif endif
endif endif
enddo IpLooping2
enddo elementLooping2
!$OMP END PARALLEL DO
enddo convergenceLooping enddo convergenceLooping
enddo IpLooping1
enddo elementLooping1
!$OMP END PARALLEL DO
NiterationHomog = NiterationHomog + 1 NiterationHomog = NiterationHomog + 1