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

clearifying names

This commit is contained in:
Martin Diehl 2016-02-02 13:23:45 +01:00
parent 15e1c7edd8
commit dc1e8f9def
1 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
code/math.f90
View File

@ -153,7 +153,7 @@ module math
math_spectralDecompositionSym33, &
math_spectralDecompositionSym, &
math_rotationalPart33, &
math_invariants33, &
math_invariantsSym33, &
math_eigenvaluesSym33, &
math_factorial, &
math_binomial, &
@ -983,6 +983,20 @@ real(pReal) pure function math_det33(m)
end function math_det33
!--------------------------------------------------------------------------------------------------
!> @brief determinant of a symmetric 33 matrix
!--------------------------------------------------------------------------------------------------
real(pReal) pure function math_detSym33(m)
implicit none
real(pReal), dimension(3,3), intent(in) :: m
math_detSym33 = -(m(1,1)*m(2,3)**2_pInt + m(2,2)*m(1,3)**2_pInt + m(3,3)*m(1,2)**2_pInt) &
+ m(1,1)*m(2,2)*m(3,3) - 2.0_pReal * m(1,2)*m(1,3)*m(1,2)
end function math_detSym33
!--------------------------------------------------------------------------------------------------
!> @brief convert 33 matrix into vector 9
!--------------------------------------------------------------------------------------------------
@ -2037,7 +2051,7 @@ end function math_eigenvaluesSym
!--------------------------------------------------------------------------------------------------
!> @brief Eigenvalues of symmetric 3X3 matrix m
!> @brief Eigenvalues of symmetric 33 matrix m
!--------------------------------------------------------------------------------------------------
function math_eigenvaluesSym33(m)
@ -2047,7 +2061,8 @@ function math_eigenvaluesSym33(m)
real(pReal) :: R, S, T, P, Q, rho, phi
real(pReal), parameter :: TOL=1.e-14_pReal
invariants = math_invariants33(m)
invariants = math_invariantsSym33(m)
R=-invariants(1)
S= invariants(2)
T=-invariants(3)
@ -2068,42 +2083,24 @@ function math_eigenvaluesSym33(m)
endif
end function math_eigenvaluesSym33
!--------------------------------------------------------------------------------------------------
!> @brief invariants of symmetrix 3x3 matrix m
!> @brief invariants of symmetrix 33 matrix m
!--------------------------------------------------------------------------------------------------
pure function math_invariantsSym33(m)
implicit none
real(pReal), dimension(3,3) , intent(in) :: m
real(pReal), dimension(3,3), intent(in) :: m
real(pReal), dimension(3) :: math_invariantsSym33
math_invariantsSym33(1) = math_trace33(m)
math_invariantsSym33(2) = m(1,1)*m(2,2) + m(1,1)*m(3,3) + m(2,2)*m(3,3) &
-(m(1,2)**2 + m(1,3)**2 + m(2,3)**2)
math_invariantsSym33(3) = m(1,1)*m(2,3)**2 + m(2,2)*m(1,3)**2 + m(3,3)*m(1,2)**2 &
-(m(1,1)*m(2,2)*m(3,3) + 2.0_pReal * m(1,3)*m(1,2)*m(2,3))
math_invariantsSym33(3) = math_detSym33(m)
end function math_invariantsSym33
!--------------------------------------------------------------------------------------------------
!> @brief invariants of 3x3 matrix m
!--------------------------------------------------------------------------------------------------
pure function math_invariants33(m)
implicit none
real(pReal), dimension(3,3) , intent(in) :: m
real(pReal), dimension(3) :: math_invariants33
math_invariants33(1) = math_trace33(m)
math_invariants33(2) = math_invariants33(1)**2.0_pReal/2.0_pReal &
-(m(1,1)**2.0_pReal+m(2,2)**2.0_pReal+m(3,3)**2.0_pReal)* 0.5_pReal &
- m(1,2)*m(2,1) -m(1,3)*m(3,1) -m(2,3)*m(3,2)
math_invariants33(3) = math_det33(m)
end function math_invariants33
!--------------------------------------------------------------------------------------------------
!> @brief computes the next element in the Halton sequence.
!> @author John Burkardt