diff --git a/src/phase_mechanical_elastic.f90 b/src/phase_mechanical_elastic.f90 index 587614865..4d7037830 100644 --- a/src/phase_mechanical_elastic.f90 +++ b/src/phase_mechanical_elastic.f90 @@ -100,16 +100,9 @@ module function elastic_C66(ph,en) result(C66) integer, intent(in) :: & ph, & en - real(pReal), dimension(6,6) :: & - C66 - associate(prm => param(ph)) - - C66 = get_C66(ph,en) - C66 = math_sym3333to66(math_Voigt66to3333(C66)) ! Literature data is in Voigt notation - - end associate + C66 = math_sym3333to66(math_Voigt66to3333(get_C66(ph,en))) ! Literature data is in Voigt notation end function elastic_C66 diff --git a/src/rotations.f90 b/src/rotations.f90 index 68f9273a3..1ca114acb 100644 --- a/src/rotations.f90 +++ b/src/rotations.f90 @@ -383,11 +383,8 @@ pure function rotTensor4sym(self,T,active) result(tRot) real(pReal), intent(in), dimension(6,6) :: T logical, intent(in), optional :: active - if (present(active)) then - tRot = math_sym3333to66(rotTensor4(self,math_66toSym3333(T),active)) - else - tRot = math_sym3333to66(rotTensor4(self,math_66toSym3333(T))) - endif + + tRot = math_sym3333to66(rotTensor4(self,math_66toSym3333(T),active)) end function rotTensor4sym @@ -400,6 +397,7 @@ pure elemental function misorientation(self,other) type(rotation) :: misorientation class(rotation), intent(in) :: self, other + misorientation%q = multiply_quaternion(other%q, conjugate_quaternion(self%q)) end function misorientation