From e795e72df72201c93d8f68c925ec1fbd369e5bc4 Mon Sep 17 00:00:00 2001 From: Sharan Roongta Date: Wed, 28 Apr 2021 23:29:57 +0200 Subject: [PATCH] new names --- src/phase.f90 | 1 - src/phase_mechanical.f90 | 4 ++-- src/phase_mechanical_elastic.f90 | 10 +++++----- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/phase.f90 b/src/phase.f90 index 9c7a548d1..927ba6b2b 100644 --- a/src/phase.f90 +++ b/src/phase.f90 @@ -294,7 +294,6 @@ module phase end interface - type(tDebugOptions) :: debugConstitutive #if __INTEL_COMPILER >= 1900 public :: & diff --git a/src/phase_mechanical.f90 b/src/phase_mechanical.f90 index 1f1f489a9..00b8e3667 100644 --- a/src/phase_mechanical.f90 +++ b/src/phase_mechanical.f90 @@ -55,10 +55,10 @@ submodule(phase) mechanical module 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) :: & ph, & - me + en real(pReal), intent(in), dimension(3,3) :: & Fe, & !< elastic deformation gradient Fi !< intermediate deformation gradient diff --git a/src/phase_mechanical_elastic.f90 b/src/phase_mechanical_elastic.f90 index 9113aa45e..0e11c3888 100644 --- a/src/phase_mechanical_elastic.f90 +++ b/src/phase_mechanical_elastic.f90 @@ -41,7 +41,7 @@ module subroutine elastic_init(phases) phase => phases%get(ph) mech => phase%get('mechanical') 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 else 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 !-------------------------------------------------------------------------------------------------- module subroutine phase_hooke_SandItsTangents(S, dS_dFe, dS_dFi, & - Fe, Fi, ph, me) + Fe, Fi, ph, en) integer, intent(in) :: & ph, & - me + en real(pReal), intent(in), dimension(3,3) :: & Fe, & !< elastic 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 i, j - C = math_66toSym3333(phase_homogenizedC(ph,me)) + C = math_66toSym3333(phase_homogenizedC(ph,en)) DegradationLoop: do d = 1, phase_NstiffnessDegradations(ph) degradationType: select case(phase_stiffnessDegradation(d,ph)) case (STIFFNESS_DEGRADATION_damage_ID) degradationType - C = C * damage_phi(ph,me)**2 + C = C * damage_phi(ph,en)**2 end select degradationType enddo DegradationLoop