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

simpler API

This commit is contained in:
Martin Diehl 2018-11-30 10:04:41 +01:00
parent f02fa9b7b0
commit bbba201362
2 changed files with 22 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/constitutive.f90
View File

@ -926,8 +926,9 @@ subroutine constitutive_collectDotState(S6, FeArray, Fi, FpArray, subdt, subfrac
call plastic_dislotwin_dotState (Mp,temperature(ho)%p(tme),instance,of)
case (PLASTICITY_DISLOUCLA_ID) plasticityType
call plastic_disloucla_dotState (Mp,temperature(ho)%p(tme), &
ipc,ip,el)
of = phasememberAt(ipc,ip,el)
instance = phase_plasticityInstance(material_phase(ipc,ip,el))
call plastic_disloucla_dotState (Mp,temperature(ho)%p(tme),instance,of)
case (PLASTICITY_NONLOCAL_ID) plasticityType
call plastic_nonlocal_dotState (math_Mandel33to6(Mp),FeArray,FpArray,temperature(ho)%p(tme), &
@ -1153,8 +1154,10 @@ function constitutive_postResults(S6, Fi, FeArray, ipc, ip, el)
plastic_dislotwin_postResults(Mp,temperature(ho)%p(tme),instance,of)
case (PLASTICITY_DISLOUCLA_ID) plasticityType
of = phasememberAt(ipc,ip,el)
instance = phase_plasticityInstance(material_phase(ipc,ip,el))
constitutive_postResults(startPos:endPos) = &
plastic_disloucla_postResults(Mp,temperature(ho)%p(tme),ipc,ip,el)
plastic_disloucla_postResults(Mp,temperature(ho)%p(tme),instance,of)
case (PLASTICITY_NONLOCAL_ID) plasticityType
constitutive_postResults(startPos:endPos) = &

49
src/plastic_disloUCLA.f90
View File

@ -106,7 +106,8 @@ module plastic_disloUCLA
real(pReal), pointer, dimension(:,:) :: &
rhoEdge, &
rhoEdgeDip, &
accshear_slip
accshear_slip, &
whole
end type
type, private :: tDisloUCLAMicrostructure
@ -447,6 +448,8 @@ plastic_disloUCLA_Noutput(phase_plasticityInstance(p)) = plastic_disloUCLA_Noutp
dotState(instance)%accshear_slip=>plasticState(phase)%dotState(startIndex:endIndex,:)
plasticState(p)%aTolState(startIndex:endIndex) = 1e6_pReal
dotState(instance)%whole => plasticState(phase)%dotState
allocate(mse%mfp(prm%totalNslip,NofMyPhase),source=0.0_pReal)
allocate(mse%threshold_stress(prm%totalNslip,NofMyPhase),source=0.0_pReal)
@ -565,17 +568,12 @@ end subroutine plastic_disloUCLA_LpAndItsTangent
!--------------------------------------------------------------------------------------------------
!> @brief calculates the rate of change of microstructure
!--------------------------------------------------------------------------------------------------
subroutine plastic_disloUCLA_dotState(Mp,Temperature,ipc,ip,el)
subroutine plastic_disloUCLA_dotState(Mp,Temperature,instance,of)
use prec, only: &
tol_math_check, &
dEq0
use math, only: &
pi
use material, only: &
material_phase, &
phase_plasticityInstance, &
plasticState, &
phaseAt, phasememberAt
implicit none
real(pReal), dimension(3,3), intent(in):: &
@ -583,12 +581,9 @@ subroutine plastic_disloUCLA_dotState(Mp,Temperature,ipc,ip,el)
real(pReal), intent(in) :: &
temperature !< temperature at integration point
integer(pInt), intent(in) :: &
ipc, & !< component-ID of integration point
ip, & !< integration point
el !< element
instance, of
integer(pInt) :: ns,j
integer(pInt) :: instance,ns,j, &
of
real(pReal) :: &
EdgeDipMinDistance,&
AtomicVolume,&
@ -600,18 +595,15 @@ subroutine plastic_disloUCLA_dotState(Mp,Temperature,ipc,ip,el)
ClimbVelocity, &
DotRhoEdgeDipClimb, &
DotRhoDipFormation
real(pReal), dimension(plastic_disloUCLA_totalNslip(phase_plasticityInstance(material_phase(ipc,ip,el)))) :: &
real(pReal), dimension(plastic_disloUCLA_totalNslip(instance)) :: &
gdot_slip_pos, gdot_slip_neg,&
tau_slip_pos,&
tau_slip_neg, &
dgdot_dtauslip_neg,dgdot_dtauslip_pos
!* Shortened notation
of = phasememberAt(ipc,ip,el)
instance = phase_plasticityInstance(phaseAt(ipc,ip,el))
ns = plastic_disloUCLA_totalNslip(instance)
dotState(instance)%whole(:,of) = 0.0_pReal
plasticState(phaseAt(ipc,ip,el))%dotState(:,of) = 0.0_pReal
associate(prm => param(instance), stt => state(instance),mse => microstructure(instance))
!* Dislocation density evolution
call kinetics(Mp,Temperature,instance,of, &
@ -684,18 +676,13 @@ end subroutine plastic_disloUCLA_dotState
!--------------------------------------------------------------------------------------------------
!> @brief return array of constitutive results
!--------------------------------------------------------------------------------------------------
function plastic_disloUCLA_postResults(Mp,Temperature,ipc,ip,el) result(postResults)
function plastic_disloUCLA_postResults(Mp,Temperature,instance,of) result(postResults)
use prec, only: &
tol_math_check, &
dEq, dNeq0
use math, only: &
pi, &
math_mul33xx33
use material, only: &
material_phase, &
phase_plasticityInstance,&
!plasticState, &
phaseAt, phasememberAt
implicit none
real(pReal), dimension(3,3), intent(in) :: &
@ -703,27 +690,19 @@ math_mul33xx33
real(pReal), intent(in) :: &
temperature !< temperature at integration point
integer(pInt), intent(in) :: &
ipc, & !< component-ID of integration point
ip, & !< integration point
el !< element
instance,of
real(pReal), dimension(plastic_disloUCLA_sizePostResults(phase_plasticityInstance(material_phase(ipc,ip,el)))) :: &
real(pReal), dimension(plastic_disloUCLA_sizePostResults(instance)) :: &
postResults
integer(pInt) :: &
instance,&
ns,&
o,c,j,&
of
real(pReal), dimension(plastic_disloUCLA_totalNslip(phase_plasticityInstance(material_phase(ipc,ip,el)))) :: &
o,c,j
real(pReal), dimension(plastic_disloUCLA_totalNslip(instance)) :: &
gdot_slip_pos,dgdot_dtauslip_pos,tau_slip_pos,gdot_slip_neg,dgdot_dtauslip_neg,tau_slip_neg
!* Shortened notation
of = phasememberAt(ipc,ip,el)
instance = phase_plasticityInstance(phaseAt(ipc,ip,el))
ns = plastic_disloUCLA_totalNslip(instance)
!* Required output
c = 0_pInt
postResults = 0.0_pReal
associate (prm => param(instance),stt =>state(instance),mse => microstructure(instance))