untangling

This commit is contained in:
Martin Diehl 2020-09-19 09:41:48 +02:00
parent 51f43ddc09
commit c4ce28e63f
1 changed files with 8 additions and 6 deletions

View File

@ -378,9 +378,9 @@ subroutine material_parseMicrostructure
enddo enddo
do e = 1, discretization_nElem do e = 1, discretization_nElem
constituentsInMicrostructure => microstructure%get(discretization_microstructureAt(e))
constituents => constituentsInMicrostructure%get('constituents')
do i = 1, discretization_nIP do i = 1, discretization_nIP
constituentsInMicrostructure => microstructure%get(discretization_microstructureAt(e))
constituents => constituentsInMicrostructure%get('constituents')
do c = 1, constituents%length do c = 1, constituents%length
constituent => constituents%get(c) constituent => constituents%get(c)
material_phaseAt(c,e) = phases%getIndex(constituent%get_asString('phase')) material_phaseAt(c,e) = phases%getIndex(constituent%get_asString('phase'))
@ -390,24 +390,26 @@ subroutine material_parseMicrostructure
enddo enddo
do e = 1, discretization_nElem do e = 1, discretization_nElem
constituentsInMicrostructure => microstructure%get(discretization_microstructureAt(e))
material_homogenizationAt(e) = homogenization%getIndex(constituentsInMicrostructure%get_asString('homogenization'))
do i = 1, discretization_nIP do i = 1, discretization_nIP
constituentsInMicrostructure => microstructure%get(discretization_microstructureAt(e))
material_homogenizationAt(e) = homogenization%getIndex(constituentsInMicrostructure%get_asString('homogenization'))
CounterHomogenization(material_homogenizationAt(e)) = CounterHomogenization(material_homogenizationAt(e)) + 1 CounterHomogenization(material_homogenizationAt(e)) = CounterHomogenization(material_homogenizationAt(e)) + 1
material_homogenizationMemberAt(i,e) = CounterHomogenization(material_homogenizationAt(e)) material_homogenizationMemberAt(i,e) = CounterHomogenization(material_homogenizationAt(e))
enddo enddo
enddo enddo
do e = 1, discretization_nElem do e = 1, discretization_nElem
constituentsInMicrostructure => microstructure%get(discretization_microstructureAt(e))
constituents => constituentsInMicrostructure%get('constituents')
do i = 1, discretization_nIP do i = 1, discretization_nIP
constituentsInMicrostructure => microstructure%get(discretization_microstructureAt(e))
constituents => constituentsInMicrostructure%get('constituents')
do c = 1, constituents%length do c = 1, constituents%length
CounterPhase(material_phaseAt(c,e)) = & CounterPhase(material_phaseAt(c,e)) = &
CounterPhase(material_phaseAt(c,e)) + 1 CounterPhase(material_phaseAt(c,e)) + 1
material_phaseMemberAt(c,i,e) = CounterPhase(material_phaseAt(c,e)) material_phaseMemberAt(c,i,e) = CounterPhase(material_phaseAt(c,e))
enddo enddo
enddo enddo
enddo enddo
end subroutine material_parseMicrostructure end subroutine material_parseMicrostructure