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

common variable name

This commit is contained in:
Martin Diehl 2019-01-30 00:01:40 +01:00
parent 6a3dac1df2
commit 1a66f976b7
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/crystallite.f90
View File

@ -1919,7 +1919,7 @@ subroutine integrateStateRK4()
p, & ! phase loop p, & ! phase loop
c, & c, &
n, & n, &
mySource s
integer(pInt), dimension(2) :: eIter ! bounds for element iteration integer(pInt), dimension(2) :: eIter ! bounds for element iteration
integer(pInt), dimension(2,mesh_NcpElems) :: iIter, & ! bounds for ip iteration integer(pInt), dimension(2,mesh_NcpElems) :: iIter, & ! bounds for ip iteration
gIter ! bounds for grain iteration gIter ! bounds for grain iteration
@ -1938,8 +1938,8 @@ subroutine integrateStateRK4()
if (.not. singleRun) then if (.not. singleRun) then
do p = 1_pInt, material_Nphase do p = 1_pInt, material_Nphase
plasticState(p)%RK4dotState = 0.0_pReal plasticState(p)%RK4dotState = 0.0_pReal
do mySource = 1_pInt, phase_Nsources(p) do s = 1_pInt, phase_Nsources(p)
sourceState(p)%p(mySource)%RK4dotState = 0.0_pReal sourceState(p)%p(s)%RK4dotState = 0.0_pReal
enddo enddo
enddo enddo
else else
@ -1947,8 +1947,8 @@ subroutine integrateStateRK4()
i = iIter(1,e) i = iIter(1,e)
do g = gIter(1,e), gIter(2,e) do g = gIter(1,e), gIter(2,e)
plasticState(phaseAt(g,i,e))%RK4dotState(:,phasememberAt(g,i,e)) = 0.0_pReal plasticState(phaseAt(g,i,e))%RK4dotState(:,phasememberAt(g,i,e)) = 0.0_pReal
do mySource = 1_pInt, phase_Nsources(phaseAt(g,i,e)) do s = 1_pInt, phase_Nsources(phaseAt(g,i,e))
sourceState(phaseAt(g,i,e))%p(mySource)%RK4dotState(:,phasememberAt(g,i,e)) = 0.0_pReal sourceState(phaseAt(g,i,e))%p(s)%RK4dotState(:,phasememberAt(g,i,e)) = 0.0_pReal
enddo enddo
enddo enddo
endif endif
@ -1967,13 +1967,13 @@ subroutine integrateStateRK4()
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))
if (crystallite_todo(g,i,e)) then if (crystallite_todo(g,i,e)) then
p = phaseAt(g,i,e) p = phaseAt(g,i,e); c = phasememberAt(g,i,e)
c = phasememberAt(g,i,e)
plasticState(p)%RK4dotState(:,c) = plasticState(p)%RK4dotState(:,c) & plasticState(p)%RK4dotState(:,c) = plasticState(p)%RK4dotState(:,c) &
+ weight(n)*plasticState(p)%dotState(:,c) + weight(n)*plasticState(p)%dotState(:,c)
do mySource = 1_pInt, phase_Nsources(p) do s = 1_pInt, phase_Nsources(p)
sourceState(p)%p(mySource)%RK4dotState(:,c) = sourceState(p)%p(mySource)%RK4dotState(:,c) & sourceState(p)%p(s)%RK4dotState(:,c) = sourceState(p)%p(s)%RK4dotState(:,c) &
+ weight(n)*sourceState(p)%p(mySource)%dotState(:,c) + weight(n)*sourceState(p)%p(s)%dotState(:,c)
enddo enddo
endif endif
enddo; enddo; enddo enddo; enddo; enddo