bug fixes:

invalid material.yaml, detect such errors in future
This commit is contained in:
Martin Diehl 2021-07-05 11:30:52 +02:00
parent b465a6d615
commit cd9d704aae
4 changed files with 4 additions and 5 deletions

@ -1 +1 @@
Subproject commit 5bdddaab80eb42a04393d4cd85079ff83d5a6d53 Subproject commit 15bb4a18292bf4f5d3b371dc1edbf9a33606eb60

View File

@ -1,4 +1,5 @@
type: phenopowerlaw type: phenopowerlaw
references:
- C. Zambaldi et al., - C. Zambaldi et al.,
Journal of Materials Research, 27(1), 356-367, 2021, Journal of Materials Research, 27(1), 356-367, 2021,
10.1557/jmr.2011.334 10.1557/jmr.2011.334

View File

@ -267,15 +267,11 @@ module subroutine mechanical_init(materials,phases)
enddo enddo
! initialize elasticity
call elastic_init(phases) call elastic_init(phases)
! initialize plasticity
allocate(plasticState(phases%length)) allocate(plasticState(phases%length))
allocate(phase_plasticity(phases%length),source = PLASTICITY_undefined_ID) allocate(phase_plasticity(phases%length),source = PLASTICITY_undefined_ID)
call plastic_init() call plastic_init()
do ph = 1,phases%length do ph = 1,phases%length
plasticState(ph)%state0 = plasticState(ph)%state plasticState(ph)%state0 = plasticState(ph)%state
enddo enddo

View File

@ -232,6 +232,8 @@ module subroutine plastic_init
where(plastic_dislotungsten_init()) phase_plasticity = PLASTICITY_DISLOTUNGSTEN_ID where(plastic_dislotungsten_init()) phase_plasticity = PLASTICITY_DISLOTUNGSTEN_ID
where(plastic_nonlocal_init()) phase_plasticity = PLASTICITY_NONLOCAL_ID where(plastic_nonlocal_init()) phase_plasticity = PLASTICITY_NONLOCAL_ID
if (any(phase_plasticity == PLASTICITY_undefined_ID)) call IO_error(201)
end subroutine plastic_init end subroutine plastic_init
!-------------------------------------------------------------------------------------------------- !--------------------------------------------------------------------------------------------------