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

Bug fix for v4780 so it works for non transformation case

This commit is contained in:
Su Leen Wong 2016-01-26 13:20:45 +00:00
parent e59bc9780d
commit cdf09d6822
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
code/lattice.f90
View File

@ -1678,9 +1678,14 @@ subroutine lattice_initializeStructure(myPhase,CoverA,CoverA_trans,a_fcc,a_bcc)
select case(trans_lattice_structure(myPhase)) select case(trans_lattice_structure(myPhase))
case (LATTICE_bcc_ID) case (LATTICE_bcc_ID)
lattice_trans_C66(1:6,1:6,myPhase) = lattice_C66(1:6,1:6,myPhase) lattice_trans_C66(1:6,1:6,myPhase) = lattice_C66(1:6,1:6,myPhase)
!lattice_trans_mu(myPhase) = lattice_mu(myPhase) lattice_trans_mu(myPhase) = lattice_mu(myPhase)
!lattice_trans_nu(myPhase) = lattice_nu(myPhase) lattice_trans_nu(myPhase) = lattice_nu(myPhase)
!lattice_trans_C3333(1:3,1:3,1:3,1:3,myPhase) = lattice_C3333(1:3,1:3,1:3,1:3,myPhase) lattice_trans_C3333(1:3,1:3,1:3,1:3,myPhase) = lattice_C3333(1:3,1:3,1:3,1:3,myPhase)
lattice_trans_C66(1:6,1:6,myPhase) = math_Mandel3333to66(lattice_trans_C3333(1:3,1:3,1:3,1:3,myPhase))
do i = 1_pInt, 6_pInt
if (abs(lattice_trans_C66(i,i,myPhase))<tol_math_check) &
call IO_error(135_pInt,el=i,ip=myPhase,ext_msg='matrix diagonal "el"ement of phase "ip"')
enddo
case (LATTICE_hex_ID) case (LATTICE_hex_ID)
c11bar = (lattice_C66(1,1,myPhase) + lattice_C66(1,2,myPhase) + 2.0_pReal*lattice_C66(4,4,myPhase))/2.0_pReal c11bar = (lattice_C66(1,1,myPhase) + lattice_C66(1,2,myPhase) + 2.0_pReal*lattice_C66(4,4,myPhase))/2.0_pReal
c12bar = (lattice_C66(1,1,myPhase) + 5.0_pReal*lattice_C66(1,2,myPhase) - 2.0_pReal*lattice_C66(4,4,myPhase))/6.0_pReal c12bar = (lattice_C66(1,1,myPhase) + 5.0_pReal*lattice_C66(1,2,myPhase) - 2.0_pReal*lattice_C66(4,4,myPhase))/6.0_pReal
@ -1699,22 +1704,22 @@ subroutine lattice_initializeStructure(myPhase,CoverA,CoverA_trans,a_fcc,a_bcc)
lattice_trans_C66(1:6,1:6,myPhase) = lattice_symmetrizeC66(trans_lattice_structure(myPhase),& lattice_trans_C66(1:6,1:6,myPhase) = lattice_symmetrizeC66(trans_lattice_structure(myPhase),&
lattice_trans_C66(1:6,1:6,myPhase)) lattice_trans_C66(1:6,1:6,myPhase))
end select lattice_trans_mu(myPhase) = 0.2_pReal *( lattice_trans_C66(1,1,myPhase) &
lattice_trans_mu(myPhase) = 0.2_pReal *( lattice_trans_C66(1,1,myPhase) &
- lattice_trans_C66(1,2,myPhase) & - lattice_trans_C66(1,2,myPhase) &
+ 3.0_pReal*lattice_trans_C66(4,4,myPhase)) + 3.0_pReal*lattice_trans_C66(4,4,myPhase))
lattice_trans_nu(myPhase) = ( lattice_trans_C66(1,1,myPhase) & lattice_trans_nu(myPhase) = ( lattice_trans_C66(1,1,myPhase) &
+ 4.0_pReal*lattice_trans_C66(1,2,myPhase) & + 4.0_pReal*lattice_trans_C66(1,2,myPhase) &
- 2.0_pReal*lattice_trans_C66(4,4,myPhase)) & - 2.0_pReal*lattice_trans_C66(4,4,myPhase)) &
/( 4.0_pReal*lattice_trans_C66(1,1,myPhase) & /( 4.0_pReal*lattice_trans_C66(1,1,myPhase) &
+ 6.0_pReal*lattice_trans_C66(1,2,myPhase) & + 6.0_pReal*lattice_trans_C66(1,2,myPhase) &
+ 2.0_pReal*lattice_trans_C66(4,4,myPhase)) + 2.0_pReal*lattice_trans_C66(4,4,myPhase))
lattice_trans_C3333(1:3,1:3,1:3,1:3,myPhase) = math_Voigt66to3333(lattice_trans_C66(1:6,1:6,myPhase)) lattice_trans_C3333(1:3,1:3,1:3,1:3,myPhase) = math_Voigt66to3333(lattice_trans_C66(1:6,1:6,myPhase))
lattice_trans_C66(1:6,1:6,myPhase) = math_Mandel3333to66(lattice_trans_C3333(1:3,1:3,1:3,1:3,myPhase)) lattice_trans_C66(1:6,1:6,myPhase) = math_Mandel3333to66(lattice_trans_C3333(1:3,1:3,1:3,1:3,myPhase))
do i = 1_pInt, 6_pInt do i = 1_pInt, 6_pInt
if (abs(lattice_trans_C66(i,i,myPhase))<tol_math_check) & if (abs(lattice_trans_C66(i,i,myPhase))<tol_math_check) &
call IO_error(135_pInt,el=i,ip=myPhase,ext_msg='matrix diagonal "el"ement of phase "ip"') call IO_error(135_pInt,el=i,ip=myPhase,ext_msg='matrix diagonal "el"ement of phase "ip"')
enddo enddo
end select
end select end select
lattice_thermalConductivity33(1:3,1:3,myPhase) = lattice_symmetrize33(lattice_structure(myPhase),& lattice_thermalConductivity33(1:3,1:3,myPhase) = lattice_symmetrize33(lattice_structure(myPhase),&