From 619baefe198d962460c35fb05e014e7629b63fdd Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sun, 13 Jan 2019 18:54:20 +0100 Subject: [PATCH 1/2] some comments calling a conversion "Mandel" that does not follow the Mandel convention (at least according to wikipedia) is not really intuitive --- src/DAMASK_abaqus.f | 8 ++++---- src/math.f90 | 13 ++++++++++--- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/DAMASK_abaqus.f b/src/DAMASK_abaqus.f index 69f6fba4b..6c6434e4a 100644 --- a/src/DAMASK_abaqus.f +++ b/src/DAMASK_abaqus.f @@ -322,8 +322,8 @@ subroutine UMAT(STRESS,STATEV,DDSDDE,SSE,SPD,SCD,& statev = materialpoint_results(1:min(nstatv,materialpoint_sizeResults),npt,mesh_FEasCP('elem', noel)) - if ( terminallyIll ) pnewdt = 0.5_pReal ! force cutback directly ? -!$ call omp_set_num_threads(defaultNumThreadsInt) ! reset number of threads to stored default value + if (terminallyIll) pnewdt = 0.5_pReal ! force cutback directly ? +!$ call omp_set_num_threads(defaultNumThreadsInt) ! reset number of threads to stored default value end subroutine UMAT @@ -331,12 +331,12 @@ end subroutine UMAT !-------------------------------------------------------------------------------------------------- !> @brief calls the exit function of Abaqus/Standard !-------------------------------------------------------------------------------------------------- -subroutine quit(mpie_error) +subroutine quit(DAMASK_error) use prec, only: & pInt implicit none - integer(pInt) :: mpie_error + integer(pInt) :: DAMASK_error flush(6) call xit diff --git a/src/math.f90 b/src/math.f90 index cf942ab68..9b81aaa4b 100644 --- a/src/math.f90 +++ b/src/math.f90 @@ -24,6 +24,14 @@ module math 0.0_pReal,0.0_pReal,1.0_pReal & ],[3,3]) !< 3x3 Identity +! ToDo MD: Our naming scheme is a little bit odd: We use essentially the re-ordering according to Nye +! (convenient because Abaqus and Marc want to have 12 on position 4) +! but weight the shear components according to Mandel (convenient for matrix multiplications) +! I suggest to keep Voigt3333to66 (required for reading in elasticity matrices) but rename +! mapMandel to mapNye, math_MandelXtoY to math_XtoY and math_PlainXtoY to math_XtoY. +! It is then clear that math_33to9 just reorders and math_33to6 does the "DAMASK conversion" +! without leaving the impression that it follows any established convention + integer(pInt), dimension (2,6), parameter, private :: & mapMandel = reshape([& 1_pInt,1_pInt, & @@ -32,7 +40,7 @@ module math 1_pInt,2_pInt, & 2_pInt,3_pInt, & 1_pInt,3_pInt & - ],[2,6]) !< arrangement in Mandel notation + ],[2,6]) !< arrangement in Mandel notation. Differs from https://en.wikipedia.org/wiki/Voigt_notation#Mandel_notation real(pReal), dimension(6), parameter, private :: & nrmMandel = [& @@ -870,7 +878,7 @@ subroutine math_invert(myDim,A, InvA, error) invA = A call dgetrf(myDim,myDim,invA,myDim,ipiv,ierr) call dgetri(myDim,InvA,myDim,ipiv,work,myDim,ierr) - error = merge(.true.,.false., ierr /= 0_pInt) ! http://fortraninacworld.blogspot.de/2012/12/ternary-operator.html + error = merge(.true.,.false., ierr /= 0_pInt) end subroutine math_invert @@ -1163,7 +1171,6 @@ end function math_Plain66toMandel66 pure function math_Mandel3333to66(m3333) implicit none - real(pReal), dimension(3,3,3,3), intent(in) :: m3333 real(pReal), dimension(6,6) :: math_Mandel3333to66 integer(pInt) :: i,j From 8576d72eceda6a5dc811030ed64660aeae41f960 Mon Sep 17 00:00:00 2001 From: Test User Date: Mon, 14 Jan 2019 04:57:43 +0100 Subject: [PATCH 2/2] [skip ci] updated version information after successful test of v2.0.2-1398-g619baefe --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 895c5d6b5..8f6e3285d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.2-1395-g4848e600 +v2.0.2-1398-g619baefe