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

Merge branch '19-NewStylePhenopowerlaw' of magit1.mpie.de:damask/DAMASK into 19-NewStylePhenopowerlaw

This commit is contained in:
Sharan Roongta 2018-05-02 17:00:46 +02:00
parent 51f56f5bad 235b2fe3c8
commit f44d20fdc6
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/math.f90
View File

@ -386,6 +386,9 @@ pure function math_expand(what,how)
real(pReal), dimension(sum(how)) :: math_expand real(pReal), dimension(sum(how)) :: math_expand
integer(pInt) :: i integer(pInt) :: i
if (sum(how) == 0_pInt) &
return
do i = 1_pInt, size(how) do i = 1_pInt, size(how)
math_expand(sum(how(1:i-1))+1:sum(how(1:i))) = what(mod(i-1_pInt,size(what))+1_pInt) math_expand(sum(how(1:i-1))+1:sum(how(1:i))) = what(mod(i-1_pInt,size(what))+1_pInt)
enddo enddo

9
src/plastic_phenopowerlaw.f90
View File

@ -202,7 +202,7 @@ subroutine plastic_phenopowerlaw_init(fileUnit)
allocate(totalNslip(maxNinstance), source=0_pInt) allocate(totalNslip(maxNinstance), source=0_pInt)
allocate(totalNtwin(maxNinstance), source=0_pInt) allocate(totalNtwin(maxNinstance), source=0_pInt)
allocate(param(maxNinstance)) ! one container of parameters per instance allocate(param(maxNinstance)) ! one container of parameters per instance
rewind(fileUnit) rewind(fileUnit)
phase = 0_pInt phase = 0_pInt
@ -814,9 +814,8 @@ subroutine plastic_phenopowerlaw_dotState(Tstar_v,ipc,ip,el)
integer(pInt) :: & integer(pInt) :: &
instance,ph, & instance,ph, &
nSlip,nTwin, &
f,i,j,k, & f,i,j,k, &
index_myfamily, & index_myFamily, &
of of
real(pReal) :: & real(pReal) :: &
c_SlipSlip,c_TwinSlip,c_TwinTwin, & c_SlipSlip,c_TwinSlip,c_TwinTwin, &
@ -858,8 +857,8 @@ subroutine plastic_phenopowerlaw_dotState(Tstar_v,ipc,ip,el)
right_SlipSlip(j) = abs(1.0_pReal-state(instance)%s_slip(j,of) / & right_SlipSlip(j) = abs(1.0_pReal-state(instance)%s_slip(j,of) / &
(param(instance)%tausat_slip(f)+ssat_offset)) & (param(instance)%tausat_slip(f)+ssat_offset)) &
**param(instance)%a_slip& **param(instance)%a_slip&
*sign(1.0_pReal,1.0_pReal-state(instance)%s_slip(j,of)) / & *sign(1.0_pReal,1.0_pReal-state(instance)%s_slip(j,of) / &
(param(instance)%tausat_slip(f)+ssat_offset) (param(instance)%tausat_slip(f)+ssat_offset))
right_TwinSlip(j) = 1.0_pReal ! no system-dependent part right_TwinSlip(j) = 1.0_pReal ! no system-dependent part
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------