From d5bdcf5a6d22c3288374b79d74e7b1ed1c428c08 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Fri, 13 Dec 2013 14:14:17 +0000 Subject: [PATCH] some small improvements, still something wrong, probably in crystallite.f90 --- code/crystallite.f90 | 4 ++-- code/material.f90 | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/code/crystallite.f90 b/code/crystallite.f90 index 3e85cfa21..d103facbf 100644 --- a/code/crystallite.f90 +++ b/code/crystallite.f90 @@ -220,7 +220,7 @@ subroutine crystallite_init(temperature) section = 0_pInt, & j, & p, & - output, & + output = 0_pInt, & mySize, & myPhase, & myMat @@ -316,7 +316,7 @@ subroutine crystallite_init(temperature) case ('(output)') output = output + 1_pInt crystallite_output(output,section) = IO_lc(IO_stringValue(line,positions,2_pInt)) - select case(IO_lc(IO_stringValue(line,positions,2_pInt))) + select case(crystallite_output(output,section)) case ('phase') crystallite_outputID(output,section) = phase_ID case ('texture') diff --git a/code/material.f90 b/code/material.f90 index dc86caddb..82d60a59b 100644 --- a/code/material.f90 +++ b/code/material.f90 @@ -74,8 +74,10 @@ module material MATERIAL_partPhase = 'phase' !< keyword for phase part integer(kind(ELASTICITY_undefined_ID)), dimension(:), allocatable, public, protected :: & - phase_elasticity, & !< elasticity of each phase - phase_plasticity, & !< plasticity of each phase + phase_elasticity !< elasticity of each phase + integer(kind(PLASTICITY_undefined_ID)), dimension(:), allocatable, public, protected :: & + phase_plasticity !< plasticity of each phase + integer(kind(HOMOGENIZATION_undefined_ID)), dimension(:), allocatable, public, protected :: & homogenization_type !< type of each homogenization character(len=64), dimension(:), allocatable, public, protected :: &