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

new names

This commit is contained in:
Sharan Roongta 2021-04-28 23:29:57 +02:00
parent 7e9133621a
commit e795e72df7
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/phase.f90
View File

@ -294,7 +294,6 @@ module phase
end interface end interface
type(tDebugOptions) :: debugConstitutive type(tDebugOptions) :: debugConstitutive
#if __INTEL_COMPILER >= 1900 #if __INTEL_COMPILER >= 1900
public :: & public :: &

4
src/phase_mechanical.f90
View File

@ -55,10 +55,10 @@ submodule(phase) mechanical
module subroutine plastic_init module subroutine plastic_init
end subroutine plastic_init end subroutine plastic_init
module subroutine phase_hooke_SandItsTangents(S,dS_dFe,dS_dFi,Fe,Fi,ph,me) module subroutine phase_hooke_SandItsTangents(S,dS_dFe,dS_dFi,Fe,Fi,ph,en)
integer, intent(in) :: & integer, intent(in) :: &
ph, & ph, &
me en
real(pReal), intent(in), dimension(3,3) :: & real(pReal), intent(in), dimension(3,3) :: &
Fe, & !< elastic deformation gradient Fe, & !< elastic deformation gradient
Fi !< intermediate deformation gradient Fi !< intermediate deformation gradient

10
src/phase_mechanical_elastic.f90
View File

@ -41,7 +41,7 @@ module subroutine elastic_init(phases)
phase => phases%get(ph) phase => phases%get(ph)
mech => phase%get('mechanical') mech => phase%get('mechanical')
elastic => mech%get('elastic') elastic => mech%get('elastic')
if(elastic%get_asString('type') == 'hooke') then if(IO_lc(elastic%get_asString('type')) == 'hooke') then ! accept small letter h for the moment
phase_elasticity(ph) = ELASTICITY_HOOKE_ID phase_elasticity(ph) = ELASTICITY_HOOKE_ID
else else
call IO_error(200,ext_msg=elastic%get_asString('type')) call IO_error(200,ext_msg=elastic%get_asString('type'))
@ -73,11 +73,11 @@ end subroutine elastic_init
!> the elastic and intermediate deformation gradients using Hooke's law !> the elastic and intermediate deformation gradients using Hooke's law
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------
module subroutine phase_hooke_SandItsTangents(S, dS_dFe, dS_dFi, & module subroutine phase_hooke_SandItsTangents(S, dS_dFe, dS_dFi, &
Fe, Fi, ph, me) Fe, Fi, ph, en)
integer, intent(in) :: & integer, intent(in) :: &
ph, & ph, &
me en
real(pReal), intent(in), dimension(3,3) :: & real(pReal), intent(in), dimension(3,3) :: &
Fe, & !< elastic deformation gradient Fe, & !< elastic deformation gradient
Fi !< intermediate deformation gradient Fi !< intermediate deformation gradient
@ -93,12 +93,12 @@ module subroutine phase_hooke_SandItsTangents(S, dS_dFe, dS_dFi, &
d, & !< counter in degradation loop d, & !< counter in degradation loop
i, j i, j
C = math_66toSym3333(phase_homogenizedC(ph,me)) C = math_66toSym3333(phase_homogenizedC(ph,en))
DegradationLoop: do d = 1, phase_NstiffnessDegradations(ph) DegradationLoop: do d = 1, phase_NstiffnessDegradations(ph)
degradationType: select case(phase_stiffnessDegradation(d,ph)) degradationType: select case(phase_stiffnessDegradation(d,ph))
case (STIFFNESS_DEGRADATION_damage_ID) degradationType case (STIFFNESS_DEGRADATION_damage_ID) degradationType
C = C * damage_phi(ph,me)**2 C = C * damage_phi(ph,en)**2
end select degradationType end select degradationType
enddo DegradationLoop enddo DegradationLoop