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

'present' propagates

This commit is contained in:
Martin Diehl 2021-11-18 16:25:51 +01:00
parent 29771feaae
commit 72c07cfc17
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/phase_mechanical_elastic.f90
View File

@ -100,16 +100,9 @@ module function elastic_C66(ph,en) result(C66)
integer, intent(in) :: & integer, intent(in) :: &
ph, & ph, &
en en
real(pReal), dimension(6,6) :: &
C66
associate(prm => param(ph)) C66 = math_sym3333to66(math_Voigt66to3333(get_C66(ph,en))) ! Literature data is in Voigt notation
C66 = get_C66(ph,en)
C66 = math_sym3333to66(math_Voigt66to3333(C66)) ! Literature data is in Voigt notation
end associate
end function elastic_C66 end function elastic_C66

6
src/rotations.f90
View File

@ -383,11 +383,8 @@ pure function rotTensor4sym(self,T,active) result(tRot)
real(pReal), intent(in), dimension(6,6) :: T real(pReal), intent(in), dimension(6,6) :: T
logical, intent(in), optional :: active logical, intent(in), optional :: active
if (present(active)) then
tRot = math_sym3333to66(rotTensor4(self,math_66toSym3333(T),active)) tRot = math_sym3333to66(rotTensor4(self,math_66toSym3333(T),active))
else
tRot = math_sym3333to66(rotTensor4(self,math_66toSym3333(T)))
endif
end function rotTensor4sym end function rotTensor4sym
@ -400,6 +397,7 @@ pure elemental function misorientation(self,other)
type(rotation) :: misorientation type(rotation) :: misorientation
class(rotation), intent(in) :: self, other class(rotation), intent(in) :: self, other
misorientation%q = multiply_quaternion(other%q, conjugate_quaternion(self%q)) misorientation%q = multiply_quaternion(other%q, conjugate_quaternion(self%q))
end function misorientation end function misorientation