From 8dc53344ecd169fa4885d3f8256b8588e101bbe2 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sat, 13 Feb 2021 18:52:37 +0100 Subject: [PATCH] 'kinematics'=>'eigen', now part of 'mechanics' --- PRIVATE | 2 +- src/phase_mechanical_eigen.f90 | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/PRIVATE b/PRIVATE index 42ebe55f0..fa5ef6139 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 42ebe55f0ef1cd799115bd87e45d6025db42f7a7 +Subproject commit fa5ef61395381b103a4babe52be145f960af0bbe diff --git a/src/phase_mechanical_eigen.f90 b/src/phase_mechanical_eigen.f90 index d55ff8759..bee469385 100644 --- a/src/phase_mechanical_eigen.f90 +++ b/src/phase_mechanical_eigen.f90 @@ -66,7 +66,8 @@ module subroutine eigendeformation_init(phases) class(tNode), pointer :: & phase, & kinematics, & - damage + damage, & + mechanics print'(/,a)', ' <<<+- phase:mechanics:eigendeformation init -+>>>' @@ -76,7 +77,8 @@ module subroutine eigendeformation_init(phases) do ph = 1,phases%length phase => phases%get(ph) - kinematics => phase%get('kinematics',defaultVal=emptyList) + mechanics => phase%get('mechanics') + kinematics => mechanics%get('eigen',defaultVal=emptyList) Nmodels(ph) = kinematics%length enddo @@ -108,14 +110,16 @@ function kinematics_active(kinematics_label,kinematics_length) result(active_ki phases, & phase, & kinematics, & - kinematics_type + kinematics_type, & + mechanics integer :: p,k phases => config_material%get('phase') allocate(active_kinematics(kinematics_length,phases%length), source = .false. ) do p = 1, phases%length phase => phases%get(p) - kinematics => phase%get('kinematics',defaultVal=emptyList) + mechanics => phase%get('mechanics') + kinematics => mechanics%get('eigen',defaultVal=emptyList) do k = 1, kinematics%length kinematics_type => kinematics%get(k) active_kinematics(k,p) = kinematics_type%get_asString('type') == kinematics_label