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

no need for temp variables

This commit is contained in:
Martin Diehl 2019-01-29 05:47:13 +01:00
parent 41832fb554
commit 34f3c15552
1 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/crystallite.f90
View File

@ -1569,11 +1569,9 @@ subroutine integrateStateFPI()
real(pReal) :: & real(pReal) :: &
stateDamper stateDamper
real(pReal), dimension(constitutive_plasticity_maxSizeDotState) :: & real(pReal), dimension(constitutive_plasticity_maxSizeDotState) :: &
plasticStateResiduum, & plasticStateResiduum
tempPlasticState
real(pReal), dimension(constitutive_source_maxSizeDotState, maxval(phase_Nsources)) :: & real(pReal), dimension(constitutive_source_maxSizeDotState, maxval(phase_Nsources)) :: &
sourceStateResiduum, & ! residuum from evolution in micrstructure sourceStateResiduum
tempSourceState
logical :: & logical :: &
converged, & converged, &
doneWithIntegration doneWithIntegration
@ -1619,8 +1617,7 @@ subroutine integrateStateFPI()
!$OMP DO PRIVATE(sizeDotState, & !$OMP DO PRIVATE(sizeDotState, &
!$OMP& plasticStateResiduum,sourceStateResiduum, & !$OMP& plasticStateResiduum,sourceStateResiduum, &
!$OMP& stateDamper, & !$OMP& stateDamper, converged,p,c)
!$OMP& tempPlasticState,tempSourceState,converged,p,c)
do e = FEsolving_execElem(1),FEsolving_execElem(2) do e = FEsolving_execElem(1),FEsolving_execElem(2)
do i = FEsolving_execIP(1,e),FEsolving_execIP(2,e) do i = FEsolving_execIP(1,e),FEsolving_execIP(2,e)
do g = 1,homogenization_Ngrains(mesh_element(3,e)) do g = 1,homogenization_Ngrains(mesh_element(3,e))
@ -1641,11 +1638,10 @@ subroutine integrateStateFPI()
* (1.0_pReal - stateDamper)) * crystallite_subdt(g,i,e) * (1.0_pReal - stateDamper)) * crystallite_subdt(g,i,e)
! --- correct state with residuum --- ! --- correct state with residuum ---
tempPlasticState(1:sizeDotState) = & plasticState(p)%state(1:sizeDotState,c) = &
plasticState(p)%state(1:sizeDotState,c) & plasticState(p)%state(1:sizeDotState,c) &
- plasticStateResiduum(1:sizeDotState) ! need to copy to local variable, since we cant flush a pointer in openmp - plasticStateResiduum(1:sizeDotState)
! --- store corrected dotState --- (cannot do this before state update, because not sure how to flush pointers in openmp)
plasticState(p)%dotState(:,c) = plasticState(p)%dotState(:,c) * stateDamper & plasticState(p)%dotState(:,c) = plasticState(p)%dotState(:,c) * stateDamper &
+ plasticState(p)%previousDotState(:,c) & + plasticState(p)%previousDotState(:,c) &
@ -1654,9 +1650,8 @@ subroutine integrateStateFPI()
converged = all( abs(plasticStateResiduum(1:sizeDotState)) < & converged = all( abs(plasticStateResiduum(1:sizeDotState)) < &
plasticState(p)%aTolState(1:sizeDotState) & plasticState(p)%aTolState(1:sizeDotState) &
.or. abs(plasticStateResiduum(1:sizeDotState)) < & .or. abs(plasticStateResiduum(1:sizeDotState)) < &
rTol_crystalliteState * abs(tempPlasticState(1:sizeDotState))) rTol_crystalliteState * abs( plasticState(p)%state(1:sizeDotState,c)))
plasticState(p)%state(1:sizeDotState,c) = tempPlasticState(1:sizeDotState)
do s = 1_pInt, phase_Nsources(p) do s = 1_pInt, phase_Nsources(p)
StateDamper = damper(sourceState(p)%p(s)%dotState (:,c), & StateDamper = damper(sourceState(p)%p(s)%dotState (:,c), &
@ -1671,11 +1666,10 @@ subroutine integrateStateFPI()
* (1.0_pReal - stateDamper)) * crystallite_subdt(g,i,e) * (1.0_pReal - stateDamper)) * crystallite_subdt(g,i,e)
! --- correct state with residuum --- ! --- correct state with residuum ---
tempSourceState(1:sizeDotState,s) = & sourceState(p)%p(s)%state(1:sizeDotState,c) = &
sourceState(p)%p(s)%state(1:sizeDotState,c) & sourceState(p)%p(s)%state(1:sizeDotState,c) &
- sourceStateResiduum(1:sizeDotState,s) ! need to copy to local variable, since we cant flush a pointer in openmp - sourceStateResiduum(1:sizeDotState,s) ! need to copy to local variable, since we cant flush a pointer in openmp
! --- store corrected dotState --- (cannot do this before state update, because not sure how to flush pointers in openmp)
sourceState(p)%p(s)%dotState(:,c) = & sourceState(p)%p(s)%dotState(:,c) = &
sourceState(p)%p(s)%dotState(:,c) * stateDamper & sourceState(p)%p(s)%dotState(:,c) * stateDamper &
+ sourceState(p)%p(s)%previousDotState(:,c) & + sourceState(p)%p(s)%previousDotState(:,c) &
@ -1688,16 +1682,10 @@ subroutine integrateStateFPI()
all( abs(sourceStateResiduum(1:sizeDotState,s)) < & all( abs(sourceStateResiduum(1:sizeDotState,s)) < &
sourceState(p)%p(s)%aTolState(1:sizeDotState) & sourceState(p)%p(s)%aTolState(1:sizeDotState) &
.or. abs(sourceStateResiduum(1:sizeDotState,s)) < & .or. abs(sourceStateResiduum(1:sizeDotState,s)) < &
rTol_crystalliteState * abs(tempSourceState(1:sizeDotState,s))) rTol_crystalliteState * abs(sourceState(p)%p(s)%state(1:sizeDotState,c)))
enddo enddo
if (converged) crystallite_converged(g,i,e) = .true. ! ... converged per definition if (converged) crystallite_converged(g,i,e) = .true. ! ... converged per definition
do s = 1_pInt, phase_Nsources(p)
sizeDotState = sourceState(p)%p(s)%sizeDotState
sourceState(p)%p(s)%state(1:sizeDotState,c) = &
tempSourceState(1:sizeDotState,s)
enddo
endif endif
enddo; enddo; enddo enddo; enddo; enddo
!$OMP ENDDO !$OMP ENDDO