From 1a75898019b87f9367915dbef3c7d9165c24f992 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 6 Sep 2017 12:33:11 +0000 Subject: [PATCH 1/3] syntax error --- env/DAMASK.zsh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/env/DAMASK.zsh b/env/DAMASK.zsh index deea2b072..2d2bc9aa0 100644 --- a/env/DAMASK.zsh +++ b/env/DAMASK.zsh @@ -23,15 +23,15 @@ source $DAMASK_ROOT/CONFIG unset -f set # 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) -[ "x$SOLVER" == "x" ] && SOLVER='Not found!' +[ "x$SOLVER == x" ] && SOLVER='Not found!' 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 # still, http://software.intel.com/en-us/forums/topic/501500 suggest to fix it From f0d8d7c50aa078d655fda5fdee76c18b1560373f Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 6 Sep 2017 16:20:24 +0200 Subject: [PATCH 2/3] bug in eigenvalue calculation, caused wrong eigenvectors for sym33 matrices. Credits to Duancheng Ma --- src/math.f90 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/math.f90 b/src/math.f90 index 2fcea3516..b5507d868 100644 --- a/src/math.f90 +++ b/src/math.f90 @@ -972,7 +972,7 @@ real(pReal) pure function math_detSym33(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) & - + 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 @@ -1962,6 +1962,7 @@ subroutine math_eigenValuesVectorsSym33(m,values,vectors) ! 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)) + end subroutine math_eigenValuesVectorsSym33 @@ -1984,7 +1985,7 @@ function math_eigenvectorBasisSym(m) do i=1_pInt, size(m,1) math_eigenvectorBasisSym = math_eigenvectorBasisSym & - + sqrt(values(i)) * math_tensorproduct(vectors(:,i),vectors(:,i)) + + sqrt(values(i)) * math_tensorproduct(vectors(:,i),vectors(:,i)) enddo end function math_eigenvectorBasisSym @@ -2137,6 +2138,7 @@ function math_eigenvaluesSym33(m) cos((phi+4.0_pReal*PI)/3.0_pReal) & ] + invariants(1)/3.0_pReal endif + end function math_eigenvaluesSym33 From 1d32f6f7a466b865333c806bf94fa5c56eccfe3f Mon Sep 17 00:00:00 2001 From: Test User Date: Thu, 7 Sep 2017 09:23:51 +0200 Subject: [PATCH 3/3] [skip ci] updated version information after successful test of v2.0.1-912-g370ff11 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index b7457af27..dc9d78559 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.1-907-g546b40b +v2.0.1-912-g370ff11