From 038dd1fc40dadd20ffb52f5289d89f69167faf18 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 18 Nov 2021 21:31:08 +0100 Subject: [PATCH] correct names whether C66 is homogenized or not is a decision of the caller --- src/phase.f90 | 6 +++--- src/phase_damage.f90 | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/phase.f90 b/src/phase.f90 index 2159dba00..dc8525939 100644 --- a/src/phase.f90 +++ b/src/phase.f90 @@ -234,10 +234,10 @@ module phase integer, intent(in) :: ph, en real(pReal), dimension(6,6) :: C end function phase_homogenizedC66 - module function phase_damage_C66(C66_homogenized,ph,en) result(C66) - real(pReal), dimension(6,6), intent(in) :: C66_homogenized + module function phase_damage_C66(C66,ph,en) + real(pReal), dimension(6,6), intent(in) :: C66 integer, intent(in) :: ph,en - real(pReal), dimension(6,6) :: C66 + real(pReal), dimension(6,6) :: phase_damage_C66 end function phase_damage_C66 module function phase_f_phi(phi,co,ce) result(f) diff --git a/src/phase_damage.f90 b/src/phase_damage.f90 index 78322d7f4..5382d65e3 100644 --- a/src/phase_damage.f90 +++ b/src/phase_damage.f90 @@ -151,18 +151,18 @@ end function phase_damage_constitutive !-------------------------------------------------------------------------------------------------- !> @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 - real(pReal), dimension(6,6) :: C66 + real(pReal), dimension(6,6) :: phase_damage_C66 damageType: select case (phase_damage(ph)) 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 - C66 = C66_homogenized + phase_damage_C66 = C66 end select damageType end function phase_damage_C66