'kinematics'=>'eigen', now part of 'mechanics'
This commit is contained in:
parent
22a0aff488
commit
8dc53344ec
2
PRIVATE
2
PRIVATE
|
@ -1 +1 @@
|
||||||
Subproject commit 42ebe55f0ef1cd799115bd87e45d6025db42f7a7
|
Subproject commit fa5ef61395381b103a4babe52be145f960af0bbe
|
|
@ -66,7 +66,8 @@ module subroutine eigendeformation_init(phases)
|
||||||
class(tNode), pointer :: &
|
class(tNode), pointer :: &
|
||||||
phase, &
|
phase, &
|
||||||
kinematics, &
|
kinematics, &
|
||||||
damage
|
damage, &
|
||||||
|
mechanics
|
||||||
|
|
||||||
print'(/,a)', ' <<<+- phase:mechanics:eigendeformation init -+>>>'
|
print'(/,a)', ' <<<+- phase:mechanics:eigendeformation init -+>>>'
|
||||||
|
|
||||||
|
@ -76,7 +77,8 @@ module subroutine eigendeformation_init(phases)
|
||||||
|
|
||||||
do ph = 1,phases%length
|
do ph = 1,phases%length
|
||||||
phase => phases%get(ph)
|
phase => phases%get(ph)
|
||||||
kinematics => phase%get('kinematics',defaultVal=emptyList)
|
mechanics => phase%get('mechanics')
|
||||||
|
kinematics => mechanics%get('eigen',defaultVal=emptyList)
|
||||||
Nmodels(ph) = kinematics%length
|
Nmodels(ph) = kinematics%length
|
||||||
enddo
|
enddo
|
||||||
|
|
||||||
|
@ -108,14 +110,16 @@ function kinematics_active(kinematics_label,kinematics_length) result(active_ki
|
||||||
phases, &
|
phases, &
|
||||||
phase, &
|
phase, &
|
||||||
kinematics, &
|
kinematics, &
|
||||||
kinematics_type
|
kinematics_type, &
|
||||||
|
mechanics
|
||||||
integer :: p,k
|
integer :: p,k
|
||||||
|
|
||||||
phases => config_material%get('phase')
|
phases => config_material%get('phase')
|
||||||
allocate(active_kinematics(kinematics_length,phases%length), source = .false. )
|
allocate(active_kinematics(kinematics_length,phases%length), source = .false. )
|
||||||
do p = 1, phases%length
|
do p = 1, phases%length
|
||||||
phase => phases%get(p)
|
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
|
do k = 1, kinematics%length
|
||||||
kinematics_type => kinematics%get(k)
|
kinematics_type => kinematics%get(k)
|
||||||
active_kinematics(k,p) = kinematics_type%get_asString('type') == kinematics_label
|
active_kinematics(k,p) = kinematics_type%get_asString('type') == kinematics_label
|
||||||
|
|
Loading…
Reference in New Issue