From 1eb1e54f78f67e70cac35372c3766475ea853bf9 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 6 May 2021 08:47:30 +0200 Subject: [PATCH] adjustment to new structure/names was missing reason: test missing/not good --- src/phase_mechanical_eigen.f90 | 2 +- src/phase_mechanical_eigen_thermalexpansion.f90 | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/phase_mechanical_eigen.f90 b/src/phase_mechanical_eigen.f90 index 8587b2bc8..b34aee58b 100644 --- a/src/phase_mechanical_eigen.f90 +++ b/src/phase_mechanical_eigen.f90 @@ -70,7 +70,7 @@ module subroutine eigendeformation_init(phases) allocate(model_damage(phases%length), source = KINEMATICS_UNDEFINED_ID) where(damage_anisobrittle_init()) model_damage = KINEMATICS_cleavage_opening_ID - where(damage_isoductile_init()) model_damage = KINEMATICS_slipplane_opening_ID + where(damage_isoductile_init()) model_damage = KINEMATICS_slipplane_opening_ID end subroutine eigendeformation_init diff --git a/src/phase_mechanical_eigen_thermalexpansion.f90 b/src/phase_mechanical_eigen_thermalexpansion.f90 index e47db4f37..cee60d675 100644 --- a/src/phase_mechanical_eigen_thermalexpansion.f90 +++ b/src/phase_mechanical_eigen_thermalexpansion.f90 @@ -33,14 +33,16 @@ module function thermalexpansion_init(kinematics_length) result(myKinematics) class(tNode), pointer :: & phases, & phase, & + mech, & kinematics, & kinematic_type print'(/,a)', ' <<<+- phase:mechanical:eigen:thermalexpansion init -+>>>' - myKinematics = kinematics_active('thermal_expansion',kinematics_length) + myKinematics = kinematics_active('thermalexpansion',kinematics_length) + print*, myKinematics Ninstances = count(myKinematics) - print'(a,i2)', ' # instances: ',Ninstances; flush(IO_STDOUT) + print'(a,i2)', ' # phases: ',Ninstances; flush(IO_STDOUT) if(Ninstances == 0) return phases => config_material%get('phase') @@ -51,7 +53,8 @@ module function thermalexpansion_init(kinematics_length) result(myKinematics) if(any(myKinematics(:,p))) kinematics_thermal_expansion_instance(p) = count(myKinematics(:,1:p)) phase => phases%get(p) if(count(myKinematics(:,p)) == 0) cycle - kinematics => phase%get('kinematics') + mech => phase%get('mechanical') + kinematics => mech%get('eigen') do k = 1, kinematics%length if(myKinematics(k,p)) then associate(prm => param(kinematics_thermal_expansion_instance(p)))