From 6a0d739d48ec72150c2f1854ee71b4dc85b0a456 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 13 Feb 2019 07:24:48 +0100 Subject: [PATCH] use parameters from param structure --- src/source_damage_isoBrittle.f90 | 10 +--------- src/source_damage_isoDuctile.f90 | 9 +-------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/src/source_damage_isoBrittle.f90 b/src/source_damage_isoBrittle.f90 index 7b9f76009..20dc6eaa3 100644 --- a/src/source_damage_isoBrittle.f90 +++ b/src/source_damage_isoBrittle.f90 @@ -25,9 +25,6 @@ module source_damage_isoBrittle integer(pInt), dimension(:), allocatable, target, public :: & source_damage_isoBrittle_Noutput !< number of outputs per instance of this damage - real(pReal), dimension(:), allocatable, private :: & - source_damage_isoBrittle_critStrainEnergy - enum, bind(c) enumerator :: undefined_ID, & damage_drivingforce_ID @@ -141,8 +138,6 @@ subroutine source_damage_isoBrittle_init(fileUnit) allocate(source_damage_isoBrittle_outputID(maxval(phase_Noutput),Ninstance), source=undefined_ID) allocate(source_damage_isoBrittle_Noutput(Ninstance), source=0_pInt) - allocate(source_damage_isoBrittle_critStrainEnergy(Ninstance), source=0.0_pReal) - allocate(param(Ninstance)) do p=1, size(config_phase) @@ -196,9 +191,6 @@ subroutine source_damage_isoBrittle_init(fileUnit) IO_lc(IO_stringValue(line,chunkPos,2_pInt)) end select - case ('isobrittle_criticalstrainenergy') - source_damage_isoBrittle_critStrainEnergy(instance) = IO_floatValue(line,chunkPos,2_pInt) - end select endif; endif enddo parsingFile @@ -275,7 +267,7 @@ subroutine source_damage_isoBrittle_deltaState(C, Fe, ipc, ip, el) strain = 0.5_pReal*math_Mandel33to6(math_mul33x33(math_transpose33(Fe),Fe)-math_I3) strainenergy = 2.0_pReal*sum(strain*math_mul66x6(stiffness,strain))/ & - source_damage_isoBrittle_critStrainEnergy(instance) + param(instances)%critStrainEnergy if (strainenergy > sourceState(phase)%p(sourceOffset)%subState0(1,constituent)) then sourceState(phase)%p(sourceOffset)%deltaState(1,constituent) = & strainenergy - sourceState(phase)%p(sourceOffset)%state(1,constituent) diff --git a/src/source_damage_isoDuctile.f90 b/src/source_damage_isoDuctile.f90 index 3613a29a9..7186f8749 100644 --- a/src/source_damage_isoDuctile.f90 +++ b/src/source_damage_isoDuctile.f90 @@ -25,8 +25,6 @@ module source_damage_isoDuctile integer(pInt), dimension(:), allocatable, target, public :: & source_damage_isoDuctile_Noutput !< number of outputs per instance of this damage - real(pReal), dimension(:), allocatable, private :: & - source_damage_isoDuctile_critPlasticStrain enum, bind(c) enumerator :: undefined_ID, & @@ -142,8 +140,6 @@ subroutine source_damage_isoDuctile_init(fileUnit) allocate(source_damage_isoDuctile_outputID(maxval(phase_Noutput),Ninstance), source=undefined_ID) allocate(source_damage_isoDuctile_Noutput(Ninstance), source=0_pInt) - allocate(source_damage_isoDuctile_critPlasticStrain(Ninstance), source=0.0_pReal) - allocate(param(Ninstance)) do p=1, size(config_phase) @@ -197,9 +193,6 @@ subroutine source_damage_isoDuctile_init(fileUnit) IO_lc(IO_stringValue(line,chunkPos,2_pInt)) end select - case ('isoductile_criticalplasticstrain') - source_damage_isoDuctile_critPlasticStrain(instance) = IO_floatValue(line,chunkPos,2_pInt) - end select endif; endif enddo parsingFile @@ -262,7 +255,7 @@ subroutine source_damage_isoDuctile_dotState(ipc, ip, el) sourceState(phase)%p(sourceOffset)%dotState(1,constituent) = & sum(plasticState(phase)%slipRate(:,constituent))/ & ((damage(homog)%p(damageOffset))**param(instance)%N)/ & - source_damage_isoDuctile_critPlasticStrain(instance) + param(instance)%critPlasticStrain end subroutine source_damage_isoDuctile_dotState