correct names
whether C66 is homogenized or not is a decision of the caller
This commit is contained in:
parent
dfe6d0a195
commit
038dd1fc40
|
@ -234,10 +234,10 @@ module phase
|
||||||
integer, intent(in) :: ph, en
|
integer, intent(in) :: ph, en
|
||||||
real(pReal), dimension(6,6) :: C
|
real(pReal), dimension(6,6) :: C
|
||||||
end function phase_homogenizedC66
|
end function phase_homogenizedC66
|
||||||
module function phase_damage_C66(C66_homogenized,ph,en) result(C66)
|
module function phase_damage_C66(C66,ph,en)
|
||||||
real(pReal), dimension(6,6), intent(in) :: C66_homogenized
|
real(pReal), dimension(6,6), intent(in) :: C66
|
||||||
integer, intent(in) :: ph,en
|
integer, intent(in) :: ph,en
|
||||||
real(pReal), dimension(6,6) :: C66
|
real(pReal), dimension(6,6) :: phase_damage_C66
|
||||||
end function phase_damage_C66
|
end function phase_damage_C66
|
||||||
|
|
||||||
module function phase_f_phi(phi,co,ce) result(f)
|
module function phase_f_phi(phi,co,ce) result(f)
|
||||||
|
|
|
@ -151,18 +151,18 @@ end function phase_damage_constitutive
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
!> @brief returns the degraded/modified elasticity matrix
|
!> @brief returns the degraded/modified elasticity matrix
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
module function phase_damage_C66(C66_homogenized,ph,en) result(C66)
|
module function phase_damage_C66(C66,ph,en)
|
||||||
|
|
||||||
real(pReal), dimension(6,6), intent(in) :: C66_homogenized
|
real(pReal), dimension(6,6), intent(in) :: C66
|
||||||
integer, intent(in) :: ph,en
|
integer, intent(in) :: ph,en
|
||||||
real(pReal), dimension(6,6) :: C66
|
real(pReal), dimension(6,6) :: phase_damage_C66
|
||||||
|
|
||||||
|
|
||||||
damageType: select case (phase_damage(ph))
|
damageType: select case (phase_damage(ph))
|
||||||
case (DAMAGE_ISOBRITTLE_ID) damageType
|
case (DAMAGE_ISOBRITTLE_ID) damageType
|
||||||
C66 = C66_homogenized * damage_phi(ph,en)**2
|
phase_damage_C66 = C66 * damage_phi(ph,en)**2
|
||||||
case default damageType
|
case default damageType
|
||||||
C66 = C66_homogenized
|
phase_damage_C66 = C66
|
||||||
end select damageType
|
end select damageType
|
||||||
|
|
||||||
end function phase_damage_C66
|
end function phase_damage_C66
|
||||||
|
|
Loading…
Reference in New Issue