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

same name in all models

This commit is contained in:
Martin Diehl 2019-02-20 14:54:26 +01:00
parent 838faca819
commit eb394b3139
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/constitutive.f90
View File

@ -358,7 +358,7 @@ subroutine constitutive_microstructure(orientations, Fe, Fp, ipc, ip, el)
PLASTICITY_disloucla_ID, & PLASTICITY_disloucla_ID, &
PLASTICITY_nonlocal_ID PLASTICITY_nonlocal_ID
use plastic_nonlocal, only: & use plastic_nonlocal, only: &
plastic_nonlocal_microstructure plastic_nonlocal_dependentState
use plastic_dislotwin, only: & use plastic_dislotwin, only: &
plastic_dislotwin_dependentState plastic_dislotwin_dependentState
use plastic_disloUCLA, only: & use plastic_disloUCLA, only: &

13
src/plastic_nonlocal.f90
View File

@ -238,7 +238,7 @@ module plastic_nonlocal
plastic_nonlocal_init, & plastic_nonlocal_init, &
plastic_nonlocal_stateInit, & plastic_nonlocal_stateInit, &
plastic_nonlocal_aTolState, & plastic_nonlocal_aTolState, &
plastic_nonlocal_microstructure, & plastic_nonlocal_dependentState, &
plastic_nonlocal_LpAndItsTangent, & plastic_nonlocal_LpAndItsTangent, &
plastic_nonlocal_dotState, & plastic_nonlocal_dotState, &
plastic_nonlocal_deltaState, & plastic_nonlocal_deltaState, &
@ -1126,7 +1126,7 @@ end subroutine plastic_nonlocal_aTolState
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
!> @brief calculates quantities characterizing the microstructure !> @brief calculates quantities characterizing the microstructure
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
subroutine plastic_nonlocal_microstructure(Fe, Fp, ip, el) subroutine plastic_nonlocal_dependentState(Fe, Fp, ip, el)
use prec, only: & use prec, only: &
dEq0 dEq0
use IO, only: & use IO, only: &
@ -1284,6 +1284,13 @@ forall (s = 1_pInt:ns) &
tauBack = 0.0_pReal tauBack = 0.0_pReal
!#################################################################################################
!#################################################################################################
! ToDo: MD: this is most likely only correct for F_i = I
!#################################################################################################
!#################################################################################################
if (.not. phase_localPlasticity(ph) .and. prm%shortRangeStressCorrection) then if (.not. phase_localPlasticity(ph) .and. prm%shortRangeStressCorrection) then
invFe = math_inv33(Fe) invFe = math_inv33(Fe)
invFp = math_inv33(Fp) invFp = math_inv33(Fp)
@ -1406,7 +1413,7 @@ plasticState(ph)%state(iTauB(1:ns,instance),of) = tauBack
endif endif
#endif #endif
end associate end associate
end subroutine plastic_nonlocal_microstructure end subroutine plastic_nonlocal_dependentState
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------