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 2 variables

This commit is contained in:
Martin Diehl 2019-01-29 00:38:18 +01:00
parent b62232022b
commit 2f9a571b96
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/crystallite.f90
View File

@ -1571,8 +1571,7 @@ subroutine integrateStateFPI()
real(pReal) :: & real(pReal) :: &
dot_prod12, & dot_prod12, &
dot_prod22, & dot_prod22, &
plasticStateDamper, & ! damper for integration of state stateDamper
sourceStateDamper
real(pReal), dimension(constitutive_plasticity_maxSizeDotState) :: & real(pReal), dimension(constitutive_plasticity_maxSizeDotState) :: &
plasticStateResiduum, & plasticStateResiduum, &
tempPlasticState tempPlasticState
@ -1625,7 +1624,7 @@ subroutine integrateStateFPI()
!$OMP DO PRIVATE(dot_prod12,dot_prod22, & !$OMP DO PRIVATE(dot_prod12,dot_prod22, &
!$OMP& mySizePlasticDotState,mySizeSourceDotState, & !$OMP& mySizePlasticDotState,mySizeSourceDotState, &
!$OMP& plasticStateResiduum,sourceStateResiduum, & !$OMP& plasticStateResiduum,sourceStateResiduum, &
!$OMP& plasticStatedamper,sourceStateDamper, & !$OMP& stateDamper, &
!$OMP& tempPlasticState,tempSourceState,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)
@ -1646,9 +1645,9 @@ subroutine integrateStateFPI()
.and. ( dot_prod12 < 0.0_pReal & .and. ( dot_prod12 < 0.0_pReal &
.or. dot_product(plasticState(p)%dotState(:,c), & .or. dot_product(plasticState(p)%dotState(:,c), &
plasticState(p)%previousDotState(:,c)) < 0.0_pReal) ) then plasticState(p)%previousDotState(:,c)) < 0.0_pReal) ) then
plasticStateDamper = 0.75_pReal + 0.25_pReal * tanh(2.0_pReal + 4.0_pReal * dot_prod12 / dot_prod22) stateDamper = 0.75_pReal + 0.25_pReal * tanh(2.0_pReal + 4.0_pReal * dot_prod12 / dot_prod22)
else else
plasticStateDamper = 1.0_pReal stateDamper = 1.0_pReal
endif endif
! --- get residui --- ! --- get residui ---
@ -1656,9 +1655,9 @@ subroutine integrateStateFPI()
plasticStateResiduum(1:mySizePlasticDotState) = & plasticStateResiduum(1:mySizePlasticDotState) = &
plasticState(p)%state(1:mySizePlasticDotState,c) & plasticState(p)%state(1:mySizePlasticDotState,c) &
- plasticState(p)%subState0(1:mySizePlasticDotState,c) & - plasticState(p)%subState0(1:mySizePlasticDotState,c) &
- ( plasticState(p)%dotState(1:mySizePlasticDotState,c) * plasticStateDamper & - ( plasticState(p)%dotState(1:mySizePlasticDotState,c) * stateDamper &
+ plasticState(p)%previousDotState(1:mySizePlasticDotState,c) & + plasticState(p)%previousDotState(1:mySizePlasticDotState,c) &
* (1.0_pReal - plasticStateDamper)) * crystallite_subdt(g,i,e) * (1.0_pReal - stateDamper)) * crystallite_subdt(g,i,e)
! --- correct state with residuum --- ! --- correct state with residuum ---
tempPlasticState(1:mySizePlasticDotState) = & tempPlasticState(1:mySizePlasticDotState) = &
@ -1667,9 +1666,9 @@ subroutine integrateStateFPI()
! --- store corrected dotState --- (cannot do this before state update, because not sure how to flush pointers in openmp) ! --- 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) * plasticStateDamper & plasticState(p)%dotState(:,c) = plasticState(p)%dotState(:,c) * stateDamper &
+ plasticState(p)%previousDotState(:,c) & + plasticState(p)%previousDotState(:,c) &
* (1.0_pReal - plasticStateDamper) * (1.0_pReal - stateDamper)
do mySource = 1_pInt, phase_Nsources(p) do mySource = 1_pInt, phase_Nsources(p)
mySizeSourceDotState = sourceState(p)%p(mySource)%sizeDotState mySizeSourceDotState = sourceState(p)%p(mySource)%sizeDotState
@ -1686,18 +1685,18 @@ subroutine integrateStateFPI()
.and. ( dot_prod12 < 0.0_pReal & .and. ( dot_prod12 < 0.0_pReal &
.or. dot_product(sourceState(p)%p(mySource)%dotState(:,c), & .or. dot_product(sourceState(p)%p(mySource)%dotState(:,c), &
sourceState(p)%p(mySource)%previousDotState(:,c)) < 0.0_pReal) ) then sourceState(p)%p(mySource)%previousDotState(:,c)) < 0.0_pReal) ) then
sourceStateDamper = 0.75_pReal + 0.25_pReal * tanh(2.0_pReal + 4.0_pReal * dot_prod12 / dot_prod22) stateDamper = 0.75_pReal + 0.25_pReal * tanh(2.0_pReal + 4.0_pReal * dot_prod12 / dot_prod22)
else else
sourceStateDamper = 1.0_pReal stateDamper = 1.0_pReal
endif endif
! --- get residui --- ! --- get residui ---
mySizeSourceDotState = sourceState(p)%p(mySource)%sizeDotState mySizeSourceDotState = sourceState(p)%p(mySource)%sizeDotState
sourceStateResiduum(1:mySizeSourceDotState,mySource) = & sourceStateResiduum(1:mySizeSourceDotState,mySource) = &
sourceState(p)%p(mySource)%state(1:mySizeSourceDotState,c) & sourceState(p)%p(mySource)%state(1:mySizeSourceDotState,c) &
- sourceState(p)%p(mySource)%subState0(1:mySizeSourceDotState,c) & - sourceState(p)%p(mySource)%subState0(1:mySizeSourceDotState,c) &
- ( sourceState(p)%p(mySource)%dotState(1:mySizeSourceDotState,c) * sourceStateDamper & - ( sourceState(p)%p(mySource)%dotState(1:mySizeSourceDotState,c) * stateDamper &
+ sourceState(p)%p(mySource)%previousDotState(1:mySizeSourceDotState,c) & + sourceState(p)%p(mySource)%previousDotState(1:mySizeSourceDotState,c) &
* (1.0_pReal - sourceStateDamper)) * crystallite_subdt(g,i,e) * (1.0_pReal - stateDamper)) * crystallite_subdt(g,i,e)
! --- correct state with residuum --- ! --- correct state with residuum ---
tempSourceState(1:mySizeSourceDotState,mySource) = & tempSourceState(1:mySizeSourceDotState,mySource) = &
@ -1706,9 +1705,9 @@ subroutine integrateStateFPI()
! --- store corrected dotState --- (cannot do this before state update, because not sure how to flush pointers in openmp) ! --- store corrected dotState --- (cannot do this before state update, because not sure how to flush pointers in openmp)
sourceState(p)%p(mySource)%dotState(:,c) = & sourceState(p)%p(mySource)%dotState(:,c) = &
sourceState(p)%p(mySource)%dotState(:,c) * sourceStateDamper & sourceState(p)%p(mySource)%dotState(:,c) * stateDamper &
+ sourceState(p)%p(mySource)%previousDotState(:,c) & + sourceState(p)%p(mySource)%previousDotState(:,c) &
* (1.0_pReal - sourceStateDamper) * (1.0_pReal - stateDamper)
enddo enddo