diff --git a/VERSION b/VERSION index 26c337c96..79ee48b68 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.2-591-ga00d15b8 +v2.0.2-638-gd5cf7d21 diff --git a/src/plastic_phenopowerlaw.f90 b/src/plastic_phenopowerlaw.f90 index b957e76f0..f695fdf67 100644 --- a/src/plastic_phenopowerlaw.f90 +++ b/src/plastic_phenopowerlaw.f90 @@ -570,7 +570,7 @@ end subroutine plastic_phenopowerlaw_dotState !> @details: Shear rates are calculated only optionally. NOTE: Agains the common convention, the !> result (i.e. intent(out)) variables are the last to have the optional arguments at the end !-------------------------------------------------------------------------------------------------- -subroutine kinetics_slip(prm,stt,of,Mp,gdot_slip_pos,gdot_slip_neg, & +pure subroutine kinetics_slip(prm,stt,of,Mp,gdot_slip_pos,gdot_slip_neg, & dgdot_dtau_slip_pos,dgdot_dtau_slip_neg) use prec, only: & dNeq0 @@ -631,7 +631,7 @@ end subroutine kinetics_slip !> @details: Shear rates are calculated only optionally. NOTE: Agains the common convention, the !> result (i.e. intent(out)) variables are the last to have the optional arguments at the end !-------------------------------------------------------------------------------------------------- -subroutine kinetics_twin(prm,stt,of,Mp,gdot_twin,dgdot_dtau_twin) +pure subroutine kinetics_twin(prm,stt,of,Mp,gdot_twin,dgdot_dtau_twin) use prec, only: & dNeq0 use math, only: & @@ -697,8 +697,6 @@ function plastic_phenopowerlaw_postResults(Mp,instance,of) result(postResults) integer(pInt) :: & o,c,i,j - real(pReal) :: & - tau_slip_pos, tau_slip_neg real(pReal), dimension(param(instance)%totalNslip) :: & gdot_slip_pos,gdot_slip_neg @@ -725,13 +723,7 @@ function plastic_phenopowerlaw_postResults(Mp,instance,of) result(postResults) c = c + prm%totalNslip case (resolvedstress_slip_ID) do i = 1_pInt, prm%totalNslip - tau_slip_pos = math_mul33xx33(Mp,prm%Schmid_slip(1:3,1:3,i)) - tau_slip_neg = tau_slip_pos - !do j = 1,size(prm%nonSchmidCoeff) - ! tau_slip_pos = tau_slip_pos + math_mul33xx33(S,prm%nonSchmid_pos(1:3,1:3,j,i)) - ! tau_slip_neg = tau_slip_neg + math_mul33xx33(S,prm%nonSchmid_neg(1:3,1:3,j,i)) - !enddo - postResults(c+i) = 0.5_pReal*(tau_slip_pos+tau_slip_neg) + postResults(c+i) = math_mul33xx33(Mp,prm%Schmid_slip(1:3,1:3,i)) enddo c = c + prm%totalNslip