From 16f7af4c27c2649898d281e74fe862f900d16169 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 7 Apr 2021 13:02:42 +0200 Subject: [PATCH] consistent interface --- src/homogenization_damage.f90 | 2 +- src/phase.f90 | 4 ++-- src/phase_damage.f90 | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/homogenization_damage.f90 b/src/homogenization_damage.f90 index fa1eaab3f..0fe06e8fe 100644 --- a/src/homogenization_damage.f90 +++ b/src/homogenization_damage.f90 @@ -109,7 +109,7 @@ module subroutine damage_nonlocal_getSourceAndItsTangent(phiDot, phi, ce) real(pReal), intent(out) :: & phiDot - phiDot = phase_damage_phi_dot(phi, ce) + phiDot = phase_damage_phi_dot(phi, 1, ce) end subroutine damage_nonlocal_getSourceAndItsTangent diff --git a/src/phase.f90 b/src/phase.f90 index d391e78cf..81e5ab250 100644 --- a/src/phase.f90 +++ b/src/phase.f90 @@ -227,8 +227,8 @@ module phase end function phase_homogenizedC - module function phase_damage_phi_dot(phi, ce) result(phi_dot) - integer, intent(in) :: ce + module function phase_damage_phi_dot(phi,co,ce) result(phi_dot) + integer, intent(in) :: ce,co real(pReal), intent(in) :: & phi !< damage parameter real(pReal) :: & diff --git a/src/phase_damage.f90 b/src/phase_damage.f90 index 56f53c7bd..4a1084cbf 100644 --- a/src/phase_damage.f90 +++ b/src/phase_damage.f90 @@ -142,9 +142,9 @@ end subroutine damage_init !---------------------------------------------------------------------------------------------- !< @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) :: & phi !< damage parameter real(pReal) :: & @@ -154,8 +154,8 @@ module function phase_damage_phi_dot(phi, ce) result(phi_dot) ph, & me - ph = material_phaseID(1,ce) - me = material_phaseEntry(1,ce) + ph = material_phaseID(co,ce) + me = material_phaseEntry(co,ce) phi_dot = 1.0_pReal & - phi*damageState(ph)%state(1,me)