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

Merge branch 'development' into 44-column-major-access-to-interaction-matrices

This commit is contained in:
Martin Diehl 2018-10-05 11:11:20 +02:00
parent 40cf7f134d 47a748831f
commit 2a51e528bd
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
v2.0.2-591-ga00d15b8 v2.0.2-638-gd5cf7d21

14
src/plastic_phenopowerlaw.f90
View File

@ -570,7 +570,7 @@ end subroutine plastic_phenopowerlaw_dotState
!> @details: Shear rates are calculated only optionally. NOTE: Agains the common convention, the !> @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 !> 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) dgdot_dtau_slip_pos,dgdot_dtau_slip_neg)
use prec, only: & use prec, only: &
dNeq0 dNeq0
@ -631,7 +631,7 @@ end subroutine kinetics_slip
!> @details: Shear rates are calculated only optionally. NOTE: Agains the common convention, the !> @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 !> 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: & use prec, only: &
dNeq0 dNeq0
use math, only: & use math, only: &
@ -697,8 +697,6 @@ function plastic_phenopowerlaw_postResults(Mp,instance,of) result(postResults)
integer(pInt) :: & integer(pInt) :: &
o,c,i,j o,c,i,j
real(pReal) :: &
tau_slip_pos, tau_slip_neg
real(pReal), dimension(param(instance)%totalNslip) :: & real(pReal), dimension(param(instance)%totalNslip) :: &
gdot_slip_pos,gdot_slip_neg gdot_slip_pos,gdot_slip_neg
@ -725,13 +723,7 @@ function plastic_phenopowerlaw_postResults(Mp,instance,of) result(postResults)
c = c + prm%totalNslip c = c + prm%totalNslip
case (resolvedstress_slip_ID) case (resolvedstress_slip_ID)
do i = 1_pInt, prm%totalNslip do i = 1_pInt, prm%totalNslip
tau_slip_pos = math_mul33xx33(Mp,prm%Schmid_slip(1:3,1:3,i)) postResults(c+i) = 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)
enddo enddo
c = c + prm%totalNslip c = c + prm%totalNslip