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

Minor fix for now

This commit is contained in:
Su Leen Wong 2014-09-01 09:30:33 +00:00
parent fc941a6436
commit 565e703f49
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
code/lattice.f90
View File

@ -1142,6 +1142,8 @@ subroutine lattice_initializeStructure(myPhase,CoverA,aA,aM,cM)
atr, ab atr, ab
real(pReal), dimension(3,3,3) :: & real(pReal), dimension(3,3,3) :: &
bainstr bainstr
real(pReal), dimension(3,3,lattice_maxNtrans) :: &
ub
integer(pInt) :: & integer(pInt) :: &
i,j, & i,j, &
myNslip, myNtwin, myNtrans myNslip, myNtwin, myNtrans
@ -1190,7 +1192,6 @@ subroutine lattice_initializeStructure(myPhase,CoverA,aA,aM,cM)
atr(i) = lattice_fcc_systemTrans(4,i) atr(i) = lattice_fcc_systemTrans(4,i)
rb(1:3,i) = lattice_fcc_bainRot(1:3,i) rb(1:3,i) = lattice_fcc_bainRot(1:3,i)
ab(i) = lattice_fcc_bainRot(4,i) ab(i) = lattice_fcc_bainRot(4,i)
enddo
bainstr = 0.0_pReal bainstr = 0.0_pReal
if ((aA > 0.0_pReal) .and. (aM > 0.0_pReal) .and. (cM == 0.0_pReal)) then if ((aA > 0.0_pReal) .and. (aM > 0.0_pReal) .and. (cM == 0.0_pReal)) then
@ -1204,6 +1205,8 @@ subroutine lattice_initializeStructure(myPhase,CoverA,aA,aM,cM)
bainstr(2,2,3) = sqrt(2.0_pReal)*aM/aA bainstr(2,2,3) = sqrt(2.0_pReal)*aM/aA
bainstr(3,3,3) = aM/aA bainstr(3,3,3) = aM/aA
endif endif
ub(1:3,1:3,i) = bainstr(1:3,1:3,LATTICE_fcc_bainVariant(i)) ! Pitsch OR
enddo
lattice_NslipSystem(1:lattice_maxNslipFamily,myPhase) = lattice_fcc_NslipSystem lattice_NslipSystem(1:lattice_maxNslipFamily,myPhase) = lattice_fcc_NslipSystem
lattice_NtwinSystem(1:lattice_maxNtwinFamily,myPhase) = lattice_fcc_NtwinSystem lattice_NtwinSystem(1:lattice_maxNtwinFamily,myPhase) = lattice_fcc_NtwinSystem
@ -1346,16 +1349,13 @@ subroutine lattice_initializeStructure(myPhase,CoverA,aA,aM,cM)
enddo enddo
do i = 1_pInt,myNtrans do i = 1_pInt,myNtrans
lattice_Rtrans(1:3,1:3,i,myPhase) = math_axisAngleToR(rtr(1:3,i),atr(i)*INRAD) lattice_Rtrans(1:3,1:3,i,myPhase) = math_axisAngleToR(rtr(1:3,i),atr(i)*INRAD)
lattice_Utrans(1:3,1:3,i,myPhase) = bainstr(1:3,1:3,LATTICE_fcc_bainVariant(i)) lattice_Utrans(1:3,1:3,i,myPhase) = ub(1:3,1:3,i)
lattice_Btrans(1:3,1:3,i,myPhase) = math_axisAngleToR(rb(1:3,i),ab(i)*INRAD) lattice_Btrans(1:3,1:3,i,myPhase) = math_axisAngleToR(rb(1:3,i),ab(i)*INRAD)
lattice_Qtrans(1:3,1:3,i,myPhase) = math_mul33x33(lattice_Rtrans(1:3,1:3,i,myPhase), & lattice_Qtrans(1:3,1:3,i,myPhase) = math_mul33x33(lattice_Rtrans(1:3,1:3,i,myPhase), &
lattice_Btrans(1:3,1:3,i,myPhase)) lattice_Btrans(1:3,1:3,i,myPhase))
if ((aA > 0.0_pReal) .and. (aM > 0.0_pReal) .and. (cM == 0.0_pReal)) then
lattice_NItrans(1:3,1:3,i,myPhase) = math_mul33x33(lattice_Rtrans(1:3,1:3,i,myPhase), & lattice_NItrans(1:3,1:3,i,myPhase) = math_mul33x33(lattice_Rtrans(1:3,1:3,i,myPhase), &
lattice_Utrans(1:3,1:3,i,myPhase)) - math_identity2nd(3) lattice_Utrans(1:3,1:3,i,myPhase)) - math_identity2nd(3)
lattice_NItrans_v(1:6,i,myPhase) = math_Mandel33to6(math_symmetric33(lattice_NItrans(1:3,1:3,i,myPhase))) lattice_NItrans_v(1:6,i,myPhase) = math_Mandel33to6(math_symmetric33(lattice_NItrans(1:3,1:3,i,myPhase)))
endif
enddo enddo
end subroutine lattice_initializeStructure end subroutine lattice_initializeStructure