From 7baf4e7f53ca8906caaf08ccd2efd227a2a610b9 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sat, 21 Dec 2019 10:36:42 +0100 Subject: [PATCH] cleaning --- src/damage_local.f90 | 8 +++----- src/damage_nonlocal.f90 | 9 +++------ 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/damage_local.f90 b/src/damage_local.f90 index 93ec5ec7f..b96ea8ca8 100644 --- a/src/damage_local.f90 +++ b/src/damage_local.f90 @@ -46,7 +46,7 @@ contains !-------------------------------------------------------------------------------------------------- subroutine damage_local_init - integer :: maxNinstance,homog,instance,i + integer :: maxNinstance,homog,i integer :: sizeState integer :: NofMyHomog, h integer(kind(undefined_ID)) :: & @@ -87,7 +87,6 @@ subroutine damage_local_init homog = h NofMyHomog = count(material_homogenizationAt == homog) - instance = damage_typeInstance(homog) ! allocate state arrays @@ -203,10 +202,9 @@ subroutine damage_local_results(homog,group) integer, intent(in) :: homog character(len=*), intent(in) :: group - integer :: o, instance + integer :: o - instance = damage_typeInstance(homog) - associate(prm => param(instance)) + associate(prm => param(damage_typeInstance(homog))) outputsLoop: do o = 1,size(prm%outputID) select case(prm%outputID(o)) diff --git a/src/damage_nonlocal.f90 b/src/damage_nonlocal.f90 index 8365cbca5..db9242235 100644 --- a/src/damage_nonlocal.f90 +++ b/src/damage_nonlocal.f90 @@ -49,7 +49,7 @@ contains !-------------------------------------------------------------------------------------------------- subroutine damage_nonlocal_init - integer :: maxNinstance,homog,instance,i + integer :: maxNinstance,homog,i integer :: sizeState integer :: NofMyHomog, h integer(kind(undefined_ID)) :: & @@ -70,7 +70,6 @@ subroutine damage_nonlocal_init associate(prm => param(damage_typeInstance(h)), & config => config_homogenization(h)) - instance = damage_typeInstance(h) outputs = config%getStrings('(output)',defaultVal=emptyStringArray) allocate(prm%outputID(0)) @@ -86,7 +85,6 @@ subroutine damage_nonlocal_init homog = h NofMyHomog = count(material_homogenizationAt == homog) - instance = damage_typeInstance(homog) ! allocate state arrays @@ -237,10 +235,9 @@ subroutine damage_nonlocal_results(homog,group) integer, intent(in) :: homog character(len=*), intent(in) :: group - integer :: o, instance + integer :: o - instance = damage_typeInstance(homog) - associate(prm => param(instance)) + associate(prm => param(damage_typeInstance(homog))) outputsLoop: do o = 1,size(prm%outputID) select case(prm%outputID(o))