From 79071512c8832d5b64d8f62d809ea7ae0b6e8fa5 Mon Sep 17 00:00:00 2001 From: Sharan Roongta Date: Tue, 3 Nov 2020 11:51:57 +0100 Subject: [PATCH] missed out --- src/kinematics_cleavage_opening.f90 | 4 +--- src/kinematics_slipplane_opening.f90 | 6 ++++-- src/kinematics_thermal_expansion.f90 | 2 -- src/source_damage_anisoDuctile.f90 | 6 ++++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/kinematics_cleavage_opening.f90 b/src/kinematics_cleavage_opening.f90 index 44bbcb4f4..66bce6a92 100644 --- a/src/kinematics_cleavage_opening.f90 +++ b/src/kinematics_cleavage_opening.f90 @@ -41,7 +41,6 @@ module function kinematics_cleavage_opening_init(kinematics_length) result(myKin class(tNode), pointer :: & phases, & phase, & - pl, & kinematics, & kinematic_type @@ -58,8 +57,7 @@ module function kinematics_cleavage_opening_init(kinematics_length) result(myKin do p = 1, phases%length if(any(myKinematics(:,p))) kinematics_cleavage_opening_instance(p) = count(myKinematics(:,1:p)) - phase => phases%get(p) - pl => phase%get('plasticity') + phase => phases%get(p) if(count(myKinematics(:,p)) == 0) cycle kinematics => phase%get('kinematics') do k = 1, kinematics%length diff --git a/src/kinematics_slipplane_opening.f90 b/src/kinematics_slipplane_opening.f90 index ea8f51427..7e45a7a05 100644 --- a/src/kinematics_slipplane_opening.f90 +++ b/src/kinematics_slipplane_opening.f90 @@ -44,6 +44,7 @@ module function kinematics_slipplane_opening_init(kinematics_length) result(myKi class(tNode), pointer :: & phases, & phase, & + mech, & pl, & kinematics, & kinematic_type @@ -61,8 +62,9 @@ module function kinematics_slipplane_opening_init(kinematics_length) result(myKi do p = 1, phases%length if(any(myKinematics(:,p))) kinematics_slipplane_opening_instance(p) = count(myKinematics(:,1:p)) - phase => phases%get(p) - pl => phase%get('plasticity') + phase => phases%get(p) + mech => phase%get('mech') + pl => mech%get('plasticity') if(count(myKinematics(:,p)) == 0) cycle kinematics => phase%get('kinematics') do k = 1, kinematics%length diff --git a/src/kinematics_thermal_expansion.f90 b/src/kinematics_thermal_expansion.f90 index 4afde82e3..2b8b04d85 100644 --- a/src/kinematics_thermal_expansion.f90 +++ b/src/kinematics_thermal_expansion.f90 @@ -34,7 +34,6 @@ module function kinematics_thermal_expansion_init(kinematics_length) result(myKi class(tNode), pointer :: & phases, & phase, & - pl, & kinematics, & kinematic_type @@ -52,7 +51,6 @@ module function kinematics_thermal_expansion_init(kinematics_length) result(myKi do p = 1, phases%length if(any(myKinematics(:,p))) kinematics_thermal_expansion_instance(p) = count(myKinematics(:,1:p)) phase => phases%get(p) - pl => phase%get('plasticity') if(count(myKinematics(:,p)) == 0) cycle kinematics => phase%get('kinematics') do k = 1, kinematics%length diff --git a/src/source_damage_anisoDuctile.f90 b/src/source_damage_anisoDuctile.f90 index 2fdd46bb4..ffbb38d2a 100644 --- a/src/source_damage_anisoDuctile.f90 +++ b/src/source_damage_anisoDuctile.f90 @@ -36,6 +36,7 @@ module function source_damage_anisoDuctile_init(source_length) result(mySources) class(tNode), pointer :: & phases, & phase, & + mech, & pl, & sources, & src @@ -56,11 +57,12 @@ module function source_damage_anisoDuctile_init(source_length) result(mySources) allocate(source_damage_anisoDuctile_instance(phases%length), source=0) do p = 1, phases%length - phase => phases%get(p) + phase => phases%get(p) if(any(mySources(:,p))) source_damage_anisoDuctile_instance(p) = count(mySources(:,1:p)) if(count(mySources(:,p)) == 0) cycle + mech => phase%get('mech') + pl => mech%get('plasticity') sources => phase%get('source') - pl => phase%get('plasticity') do sourceOffset = 1, sources%length if(mySources(sourceOffset,p)) then source_damage_anisoDuctile_offset(p) = sourceOffset