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

Merge commit 'v2.0.1-913-g1d32f6f'

This commit is contained in:
Test User 2017-09-07 09:23:52 +02:00
parent 7bf2fb556c 1d32f6f7a4
commit 1dbe21e4b5
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
env/DAMASK.zsh vendored
View File

@ -23,15 +23,15 @@ source $DAMASK_ROOT/CONFIG
unset -f set unset -f set
# add DAMASK_BIN if present # add DAMASK_BIN if present
[ "x$DAMASK_BIN" != "x" ] && PATH=$DAMASK_BIN:$PATH [ "x$DAMASK_BIN != x" ] && PATH=$DAMASK_BIN:$PATH
SOLVER=$(type -p DAMASK_spectral || true 2>/dev/null) SOLVER=$(type -p DAMASK_spectral || true 2>/dev/null)
[ "x$SOLVER" == "x" ] && SOLVER='Not found!' [ "x$SOLVER == x" ] && SOLVER='Not found!'
PROCESSING=$(type -p postResults || true 2>/dev/null) PROCESSING=$(type -p postResults || true 2>/dev/null)
[ "x$PROCESSING" == "x" ] && PROCESSING='Not found!' [ "x$PROCESSING == x" ] && PROCESSING='Not found!'
[ "x$DAMASK_NUM_THREADS" == "x" ] && DAMASK_NUM_THREADS=1 [ "x$DAMASK_NUM_THREADS == x" ] && DAMASK_NUM_THREADS=1
# currently, there is no information that unlimited causes problems # currently, there is no information that unlimited causes problems
# still, http://software.intel.com/en-us/forums/topic/501500 suggest to fix it # still, http://software.intel.com/en-us/forums/topic/501500 suggest to fix it

6
src/math.f90
View File

@ -972,7 +972,7 @@ real(pReal) pure function math_detSym33(m)
real(pReal), dimension(3,3), intent(in) :: m 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) & 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(2,3) + m(1,1)*m(2,2)*m(3,3) + 2.0_pReal * m(1,2)*m(1,3)*m(2,3)
end function math_detSym33 end function math_detSym33
@ -1962,6 +1962,7 @@ subroutine math_eigenValuesVectorsSym33(m,values,vectors)
! Calculate third eigenvector according to v[2] = v[0] x v[1] ! Calculate third eigenvector according to v[2] = v[0] x v[1]
vectors(1:3,3) = math_crossproduct(vectors(1:3,1),vectors(1:3,2)) vectors(1:3,3) = math_crossproduct(vectors(1:3,1),vectors(1:3,2))
end subroutine math_eigenValuesVectorsSym33 end subroutine math_eigenValuesVectorsSym33
@ -1984,7 +1985,7 @@ function math_eigenvectorBasisSym(m)
do i=1_pInt, size(m,1) do i=1_pInt, size(m,1)
math_eigenvectorBasisSym = math_eigenvectorBasisSym & math_eigenvectorBasisSym = math_eigenvectorBasisSym &
+ sqrt(values(i)) * math_tensorproduct(vectors(:,i),vectors(:,i)) + sqrt(values(i)) * math_tensorproduct(vectors(:,i),vectors(:,i))
enddo enddo
end function math_eigenvectorBasisSym end function math_eigenvectorBasisSym
@ -2137,6 +2138,7 @@ function math_eigenvaluesSym33(m)
cos((phi+4.0_pReal*PI)/3.0_pReal) & cos((phi+4.0_pReal*PI)/3.0_pReal) &
] + invariants(1)/3.0_pReal ] + invariants(1)/3.0_pReal
endif endif
end function math_eigenvaluesSym33 end function math_eigenvaluesSym33