From 4dc5dac831a02bcc39481d3ebd26af376a3e1216 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sat, 21 Dec 2019 10:20:50 +0100 Subject: [PATCH] was only needed for postResults --- src/damage_local.f90 | 14 ++------------ src/damage_nonlocal.f90 | 16 ++-------------- 2 files changed, 4 insertions(+), 26 deletions(-) diff --git a/src/damage_local.f90 b/src/damage_local.f90 index fdb6c2206..93ec5ec7f 100644 --- a/src/damage_local.f90 +++ b/src/damage_local.f90 @@ -15,11 +15,6 @@ module damage_local implicit none private - - character(len=64), dimension(:,:), allocatable, target, public :: & - damage_local_output - integer, dimension(:), allocatable, target, public :: & - damage_local_Noutput enum, bind(c) enumerator :: & @@ -60,15 +55,12 @@ subroutine damage_local_init character(len=65536), dimension(:), allocatable :: & outputs - write(6,'(/,a)') ' <<<+- damage_'//DAMAGE_local_label//' init -+>>>' + write(6,'(/,a)') ' <<<+- damage_'//DAMAGE_local_label//' init -+>>>'; flush(6) maxNinstance = count(damage_type == DAMAGE_local_ID) if (maxNinstance == 0) return - allocate(damage_local_output (maxval(homogenization_Noutput),maxNinstance)) - damage_local_output = '' allocate(damage_local_outputID (maxval(homogenization_Noutput),maxNinstance),source=undefined_ID) - allocate(damage_local_Noutput (maxNinstance), source=0) allocate(param(maxNinstance)) @@ -86,9 +78,7 @@ subroutine damage_local_init select case(outputs(i)) case ('damage') - damage_local_output(i,damage_typeInstance(h)) = outputs(i) - damage_local_Noutput(instance) = damage_local_Noutput(instance) + 1 - prm%outputID = [prm%outputID , damage_ID] + prm%outputID = [prm%outputID , damage_ID] end select enddo diff --git a/src/damage_nonlocal.f90 b/src/damage_nonlocal.f90 index bd5a0b2e6..8365cbca5 100644 --- a/src/damage_nonlocal.f90 +++ b/src/damage_nonlocal.f90 @@ -18,11 +18,6 @@ module damage_nonlocal implicit none private - - character(len=64), dimension(:,:), allocatable, target, public :: & - damage_nonlocal_output - integer, dimension(:), allocatable, target, public :: & - damage_nonlocal_Noutput enum, bind(c) enumerator :: & @@ -63,14 +58,10 @@ subroutine damage_nonlocal_init character(len=65536), dimension(:), allocatable :: & outputs - write(6,'(/,a)') ' <<<+- damage_'//DAMAGE_nonlocal_label//' init -+>>>' + write(6,'(/,a)') ' <<<+- damage_'//DAMAGE_nonlocal_label//' init -+>>>'; flush(6) maxNinstance = count(damage_type == DAMAGE_nonlocal_ID) if (maxNinstance == 0) return - - allocate(damage_nonlocal_output (maxval(homogenization_Noutput),maxNinstance)) - damage_nonlocal_output = '' - allocate(damage_nonlocal_Noutput (maxNinstance), source=0) allocate(param(maxNinstance)) @@ -86,11 +77,8 @@ subroutine damage_nonlocal_init do i=1, size(outputs) outputID = undefined_ID select case(outputs(i)) - case ('damage') - damage_nonlocal_output(i,damage_typeInstance(h)) = outputs(i) - damage_nonlocal_Noutput(instance) = damage_nonlocal_Noutput(instance) + 1 - prm%outputID = [prm%outputID , damage_ID] + prm%outputID = [prm%outputID , damage_ID] end select enddo