From 208c4affa452c0f3f033f24eceaa211fc684b1e7 Mon Sep 17 00:00:00 2001
From: Fengbo Han <f.han@mpie.de>
Date: Wed, 7 Feb 2018 17:11:43 +0100
Subject: [PATCH 1/2] using math_equivStrain33 and math_equivStress33 instead
 of Mises

---
 src/DAMASK_spectral.f90    |  6 +++---
 src/spectral_utilities.f90 | 36 +++++++-----------------------------
 2 files changed, 10 insertions(+), 32 deletions(-)

diff --git a/src/DAMASK_spectral.f90 b/src/DAMASK_spectral.f90
index beae759fc..7b4cddd77 100755
--- a/src/DAMASK_spectral.f90
+++ b/src/DAMASK_spectral.f90
@@ -303,15 +303,15 @@ program DAMASK_spectral
            temp_valueVector(j) = IO_floatValue(line,chunkPos,i+j)
          enddo
          loadCases(currentLoadCase)%rotation = math_plain9to33(temp_valueVector)
-       case('totalStrain', 'totalstrain')
+       case('totalstrain')
          yieldStop = .True.
          stopFlag = 'totalStrain'
          yieldStopValue = IO_floatValue(line,chunkPos,i+1_pInt)
-       case('plasticStrain', 'plasticstrain')
+       case('plasticstrain')
          yieldStop = .True.
          stopFlag = 'plasticStrain'
          yieldStopValue = IO_floatValue(line,chunkPos,i+1_pInt)
-       case('plasticWork', 'plasticwork')
+       case('plasticwork')
          yieldStop = .True.
          stopFlag = 'plasticWork'
          yieldStopValue = IO_floatValue(line,chunkPos,i+1_pInt)
diff --git a/src/spectral_utilities.f90 b/src/spectral_utilities.f90
index 1efaf8879..ea7f50a31 100755
--- a/src/spectral_utilities.f90
+++ b/src/spectral_utilities.f90
@@ -1068,6 +1068,8 @@ subroutine utilities_calcPlasticity(yieldStress, plasticStrain, eqStress, eqTota
    math_mul33x33, &
    math_trace33, &
    math_transpose33, &
+   math_equivStrain33, &
+   math_equivStress33, &
    math_rotate_forward33, &
    math_identity2nd, &
    math_crossproduct, &
@@ -1099,7 +1101,7 @@ subroutine utilities_calcPlasticity(yieldStress, plasticStrain, eqStress, eqTota
  eqStressOld = eqStress
  eqPlasticStrainOld = eqPlasticStrain
  plasticWorkOld = plasticWork
- wgtm = 1.0/real(mesh_NcpElems*mesh_maxNips*homogenization_maxNgrains,pReal)
+ wgtm = 1.0_pReal/real(mesh_NcpElems*mesh_maxNips*homogenization_maxNgrains,pReal)
  diag = 0.0_pReal
  
  P_av = sum(sum(sum(crystallite_P,dim=5),dim=4),dim=3) * wgtm
@@ -1110,9 +1112,9 @@ subroutine utilities_calcPlasticity(yieldStress, plasticStrain, eqStress, eqTota
  call MPI_Allreduce(MPI_IN_PLACE,F_av,9,MPI_DOUBLE,MPI_SUM,PETSC_COMM_WORLD,ierr)
  F_av = math_rotate_forward33(F_av,rotation_BC)
  
- cauchy = 1.0/math_det33(F_av)*math_mul33x33(P_av,transpose(F_av))
+ cauchy = 1.0_pReal/math_det33(F_av)*math_mul33x33(P_av,transpose(F_av))
  yieldStress = cauchy
- eqStress = Mises(cauchy, 'stress')
+ eqStress = math_equivStress33(cauchy)
  
  F_temp = F_av
  call dgesvd ('A', 'A', 3, 3, F_temp, 3, S, U, 3, VT, 3, WORK, 15, INFO)                            ! singular value decomposition
@@ -1143,7 +1145,7 @@ subroutine utilities_calcPlasticity(yieldStress, plasticStrain, eqStress, eqTota
  endif
  
  V_total = REAL(math_mul33x33(Vectors, math_mul33x33(diag, transpose(Vectors))))
- eqTotalStrain = Mises(V_total, 'strain')
+ eqTotalStrain = math_equivStrain33(V_total)
  
  do k = 1_pInt, mesh_NcpElems;  do j = 1_pInt, mesh_maxNips;  do i = 1_pInt,homogenization_maxNgrains
    Fe(1:3,1:3,i,j,k) = crystallite_Fe(1:3,1:3,i,j,k)
@@ -1157,7 +1159,7 @@ subroutine utilities_calcPlasticity(yieldStress, plasticStrain, eqStress, eqTota
  
  Vp = V_total - Ve_av
  
- eqPlasticStrain = Mises(Vp, 'strain')
+ eqPlasticStrain = math_equivStrain33(Vp)
  
  plasticStrain = Vp
  
@@ -1165,30 +1167,6 @@ subroutine utilities_calcPlasticity(yieldStress, plasticStrain, eqStress, eqTota
  
 end subroutine utilities_calcPlasticity
 
-!--------------------------------------------------------------------------------------------------
-!> @brief vonMises equivalent values for symmetric part of requested strains and/or stresses.
-!--------------------------------------------------------------------------------------------------
-function Mises(m, mType)
- use math, only: &
-  math_trace33, &
-  math_identity2nd
-  
- implicit none
- real(pReal), intent(in), dimension(3,3) :: m
- character(len=*), intent(in) :: mType
- real(pReal) :: trace, Mises
- real(pReal), dimension(3,3) :: eye, dev, symdev
- 
- eye = math_identity2nd(3)
- trace = math_trace33(m)
- dev = m - trace/3.0*eye
- symdev = 0.5*(dev+transpose(dev))
- if (mType == 'stress') then
-  Mises = sqrt(3.0/2.0*sum(symdev*transpose(symdev)))
- else
-  Mises = sqrt(2.0/3.0*sum(symdev*transpose(symdev)))
- endif
-end function Mises
 
 !--------------------------------------------------------------------------------------------------
 !> @brief calculates forward rate, either guessing or just add delta/timeinc

From 9b37c6605c1680283d5494f975057c3970da992d Mon Sep 17 00:00:00 2001
From: Test User <damask_user@mpie.de>
Date: Thu, 8 Feb 2018 17:09:01 +0100
Subject: [PATCH 2/2] [skip ci] updated version information after successful
 test of v2.0.1-1055-g208c4af

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 35191bcab..066a72dfa 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v2.0.1-1035-gd80a255
+v2.0.1-1055-g208c4af