consistent interface
This commit is contained in:
parent
5eb44969cc
commit
16f7af4c27
|
@ -109,7 +109,7 @@ module subroutine damage_nonlocal_getSourceAndItsTangent(phiDot, phi, ce)
|
||||||
real(pReal), intent(out) :: &
|
real(pReal), intent(out) :: &
|
||||||
phiDot
|
phiDot
|
||||||
|
|
||||||
phiDot = phase_damage_phi_dot(phi, ce)
|
phiDot = phase_damage_phi_dot(phi, 1, ce)
|
||||||
|
|
||||||
end subroutine damage_nonlocal_getSourceAndItsTangent
|
end subroutine damage_nonlocal_getSourceAndItsTangent
|
||||||
|
|
||||||
|
|
|
@ -227,8 +227,8 @@ module phase
|
||||||
end function phase_homogenizedC
|
end function phase_homogenizedC
|
||||||
|
|
||||||
|
|
||||||
module function phase_damage_phi_dot(phi, ce) result(phi_dot)
|
module function phase_damage_phi_dot(phi,co,ce) result(phi_dot)
|
||||||
integer, intent(in) :: ce
|
integer, intent(in) :: ce,co
|
||||||
real(pReal), intent(in) :: &
|
real(pReal), intent(in) :: &
|
||||||
phi !< damage parameter
|
phi !< damage parameter
|
||||||
real(pReal) :: &
|
real(pReal) :: &
|
||||||
|
|
|
@ -142,9 +142,9 @@ end subroutine damage_init
|
||||||
!----------------------------------------------------------------------------------------------
|
!----------------------------------------------------------------------------------------------
|
||||||
!< @brief returns local part of nonlocal damage driving force
|
!< @brief returns local part of nonlocal damage driving force
|
||||||
!----------------------------------------------------------------------------------------------
|
!----------------------------------------------------------------------------------------------
|
||||||
module function phase_damage_phi_dot(phi, ce) result(phi_dot)
|
module function phase_damage_phi_dot(phi,co,ce) result(phi_dot)
|
||||||
|
|
||||||
integer, intent(in) :: ce
|
integer, intent(in) :: ce,co
|
||||||
real(pReal), intent(in) :: &
|
real(pReal), intent(in) :: &
|
||||||
phi !< damage parameter
|
phi !< damage parameter
|
||||||
real(pReal) :: &
|
real(pReal) :: &
|
||||||
|
@ -154,8 +154,8 @@ module function phase_damage_phi_dot(phi, ce) result(phi_dot)
|
||||||
ph, &
|
ph, &
|
||||||
me
|
me
|
||||||
|
|
||||||
ph = material_phaseID(1,ce)
|
ph = material_phaseID(co,ce)
|
||||||
me = material_phaseEntry(1,ce)
|
me = material_phaseEntry(co,ce)
|
||||||
|
|
||||||
phi_dot = 1.0_pReal &
|
phi_dot = 1.0_pReal &
|
||||||
- phi*damageState(ph)%state(1,me)
|
- phi*damageState(ph)%state(1,me)
|
||||||
|
|
Loading…
Reference in New Issue